X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=844faa7c90db1ef525b9f81ae5b9a4e1fce7d648;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=6b06e5656fbb74a8412123c78d308ac3ebc80168;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git

diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java
index 6b06e56..844faa7 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.log.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<String> 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);
@@ -282,7 +283,7 @@ public class AppJmolBinding extends JalviewJmolBinding
     }
     if (errormsgs.length() > 0)
     {
-      JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+	JvOptionPane.showInternalMessageDialog(Desktop.getInstance(),
               MessageManager.formatMessage(
                       "label.pdb_entries_couldnt_be_retrieved", new String[]
                       { errormsgs.toString() }),