X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=3f8175d204631cfb5e6a3a21c5b7ce3cf858dbc3;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=2699db187e9f7b1ff113c4e8483627d348775c5e;hpb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;p=jalview.git diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java index 2699db1..3f8175d 100644 --- a/src/jalview/gui/AppJmolBinding.java +++ b/src/jalview/gui/AppJmolBinding.java @@ -33,7 +33,7 @@ import org.openscience.jmol.app.jmolpanel.console.AppConsole; import jalview.api.AlignmentViewPanel; import jalview.api.structures.JalviewStructureDisplayI; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.AlignmentI; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; @@ -91,7 +91,7 @@ public class AppJmolBinding extends JalviewJmolBinding jalview.util.BrowserLauncher.openURL(url); } catch (Exception e) { - Cache.error("Failed to launch Jmol-associated url " + url, e); + Console.error("Failed to launch Jmol-associated url " + url, e); // TODO: 2.6 : warn user if browser was not configured. } } @@ -214,7 +214,7 @@ public class AppJmolBinding extends JalviewJmolBinding { // todo - record which pdbids were successfully imported. StringBuilder errormsgs = new StringBuilder(); - + List files = new ArrayList<>(); String pdbid = ""; try @@ -222,7 +222,7 @@ public class AppJmolBinding extends JalviewJmolBinding String[] filesInViewer = getStructureFiles(); // TODO: replace with reference fetching/transfer code (validate PDBentry // as a DBRef?) - + for (int pi = 0; pi < getPdbCount(); pi++) { PDBEntry strucEntry = getPdbEntry(pi); @@ -231,7 +231,8 @@ public class AppJmolBinding extends JalviewJmolBinding if (file == null) { pdbid = strucEntry.getId(); - try{ + try + { file = structureViewer.fetchPdbFile(strucEntry); } catch (OutOfMemoryError oomerror) { @@ -241,7 +242,7 @@ public class AppJmolBinding extends JalviewJmolBinding ex.printStackTrace(); errormsgs.append("'").append(pdbid).append("'"); } - if (file!=null) + if (file != null) { // success files.add(file);