X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEmblCdsSource.java;h=2e3a4446c605732df204313bd87ab4f8ee2fd22e;hb=ab58313e7bb31264ddb2715a1c548cdc789d7fa6;hp=796f6e988d79f0c2dc7dafa3da5afa46bee38e7d;hpb=76821e9f28923b6f3ae8f226e01d0156e7b7f847;p=jalview.git diff --git a/src/jalview/ws/dbsources/EmblCdsSource.java b/src/jalview/ws/dbsources/EmblCdsSource.java index 796f6e9..2e3a444 100644 --- a/src/jalview/ws/dbsources/EmblCdsSource.java +++ b/src/jalview/ws/dbsources/EmblCdsSource.java @@ -22,13 +22,9 @@ package jalview.ws.dbsources; import jalview.datamodel.AlignmentI; import jalview.datamodel.DBRefSource; -import jalview.util.Platform; -import com.stevesoft.pat.Regex; - -public class EmblCdsSource extends EmblXmlSource +public class EmblCdsSource extends EmblFlatfileSource // was EmblXmlSource { - private Regex ACCESSION_REGEX = null; public EmblCdsSource() { @@ -36,36 +32,12 @@ public class EmblCdsSource extends EmblXmlSource } @Override - public String getAccessionSeparator() - { - return null; - } - - @Override - public Regex getAccessionValidator() - { - if (ACCESSION_REGEX == null) - { - ACCESSION_REGEX = Platform.newRegex("^[A-Z]+[0-9]+"); - } - return ACCESSION_REGEX; - } - - - @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) @@ -75,14 +47,6 @@ public class EmblCdsSource extends EmblXmlSource return getEmblSequenceRecords(DBRefSource.EMBLCDS, queries); } - @Override - public boolean isValidReference(String accession) - { - // most embl CDS refs look like .. - // TODO: improve EMBLCDS regex - return (accession == null || accession.length() < 2) ? false - : getAccessionValidator().search(accession); - } /** * cDNA for LDHA_CHICK swissprot sequence @@ -99,10 +63,4 @@ public class EmblCdsSource extends EmblXmlSource return "EMBL (CDS)"; } - @Override - public int getTier() - { - return 0; - } - }