more ID validation

diff --git a/src/jalview/ws/dbsources/EmblCdsSouce.java b/src/jalview/ws/dbsources/EmblCdsSouce.java
index 41db106..a8dcda2 100644 (file)
--- a/src/jalview/ws/dbsources/EmblCdsSouce.java
+++ b/src/jalview/ws/dbsources/EmblCdsSouce.java
@@ -42,8 +42,7 @@ public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
 \r
   public Regex getAccessionValidator()\r
   {\r
-    // TODO Auto-generated method stub\r
-    return null;\r
+    return new com.stevesoft.pat.Regex("^[A-Z]+[0-9]+");\r
   }\r
 \r
   public String getDbSource()\r
@@ -70,7 +69,7 @@ public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
   {\r
     // most embl CDS refs look like ..\r
     // TODO: improve EMBLCDS regex\r
-    return (accession==null || accession.length()<2) ? false : new com.stevesoft.pat.Regex("^[A-Z]+[0-9]+").search(accession);\r
+    return (accession==null || accession.length()<2) ? false : getAccessionValidator().search(accession);\r
   }\r
 \r
   /**\r

diff --git a/src/jalview/ws/dbsources/EmblSource.java b/src/jalview/ws/dbsources/EmblSource.java
index ac4a988..08c020e 100644 (file)
--- a/src/jalview/ws/dbsources/EmblSource.java
+++ b/src/jalview/ws/dbsources/EmblSource.java
@@ -65,8 +65,7 @@ public class EmblSource extends EmblXmlSource implements DbSourceProxy
    */\r
   public Regex getAccessionValidator()\r
   {\r
-    // TODO Auto-generated method stub\r
-    return null;\r
+    return new com.stevesoft.pat.Regex("^[A-Z]+[0-9]+");\r
   }\r
 \r
   /*\r
@@ -109,7 +108,7 @@ public class EmblSource extends EmblXmlSource implements DbSourceProxy
   {\r
     // most embl refs look like ..\r
     \r
-    return (accession==null || accession.length()<2) ? false : new com.stevesoft.pat.Regex("^[A-Z]+[0-9]+$").search(accession);\r
+    return (accession==null || accession.length()<2) ? false : getAccessionValidator().search(accession);\r
     \r
   }\r
 \r