inprogress

[jalview.git] / forester / java / src / org / forester / phylogeny / data / Accession.java

diff --git a/forester/java/src/org/forester/phylogeny/data/Accession.java b/forester/java/src/org/forester/phylogeny/data/Accession.java
index 8d9739a..b3d99a0 100644 (file)
--- a/forester/java/src/org/forester/phylogeny/data/Accession.java
+++ b/forester/java/src/org/forester/phylogeny/data/Accession.java
@@ -34,15 +34,34 @@ import org.forester.util.ForesterUtil;
 
 public final class Accession implements PhylogenyData, Comparable<Accession> {
 
-    final private String       _comment;
-    final private String       _source;
-    final private String       _source_value;
-    final private String       _value;
-    final public static String NCBI    = "ncbi";
-    final public static String REFSEQ  = "refseq";
-    final public static String UNIPROT = "uniprot";
-    final public static String GI      = "gi";
-    public static final String EMBL    = "embl";
+    final private String _comment;
+    final private String _source;
+    final private String _source_value;
+    final private String _value;
+
+    public enum Source {
+        NCBI, REFSEQ, UNIPROT, GI, EMBL, UNKNOWN;
+
+        @Override
+        public String toString() {
+            switch ( this ) {
+                case NCBI:
+                    return "ncbi";
+                case REFSEQ:
+                    return "refseq";
+                case UNIPROT:
+                    return "uniprot";
+                case GI:
+                    return "gi";
+                case EMBL:
+                    return "embl";
+                case UNKNOWN:
+                    return "unknown";
+                default:
+                    throw new IllegalArgumentException();
+            }
+        }
+    }
 
     public Accession( final String value ) {
         _value = value;
@@ -63,6 +82,13 @@ public final class Accession implements PhylogenyData, Comparable<Accession> {
         }
     }
 
+    public Accession( final String value, final Source source ) {
+        _value = value;
+        _source = source.toString();
+        _comment = "";
+        _source_value = source + value;
+    }
+
     public Accession( final String value, final String source, final String comment ) {
         _value = value;
         _source = source;