X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FAdjactantDirectedCombinableDomains.java;h=6fd94f66a9a5c46fd044ba16ecd73cf9e0275420;hb=c0439ed8b088887ffea2faf11bc7897333287cb3;hp=d76029796c9f51f6269e30a884b31f7307fa7795;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/AdjactantDirectedCombinableDomains.java b/forester/java/src/org/forester/surfacing/AdjactantDirectedCombinableDomains.java
index d760297..6fd94f6 100644
--- a/forester/java/src/org/forester/surfacing/AdjactantDirectedCombinableDomains.java
+++ b/forester/java/src/org/forester/surfacing/AdjactantDirectedCombinableDomains.java
@@ -30,19 +30,22 @@ package org.forester.surfacing;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.forester.protein.BinaryDomainCombination;
+import org.forester.species.Species;
+
 public class AdjactantDirectedCombinableDomains extends BasicCombinableDomains {
 
-    public AdjactantDirectedCombinableDomains( final DomainId n_terminal_key_domain, final Species species ) {
+    public AdjactantDirectedCombinableDomains( final String n_terminal_key_domain, final Species species ) {
         super( n_terminal_key_domain, species );
     }
 
     @Override
     public List<BinaryDomainCombination> toBinaryDomainCombinations() {
         final List<BinaryDomainCombination> binary_combinations = new ArrayList<BinaryDomainCombination>( getNumberOfCombinableDomains() );
-        for( final DomainId domain : getCombiningDomains().keySet() ) {
+        for( final String domain : getCombiningDomains().keySet() ) {
             // Precondition (!): key domain is most upstream domain.
             //TODO ensure this is true.
-            binary_combinations.add( new AdjactantDirectedBinaryDomainCombination( getKeyDomain(), domain ) );
+            binary_combinations.add( AdjactantDirectedBinaryDomainCombination.obtainInstance( getKeyDomain(), domain ) );
         }
         return binary_combinations;
     }