From b8446598292b2332e9919cd121981fa20aad43cc Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 27 Jul 2006 13:09:30 +0000 Subject: [PATCH] Dont set pdb file if it doenst exist --- src/jalview/gui/Jalview2XML.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index 300cbd5..562d5cb 100755 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -804,6 +804,7 @@ public class Jalview2XML String loadPDBFile(String file, String pdbId) { + System.out.println("load file "+file); try { JarInputStream jin = null; @@ -911,14 +912,17 @@ public class Jalview2XML jalview.datamodel.PDBEntry entry = new jalview.datamodel.PDBEntry(); entry.setId(ids[p].getId()); entry.setType(ids[p].getType()); - if(!pdbloaded.containsKey(ids[p].getId())) + if (ids[p].getFile() != null) { - String tmppdb = loadPDBFile(file, ids[p].getId()); - entry.setFile(tmppdb); - pdbloaded.put(ids[p].getId(), tmppdb); + if (!pdbloaded.containsKey(ids[p].getFile())) + { + String tmppdb = loadPDBFile(file, ids[p].getId()); + entry.setFile(tmppdb); + pdbloaded.put(ids[p].getId(), tmppdb); + } + else + entry.setFile(pdbloaded.get(ids[p].getId()).toString()); } - else - entry.setFile(pdbloaded.get(ids[p].getId()).toString()); al.getSequenceAt(i).getDatasetSequence().addPDBId(entry); } -- 1.7.10.2