X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FBasicBinaryDomainCombination.java;h=518c32e6449914299c27c2330457be8b6a8b9aac;hb=1d144f35479f96cb36c5247d9711e22ed234651a;hp=67e5ffd3c5183a1a12bf794a2e8ce4253e817bab;hpb=e14e8c06907c1bb35de6c3c21986e1e32e520d82;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java b/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
index 67e5ffd..518c32e 100644
--- a/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
+++ b/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
@@ -22,48 +22,36 @@
 // 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 _data;
+    String _id0;
+    String _id1;
+    String _str;
 
-    //String _id_0;
-    // String _id_1;
-    //DomainId _id_0;
-    //DomainId _id_1;
-    BasicBinaryDomainCombination() {
-        //_id_0 = null;
-        // _id_1 = null;
-        _data = null;
-    }
-
-    public BasicBinaryDomainCombination( final String id_0, final String id_1 ) {
-        if ( ( id_0 == null ) || ( id_1 == null ) ) {
+    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;
-            _data = my_id_0 + BinaryDomainCombination.SEPARATOR + 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;
-            _data = my_id_1 + BinaryDomainCombination.SEPARATOR + my_id_0;
+            _id0 = id1;
+            _id1 = id0;
         }
     }
 
-    public BasicBinaryDomainCombination( final DomainId id_0, final DomainId id_1 ) {
-        this( id_0.getId(), id_1.getId() );
+    BasicBinaryDomainCombination() {
+        _id0 = null;
+        _id1 = null;
     }
 
     @Override
@@ -103,21 +91,18 @@ public class BasicBinaryDomainCombination implements BinaryDomainCombination {
     }
 
     @Override
-    public DomainId getId0() {
-        return new DomainId( _data.split( BinaryDomainCombination.SEPARATOR )[ 0 ] );
+    public String getId0() {
+        return _id0;
     }
 
     @Override
-    public DomainId getId1() {
-        // return new DomainId( _id_1 );
-        return new DomainId( _data.split( BinaryDomainCombination.SEPARATOR )[ 1 ] );
+    public String getId1() {
+        return _id1;
     }
 
     @Override
     public int hashCode() {
-        // return getId0().hashCode() + ( 19 * getId1().hashCode() );
-        // return ( _id_0 + _id_1 ).hashCode();
-        return _data.hashCode();
+        return getAsStr().hashCode();
     }
 
     @Override
@@ -166,12 +151,11 @@ public class BasicBinaryDomainCombination implements BinaryDomainCombination {
 
     @Override
     public String toString() {
-        return _data;
-        //        final StringBuffer sb = new StringBuffer();
-        //        sb.append( _id_0 );
-        //        sb.append( BinaryDomainCombination.SEPARATOR );
-        //        sb.append( _id_1 );
-        //        return sb.toString();
+        return getAsStr();
+    }
+
+    private String getAsStr() {
+        return _id0 + SEPARATOR + _id1;
     }
 
     public static BinaryDomainCombination createInstance( final String ids ) {