develop merge

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

diff --git a/src/jalview/ws/dbsources/EmblCdsSouce.java b/src/jalview/ws/dbsources/EmblCdsSource.java
similarity index 89%
rename from src/jalview/ws/dbsources/EmblCdsSouce.java
rename to src/jalview/ws/dbsources/EmblCdsSource.java
index e5fbd6c..a73af61 100644 (file)
--- a/src/jalview/ws/dbsources/EmblCdsSouce.java
+++ b/src/jalview/ws/dbsources/EmblCdsSource.java
@@ -22,40 +22,43 @@ package jalview.ws.dbsources;
 
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.DBRefSource;
-import jalview.ws.seqfetcher.DbSourceProxy;
 
 import com.stevesoft.pat.Regex;
 
-public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
+public class EmblCdsSource extends EmblXmlSource
 {
 
-  public EmblCdsSouce()
+  public EmblCdsSource()
   {
     super();
-    addDbSourceProperty(DBRefSource.CODINGSEQDB);
   }
 
+  @Override
   public String getAccessionSeparator()
   {
     return null;
   }
 
+  @Override
   public Regex getAccessionValidator()
   {
-    return new com.stevesoft.pat.Regex("^[A-Z]+[0-9]+");
+    return new Regex("^[A-Z]+[0-9]+");
   }
 
+  @Override
   public String getDbSource()
   {
     return DBRefSource.EMBLCDS;
   }
 
+  @Override
   public String getDbVersion()
   {
     return "0"; // TODO : this is dynamically set for a returned record - not
     // tied to proxy
   }
 
+  @Override
   public AlignmentI getSequenceRecords(String queries) throws Exception
   {
     if (queries.indexOf(".") > -1)
@@ -65,6 +68,7 @@ public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
     return getEmblSequenceRecords(DBRefSource.EMBLCDS, queries);
   }
 
+  @Override
   public boolean isValidReference(String accession)
   {
     // most embl CDS refs look like ..
@@ -76,11 +80,13 @@ public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
   /**
    * cDNA for LDHA_CHICK swissprot sequence
    */
+  @Override
   public String getTestQuery()
   {
     return "CAA37824";
   }
 
+  @Override
   public String getDbName()
   {
     return "EMBL (CDS)";