X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FGenomeWideCombinableDomains.java;h=810e409b36f8cfa4c7ccda31fdafae911ffc19a3;hb=1556760e353eae5745f1ae9471a64f0089554639;hp=f444ff7ca95282d854edea01fd741f67c8cd41ec;hpb=656be28debec520e0e35a8b311114398a40ea366;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/GenomeWideCombinableDomains.java b/forester/java/src/org/forester/surfacing/GenomeWideCombinableDomains.java
index f444ff7..810e409 100644
--- a/forester/java/src/org/forester/surfacing/GenomeWideCombinableDomains.java
+++ b/forester/java/src/org/forester/surfacing/GenomeWideCombinableDomains.java
@@ -32,29 +32,26 @@ import java.util.SortedSet;
 
 import org.forester.protein.BinaryDomainCombination;
 import org.forester.protein.BinaryDomainCombination.DomainCombinationType;
-import org.forester.protein.DomainId;
 import org.forester.species.Species;
 import org.forester.util.DescriptiveStatistics;
 
 public interface GenomeWideCombinableDomains {
 
-    public boolean contains( DomainId key_id );
+    public boolean contains( String key_id );
 
-    public CombinableDomains get( DomainId key_id );
+    public CombinableDomains get( String key_id );
 
-    public SortedMap<DomainId, CombinableDomains> getAllCombinableDomainsIds();
+    public SortedMap<String, CombinableDomains> getAllCombinableDomainsIds();
 
     /**
      * This should return all domains ids present in the genome.
      * 
      * @return a sorted set of domains ids
      */
-    public SortedSet<DomainId> getAllDomainIds();
+    public SortedSet<String> getAllDomainIds();
 
     public DomainCombinationType getDomainCombinationType();
 
-    SortedSet<DomainId> getMostPromiscuosDomain();
-
     /**
      * This should return a statistic for per domain 
      * promiscuity in a genome.
@@ -76,7 +73,9 @@ public interface GenomeWideCombinableDomains {
 
     public StringBuilder toStringBuilder( GenomeWideCombinableDomainsSortOrder order );
 
+    SortedSet<String> getMostPromiscuosDomain();
+
     public static enum GenomeWideCombinableDomainsSortOrder {
-        ALPHABETICAL_KEY_ID, KEY_DOMAIN_PROTEINS_COUNT, KEY_DOMAIN_COUNT, COMBINATIONS_COUNT
+        ALPHABETICAL_KEY_ID, COMBINATIONS_COUNT, KEY_DOMAIN_COUNT, KEY_DOMAIN_PROTEINS_COUNT
     }
 }