JAL-1953 equals and hashCode now takes node ID in account

[jalview.git] / forester / java / src / org / forester / sequence / MolecularSequence.java

diff --git a/forester/java/src/org/forester/sequence/MolecularSequence.java b/forester/java/src/org/forester/sequence/MolecularSequence.java
index 696a1fc..d4f9bf3 100644 (file)
--- a/forester/java/src/org/forester/sequence/MolecularSequence.java
+++ b/forester/java/src/org/forester/sequence/MolecularSequence.java
@@ -33,7 +33,7 @@ public interface MolecularSequence {
     public static final char   GAP             = '-';
     public static final String GAP_STR         = Character.toString( GAP );
     public static final char   TERMINATE       = '*';
-    static final String        AA_REGEXP       = "[^ARNDBCQEZGHILKMFPSTWYVXU\\-\\*]";
+    static final String        AA_REGEXP       = "[^ARNDBCQEZGHILKMFPSTWYVXUO\\-\\*]";
     static final String        DNA_REGEXP      = "[^ACGTRYMKWSN\\-\\*]";
     static final String        RNA_REGEXP      = "[^ACGURYMKWSN\\-\\*]";
 
@@ -54,6 +54,6 @@ public interface MolecularSequence {
     public abstract TYPE getType();
 
     public enum TYPE {
-        RNA, DNA, AA;
+        RNA, DNA, AA, GENERAL;
     }
 }
\ No newline at end of file