X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FBasicBinaryDomainCombination.java;h=3f799d17711ea903d87ed24ed94faf9444418d8a;hb=f47b5de663d2ca59a4d53587ea8d5cd20c594db2;hp=6516903f98a434aa576c565bccef39caaea78d4a;hpb=73c5b11c1a00e539afb246e345ebf3f042dded78;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java b/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
index 6516903..3f799d1 100644
--- a/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
+++ b/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
@@ -22,46 +22,42 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.surfacing;
 
 import org.forester.protein.BinaryDomainCombination;
-import org.forester.protein.DomainId;
 import org.forester.util.ForesterUtil;
 
 public class BasicBinaryDomainCombination implements BinaryDomainCombination {
 
-    String _id_0;
-    String _id_1;
+    String _id0;
+    String _id1;
+    String _str;
 
-    //DomainId _id_0;
-    //DomainId _id_1;
     BasicBinaryDomainCombination() {
-        _id_0 = null;
-        _id_1 = null;
+        _id0 = null;
+        _id1 = null;
     }
 
-    public BasicBinaryDomainCombination( final String id_0, final String id_1 ) {
-        if ( ( id_0 == null ) || ( id_1 == null ) ) {
+    private String getAsStr() {
+        return _id0 + SEPARATOR + _id1;
+    }
+
+    public BasicBinaryDomainCombination( final String id0, final String id1 ) {
+        if ( ( id0 == null ) || ( id1 == null ) ) {
             throw new IllegalArgumentException( "attempt to create binary domain combination using null" );
         }
-        final String my_id_0 = id_0.trim();
-        final String my_id_1 = id_1.trim();
-        if ( my_id_0.toLowerCase().compareTo( my_id_1.toLowerCase() ) < 0 ) {
-            _id_0 = my_id_0;
-            _id_1 = my_id_1;
+        if ( id0.toLowerCase().compareTo( id1.toLowerCase() ) < 0 ) {
+            _id0 = id0;
+            _id1 = id1;
         }
         else {
-            _id_0 = my_id_1;
-            _id_1 = my_id_0;
+            _id0 = id1;
+            _id1 = id0;
         }
     }
 
-    public BasicBinaryDomainCombination( final DomainId id_0, final DomainId id_1 ) {
-        this( id_0.getId(), id_1.getId() );
-    }
-
     @Override
     public int compareTo( final BinaryDomainCombination binary_domain_combination ) {
         if ( binary_domain_combination.getClass() != this.getClass() ) {
@@ -99,19 +95,18 @@ public class BasicBinaryDomainCombination implements BinaryDomainCombination {
     }
 
     @Override
-    public DomainId getId0() {
-        return new DomainId( _id_0 );
+    public String getId0() {
+        return _id0;
     }
 
     @Override
-    public DomainId getId1() {
-        return new DomainId( _id_1 );
+    public String getId1() {
+        return _id1;
     }
 
     @Override
     public int hashCode() {
-        // return getId0().hashCode() + ( 19 * getId1().hashCode() );
-        return ( _id_0 + _id_1 ).hashCode();
+        return getAsStr().hashCode();
     }
 
     @Override
@@ -160,11 +155,7 @@ public class BasicBinaryDomainCombination implements BinaryDomainCombination {
 
     @Override
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
-        sb.append( _id_0 );
-        sb.append( BinaryDomainCombination.SEPARATOR );
-        sb.append( _id_1 );
-        return sb.toString();
+        return getAsStr();
     }
 
     public static BinaryDomainCombination createInstance( final String ids ) {