X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fgo%2FBasicGoSubset.java;h=8dd8f64322bc8880c57249fa7427b844656a580f;hb=df8e9950662eaab9427f6873dcd0072f0d28f690;hp=de2f65f0c15cde95315b0c7b5ead4f68a13171c7;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/go/BasicGoSubset.java b/forester/java/src/org/forester/go/BasicGoSubset.java index de2f65f..8dd8f64 100644 --- a/forester/java/src/org/forester/go/BasicGoSubset.java +++ b/forester/java/src/org/forester/go/BasicGoSubset.java @@ -21,7 +21,7 @@ // 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.go; @@ -46,6 +46,9 @@ public class BasicGoSubset implements GoSubset { else if ( my_s.equals( GOSLIM_CANDIDA_STR ) ) { _type = Type.GOSLIM_CANDIDA; } + else if ( my_s.equals( GOSLIM_ASPERGILLUS_STR ) ) { + _type = Type.GOSLIM_ASPERGILLUS; + } else if ( my_s.equals( GOSLIM_PLANT_STR ) ) { _type = Type.GOSLIM_PLANT; } @@ -56,7 +59,7 @@ public class BasicGoSubset implements GoSubset { _type = Type.GOSLIM_POMBE; } else { - throw new IllegalArgumentException( "unknown GO subset type: " + my_s ); + _type = Type.OTHER; } } @@ -79,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() ); @@ -110,6 +113,9 @@ public class BasicGoSubset implements GoSubset { case GOSLIM_PLANT: sb.append( GOSLIM_PLANT_STR ); break; + case GOSLIM_ASPERGILLUS: + sb.append( GOSLIM_ASPERGILLUS_STR ); + break; case GOSLIM_YEAST: sb.append( GOSLIM_YEAST_STR ); break; @@ -119,8 +125,9 @@ public class BasicGoSubset implements GoSubset { case GOSLIM_POMBE: sb.append( GOSLIM_POMBE_STR ); break; - default: - new AssertionError( "unknown type: " + getType() ); + case OTHER: + sb.append( "other" ); + break; } return sb.toString(); }