X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEmblSource.java;h=007ae52c83ee05b9edf414fd5c939dac0b1cd31a;hb=8daeb715c3e8ec8486f26708361698095084232f;hp=ac4a98863669ae47771f57411b820331f528ab6f;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git

diff --git a/src/jalview/ws/dbsources/EmblSource.java b/src/jalview/ws/dbsources/EmblSource.java
index ac4a988..007ae52 100644
--- a/src/jalview/ws/dbsources/EmblSource.java
+++ b/src/jalview/ws/dbsources/EmblSource.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  */
 package jalview.ws.dbsources;
 
@@ -65,8 +64,7 @@ public class EmblSource extends EmblXmlSource implements DbSourceProxy
    */
   public Regex getAccessionValidator()
   {
-    // TODO Auto-generated method stub
-    return null;
+    return new com.stevesoft.pat.Regex("^[A-Z]+[0-9]+");
   }
 
   /*
@@ -99,7 +97,7 @@ public class EmblSource extends EmblXmlSource implements DbSourceProxy
   {
     return getEmblSequenceRecords(DBRefSource.EMBL, queries);
   }
-  
+
   /*
    * (non-Javadoc)
    * 
@@ -108,9 +106,10 @@ public class EmblSource extends EmblXmlSource implements DbSourceProxy
   public boolean isValidReference(String accession)
   {
     // most embl refs look like ..
-    
-    return (accession==null || accession.length()<2) ? false : new com.stevesoft.pat.Regex("^[A-Z]+[0-9]+$").search(accession);
-    
+
+    return (accession == null || accession.length() < 2) ? false
+            : getAccessionValidator().search(accession);
+
   }
 
   /**