JAL-2844 partitioning code made slightly clearer

[jalview.git] / forester / java / src / org / forester / go / BasicGoSubset.java

diff --git a/forester/java/src/org/forester/go/BasicGoSubset.java b/forester/java/src/org/forester/go/BasicGoSubset.java
index f1658d7..8dd8f64 100644 (file)
--- a/forester/java/src/org/forester/go/BasicGoSubset.java
+++ b/forester/java/src/org/forester/go/BasicGoSubset.java
@@ -58,17 +58,8 @@ public class BasicGoSubset implements GoSubset {
         else if ( my_s.equals( GOSLIM_POMBE_STR ) ) {
             _type = Type.GOSLIM_POMBE;
         }
-        else if ( my_s.equals( HIGH_LEVEL_ANNOTATION_QC_STR ) ) {
-            _type = Type.HIGH_LEVEL_ANNOTATION_QC;
-        }
-        else if ( my_s.equals( UNVETTED_STR ) ) {
-            _type = Type.UNVETTED;
-        }
-        else if ( my_s.equals( MF_NEEDS_REVIEW_STR ) ) {
-            _type = Type.MF_NEEDS_REVIEW;
-        }
         else {
-            throw new IllegalArgumentException( "unknown GO subset type: " + my_s );
+            _type = Type.OTHER;
         }
     }
 
@@ -91,7 +82,7 @@ public class BasicGoSubset implements GoSubset {
         }
         else if ( o.getClass() != this.getClass() ) {
             throw new IllegalArgumentException( "attempt to check go subset equality to " + o + " [" + o.getClass()
-                    + "]" );
+                                                + "]" );
         }
         else {
             return ( getType() == ( ( GoSubset ) o ).getType() );
@@ -134,17 +125,9 @@ public class BasicGoSubset implements GoSubset {
             case GOSLIM_POMBE:
                 sb.append( GOSLIM_POMBE_STR );
                 break;
-            case MF_NEEDS_REVIEW:
-                sb.append( MF_NEEDS_REVIEW_STR );
-                break;
-            case HIGH_LEVEL_ANNOTATION_QC:
-                sb.append( HIGH_LEVEL_ANNOTATION_QC_STR );
-                break;
-            case UNVETTED:
-                sb.append( UNVETTED_STR );
+            case OTHER:
+                sb.append( "other" );
                 break;
-            default:
-                new AssertionError( "unknown type: " + getType() );
         }
         return sb.toString();
     }