X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FPdb.java;fp=src%2Fjalview%2Fws%2Fdbsources%2FPdb.java;h=11fe95e36330a721254024d17bde26b939ecdb4d;hb=8546ee20c998cd48567d324027d1885a771e688f;hp=a50ed143888938e947a845a1007f549e719acbee;hpb=e838644df5d5a10a16cf0ad7fb23d24dd7d2729a;p=jalview.git diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java index a50ed14..11fe95e 100644 --- a/src/jalview/ws/dbsources/Pdb.java +++ b/src/jalview/ws/dbsources/Pdb.java @@ -1,4 +1,3 @@ - /* * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) * Copyright (C) $$Year-Rel$$ The Jalview Authors @@ -47,9 +46,10 @@ import com.stevesoft.pat.Regex; public class Pdb extends EbiFileRetrievedProxy { private static final String SEPARATOR = "|"; + private static final String COLON = ":"; - private static final int PDB_ID_LENGTH = 4; + private static final int PDB_ID_LENGTH = 4; public Pdb() { @@ -140,10 +140,10 @@ public class Pdb extends EbiFileRetrievedProxy String ext = StructureImportSettings.getDefaultStructureFileFormat() .equalsIgnoreCase(Type.MMCIF.toString()) ? ".cif" : ".xml"; EBIFetchClient ebi = new EBIFetchClient(); - file = ebi.fetchDataAsFile("pdb:" + id, - StructureImportSettings.getDefaultStructureFileFormat().toLowerCase(), - ext) - .getAbsolutePath(); + file = ebi.fetchDataAsFile( + "pdb:" + id, + StructureImportSettings.getDefaultStructureFileFormat() + .toLowerCase(), ext).getAbsolutePath(); stopQuery(); if (file == null) { @@ -177,8 +177,8 @@ public class Pdb extends EbiFileRetrievedProxy { // FIXME seems to result in 'PDB|1QIP|1qip|A' - 1QIP is redundant. // TODO: suggest simplify naming to 1qip|A as default name defined - pdbcs.setName(jalview.datamodel.DBRefSource.PDB + SEPARATOR + id - + SEPARATOR + pdbcs.getName()); + pdbcs.setName(jalview.datamodel.DBRefSource.PDB + SEPARATOR + + id + SEPARATOR + pdbcs.getName()); // Might need to add more metadata to the PDBEntry object // like below /* @@ -269,7 +269,6 @@ public class Pdb extends EbiFileRetrievedProxy return 0; } - /** * Returns a descriptor for suitable feature display settings with *