From: jprocter <Jim Procter>
Date: Fri, 19 Jun 2009 09:49:37 +0000 (+0000)
Subject: regex validator for uniprot
X-Git-Tag: Release_2_5~255
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8d6dc03a2595eed8d2bc6e4533478312e7b6dbe5;p=jalview.git

regex validator for uniprot
---

diff --git a/src/jalview/ws/dbsources/Uniprot.java b/src/jalview/ws/dbsources/Uniprot.java
index 4c984d4..3331756 100644
--- a/src/jalview/ws/dbsources/Uniprot.java
+++ b/src/jalview/ws/dbsources/Uniprot.java
@@ -76,7 +76,7 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
    */
   public Regex getAccessionValidator()
   {
-    return null;
+    return new Regex("([A-Z]+[0-9]+[A-Z0-9]+|[A-Z0-9]+_[A-Z0-9]+)");
   }
 
   /*
@@ -277,7 +277,8 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
    */
   public boolean isValidReference(String accession)
   {
-    return true;
+    // TODO: make the following a standard validator
+    return (accession==null || accession.length()<2) ? false : getAccessionValidator().search(accession);
   }
 
   /**