X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FPdb.java;h=3fd7541fb25fbb2fa76efe29f634e16b823dca3e;hb=a6b324e3f5edac3df0b968f0037b1cc8b651598e;hp=7f8c76ca6430a00149fc412d4a7499b04993f17c;hpb=5b079109d33a4596a8c3017dbf93b7de5b0300c5;p=jalview.git diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java index 7f8c76c..3fd7541 100644 --- a/src/jalview/ws/dbsources/Pdb.java +++ b/src/jalview/ws/dbsources/Pdb.java @@ -29,7 +29,6 @@ import jalview.datamodel.SequenceI; import jalview.io.FormatAdapter; import jalview.util.MessageManager; import jalview.ws.ebi.EBIFetchClient; -import jalview.ws.seqfetcher.DbSourceProxy; import java.util.ArrayList; import java.util.List; @@ -41,12 +40,11 @@ import com.stevesoft.pat.Regex; * @author JimP * */ -public class Pdb extends EbiFileRetrievedProxy implements DbSourceProxy +public class Pdb extends EbiFileRetrievedProxy { public Pdb() { super(); - addDbSourceProperty(DBRefSource.PROTSEQDB); } /* @@ -54,6 +52,7 @@ public class Pdb extends EbiFileRetrievedProxy implements DbSourceProxy * * @see jalview.ws.DbSourceProxy#getAccessionSeparator() */ + @Override public String getAccessionSeparator() { // TODO Auto-generated method stub @@ -65,6 +64,7 @@ public class Pdb extends EbiFileRetrievedProxy implements DbSourceProxy * * @see jalview.ws.DbSourceProxy#getAccessionValidator() */ + @Override public Regex getAccessionValidator() { return new Regex("([1-9][0-9A-Za-z]{3}):?([ _A-Za-z0-9]?)"); @@ -75,6 +75,7 @@ public class Pdb extends EbiFileRetrievedProxy implements DbSourceProxy * * @see jalview.ws.DbSourceProxy#getDbSource() */ + @Override public String getDbSource() { return DBRefSource.PDB; @@ -85,6 +86,7 @@ public class Pdb extends EbiFileRetrievedProxy implements DbSourceProxy * * @see jalview.ws.DbSourceProxy#getDbVersion() */ + @Override public String getDbVersion() { return "0"; @@ -95,6 +97,7 @@ public class Pdb extends EbiFileRetrievedProxy implements DbSourceProxy * * @see jalview.ws.DbSourceProxy#getSequenceRecords(java.lang.String[]) */ + @Override public AlignmentI getSequenceRecords(String queries) throws Exception { AlignmentI pdbAlignment = null; @@ -219,6 +222,7 @@ public class Pdb extends EbiFileRetrievedProxy implements DbSourceProxy * * @see jalview.ws.DbSourceProxy#isValidReference(java.lang.String) */ + @Override public boolean isValidReference(String accession) { Regex r = getAccessionValidator(); @@ -228,11 +232,13 @@ public class Pdb extends EbiFileRetrievedProxy implements DbSourceProxy /** * obtain human glyoxalase chain A sequence */ + @Override public String getTestQuery() { return "1QIPA"; } + @Override public String getDbName() { return "PDB"; // getDbSource();