implemented embl validation properly

diff --git a/src/jalview/ws/dbsources/EmblCdsSouce.java b/src/jalview/ws/dbsources/EmblCdsSouce.java
index 1ac5c76..0dfc924 100644 (file)
--- a/src/jalview/ws/dbsources/EmblCdsSouce.java
+++ b/src/jalview/ws/dbsources/EmblCdsSouce.java
@@ -68,8 +68,10 @@ public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
 \r
   public boolean isValidReference(String accession)\r
   {\r
-    // TODO Auto-generated method stub\r
-    return true;\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
+    \r
   }\r
 \r
   /**\r

diff --git a/src/jalview/ws/dbsources/EmblSource.java b/src/jalview/ws/dbsources/EmblSource.java
index 5eac1c0..344182f 100644 (file)
--- a/src/jalview/ws/dbsources/EmblSource.java
+++ b/src/jalview/ws/dbsources/EmblSource.java
@@ -99,7 +99,7 @@ public class EmblSource extends EmblXmlSource implements DbSourceProxy
   {\r
     return getEmblSequenceRecords(DBRefSource.EMBL, queries);\r
   }\r
-\r
+  \r
   /*\r
    * (non-Javadoc)\r
    * \r
@@ -107,8 +107,10 @@ public class EmblSource extends EmblXmlSource implements DbSourceProxy
    */\r
   public boolean isValidReference(String accession)\r
   {\r
-    // TODO Auto-generated method stub\r
-    return false;\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
+    \r
   }\r
 \r
   /**\r