inprogress

diff --git a/forester/java/src/org/forester/application/surfacing.java b/forester/java/src/org/forester/application/surfacing.java
index 2a2169e..162ef57 100644 (file)
--- a/forester/java/src/org/forester/application/surfacing.java
+++ b/forester/java/src/org/forester/application/surfacing.java
@@ -213,8 +213,8 @@ public class surfacing {
     final static private String                                     INPUT_GENOMES_FILE_OPTION                                                     = "genomes";
     final static private String                                     INPUT_SPECIES_TREE_OPTION                                                     = "species_tree";
     final static private String                                     SEQ_EXTRACT_OPTION                                                            = "prot_extract";
-    final static private String                                     PRG_VERSION                                                                   = "2.400";
-    final static private String                                     PRG_DATE                                                                      = "131106";
+    final static private String                                     PRG_VERSION                                                                   = "2.401";
+    final static private String                                     PRG_DATE                                                                      = "131125";
     final static private String                                     E_MAIL                                                                        = "czmasek@burnham.org";
     final static private String                                     WWW                                                                           = "https://sites.google.com/site/cmzmasek/home/software/forester/surfacing";
     final static private boolean                                    IGNORE_DUFS_DEFAULT                                                           = true;

diff --git a/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java b/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
index 350c2e9..623c619 100644 (file)
--- a/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
+++ b/forester/java/src/org/forester/surfacing/BasicBinaryDomainCombination.java
@@ -31,29 +31,24 @@ import org.forester.util.ForesterUtil;
 
 public class BasicBinaryDomainCombination implements BinaryDomainCombination {
 
-    // String _id0;
-    // String _id1;
     String _data;
 
     public BasicBinaryDomainCombination( final String id0, final String id1 ) {
         if ( ( id0 == null ) || ( id1 == null ) ) {
             throw new IllegalArgumentException( "attempt to create binary domain combination using null" );
         }
+        if ( ( id0.indexOf( SEPARATOR ) != -1 ) || ( id1.indexOf( SEPARATOR ) != -1 ) ) {
+            throw new IllegalArgumentException( "ill formatted domain id: " + id0 + ", " + id1 );
+        }
         if ( id0.toLowerCase().compareTo( id1.toLowerCase() ) < 0 ) {
-            //  _id0 = id0;
-            //  _id1 = id1;
             _data = id0 + SEPARATOR + id1;
         }
         else {
-            // _id0 = id1;
-            // _id1 = id0;
             _data = id1 + SEPARATOR + id0;
         }
     }
 
     BasicBinaryDomainCombination() {
-        //_id0 = null;
-        // _id1 = null;
         _data = null;
     }
 
@@ -96,13 +91,11 @@ public class BasicBinaryDomainCombination implements BinaryDomainCombination {
     @Override
     public String getId0() {
         return _data.substring( 0, _data.indexOf( SEPARATOR ) );
-        // return _id0;
     }
 
     @Override
     public String getId1() {
         return _data.substring( _data.indexOf( SEPARATOR ) + 1 );
-        //return _id1;
     }
 
     @Override
@@ -160,7 +153,6 @@ public class BasicBinaryDomainCombination implements BinaryDomainCombination {
     }
 
     private String getAsStr() {
-        // return _id0 + SEPARATOR + _id1;
         return _data;
     }