apply version 2.7 copyright

[jalview.git] / src / jalview / ws / dbsources / EmblCdsSouce.java

diff --git a/src/jalview/ws/dbsources/EmblCdsSouce.java b/src/jalview/ws/dbsources/EmblCdsSouce.java
index 41db106..1345f48 100644 (file)
--- a/src/jalview/ws/dbsources/EmblCdsSouce.java
+++ b/src/jalview/ws/dbsources/EmblCdsSouce.java
@@ -1,20 +1,19 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)\r
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
  * \r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
+ * This file is part of Jalview.\r
  * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
  * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE.  See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 package jalview.ws.dbsources;\r
 \r
@@ -42,8 +41,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
@@ -54,7 +52,7 @@ public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
   public String getDbVersion()\r
   {\r
     return "0"; // TODO : this is dynamically set for a returned record - not\r
-                // tied to proxy\r
+    // tied to proxy\r
   }\r
 \r
   public AlignmentI getSequenceRecords(String queries) throws Exception\r
@@ -70,7 +68,8 @@ 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\r
+            : getAccessionValidator().search(accession);\r
   }\r
 \r
   /**\r