fixed issue with cutting off of long names in pdf export + minor changes

[jalview.git] / forester / java / src / org / forester / surfacing / DirectedCombinableDomains.java

diff --git a/forester/java/src/org/forester/surfacing/DirectedCombinableDomains.java b/forester/java/src/org/forester/surfacing/DirectedCombinableDomains.java
index 16c2940..35f73f8 100644 (file)
--- a/forester/java/src/org/forester/surfacing/DirectedCombinableDomains.java
+++ b/forester/java/src/org/forester/surfacing/DirectedCombinableDomains.java
@@ -30,22 +30,21 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.forester.protein.BinaryDomainCombination;
-import org.forester.protein.DomainId;
 import org.forester.species.Species;
 
 public class DirectedCombinableDomains extends BasicCombinableDomains {
 
-    public DirectedCombinableDomains( final DomainId n_terminal_key_domain, final Species species ) {
+    public DirectedCombinableDomains( 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 DirectedBinaryDomainCombination( getKeyDomain(), domain ) );
+            binary_combinations.add( DirectedBinaryDomainCombination.obtainInstance( getKeyDomain(), domain ) );
         }
         return binary_combinations;
     }