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=e4326d1ee4047c706a407a901369fbadb0d61773;hb=be762d8d9c71a7aa3121e845c45911c7192b7827;hp=982c399a62b7aeab93cd37ed9cac6bcc679682bb;hpb=d1bb7a31fc091606aedbc255a5766ac79e36fa91;p=jalview.git diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java index 982c399..e4326d1 100644 --- a/src/jalview/ws/dbsources/Pdb.java +++ b/src/jalview/ws/dbsources/Pdb.java @@ -165,8 +165,8 @@ public class Pdb extends EbiFileRetrievedProxy // todo get rid of Type and use FileFormatI instead? FileFormatI fileFormat = (pdbFileFormat == Type.PDB) ? FileFormat.PDB : FileFormat.MMCif; - pdbAlignment = new FormatAdapter().readFile(file, - DataSourceType.FILE, fileFormat); + pdbAlignment = new FormatAdapter().readFile(file, DataSourceType.FILE, + fileFormat); if (pdbAlignment != null) { List toremove = new ArrayList(); @@ -182,15 +182,14 @@ public class Pdb extends EbiFileRetrievedProxy } } - if (chain == null - || (chid != null && (chid.equals(chain) - || chid.trim().equals(chain.trim()) || (chain - .trim().length() == 0 && chid.equals("_"))))) + if (chain == null || (chid != null && (chid.equals(chain) + || chid.trim().equals(chain.trim()) + || (chain.trim().length() == 0 && chid.equals("_"))))) { // 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 /* @@ -236,8 +235,8 @@ public class Pdb extends EbiFileRetrievedProxy if (pdbAlignment == null || pdbAlignment.getHeight() < 1) { throw new Exception(MessageManager.formatMessage( - "exception.no_pdb_records_for_chain", new String[] { id, - ((chain == null) ? "' '" : chain) })); + "exception.no_pdb_records_for_chain", new String[] + { id, ((chain == null) ? "' '" : chain) })); } } catch (Exception ex) // Problem parsing PDB file