Merge branch 'bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_...

[jalview.git] / src / jalview / appletgui / AppletJmol.java

diff --git a/src/jalview/appletgui/AppletJmol.java b/src/jalview/appletgui/AppletJmol.java
index 89a912f..cca9aff 100644 (file)
--- a/src/jalview/appletgui/AppletJmol.java
+++ b/src/jalview/appletgui/AppletJmol.java
@@ -20,25 +20,6 @@
  */
 package jalview.appletgui;
 
-import jalview.bin.JalviewLite;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.PDBEntry;
-import jalview.datamodel.SequenceI;
-import jalview.io.DataSourceType;
-import jalview.io.FileParse;
-import jalview.io.StructureFile;
-import jalview.schemes.BuriedColourScheme;
-import jalview.schemes.HelixColourScheme;
-import jalview.schemes.HydrophobicColourScheme;
-import jalview.schemes.PurinePyrimidineColourScheme;
-import jalview.schemes.StrandColourScheme;
-import jalview.schemes.TaylorColourScheme;
-import jalview.schemes.TurnColourScheme;
-import jalview.schemes.UserColourScheme;
-import jalview.schemes.ZappoColourScheme;
-import jalview.structure.StructureSelectionManager;
-import jalview.util.MessageManager;
-
 import java.awt.BorderLayout;
 import java.awt.CheckboxMenuItem;
 import java.awt.Color;
@@ -64,6 +45,25 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
+import jalview.bin.JalviewLite;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SequenceI;
+import jalview.io.DataSourceType;
+import jalview.io.FileParse;
+import jalview.io.StructureFile;
+import jalview.schemes.BuriedColourScheme;
+import jalview.schemes.HelixColourScheme;
+import jalview.schemes.HydrophobicColourScheme;
+import jalview.schemes.PurinePyrimidineColourScheme;
+import jalview.schemes.StrandColourScheme;
+import jalview.schemes.TaylorColourScheme;
+import jalview.schemes.TurnColourScheme;
+import jalview.schemes.UserColourScheme;
+import jalview.schemes.ZappoColourScheme;
+import jalview.structure.StructureSelectionManager;
+import jalview.util.MessageManager;
+
 public class AppletJmol extends EmbmenuFrame implements
         // StructureListener,
         KeyListener, ActionListener, ItemListener
@@ -104,16 +104,16 @@ public class AppletJmol extends EmbmenuFrame implements
           MessageManager.getString("label.colourScheme_hydrophobic"));
 
   MenuItem helix = new MenuItem(
-          MessageManager.getString("label.colourScheme_helix_propensity"));
+          MessageManager.getString("label.colourScheme_helixpropensity"));
 
   MenuItem strand = new MenuItem(
-          MessageManager.getString("label.colourScheme_strand_propensity"));
+          MessageManager.getString("label.colourScheme_strandpropensity"));
 
   MenuItem turn = new MenuItem(
-          MessageManager.getString("label.colourScheme_turn_propensity"));
+          MessageManager.getString("label.colourScheme_turnpropensity"));
 
   MenuItem buried = new MenuItem(
-          MessageManager.getString("label.colourScheme_buried_index"));
+          MessageManager.getString("label.colourScheme_buriedindex"));
 
   MenuItem purinepyrimidine = new MenuItem(
           MessageManager.getString("label.colourScheme_purine/pyrimidine"));
@@ -135,7 +135,7 @@ public class AppletJmol extends EmbmenuFrame implements
   AlignmentPanel ap;
 
   List<AlignmentPanel> _aps = new ArrayList<>(); // remove? never
-                                                               // added to
+                                                 // added to
 
   String fileLoadingError;
 
@@ -275,7 +275,7 @@ public class AppletJmol extends EmbmenuFrame implements
               "-applet", scriptWindow, null);
     } catch (Exception e)
     {
-      System.err.println(
+      jalview.bin.Console.errPrintln(
               "Couldn't create a jmol viewer. Args to allocate viewer were:\nDocumentBase="
                       + ap.av.applet.getDocumentBase() + "\nCodebase="
                       + ap.av.applet.getCodeBase());
@@ -320,7 +320,7 @@ public class AppletJmol extends EmbmenuFrame implements
           {
             if (jalview.bin.JalviewLite.debug)
             {
-              System.err.println(
+              jalview.bin.Console.errPrintln(
                       "AppletJmol:Trying to reuse existing PDBfile IO parser.");
             }
             // re-use the one we opened earlier
@@ -330,12 +330,12 @@ public class AppletJmol extends EmbmenuFrame implements
           {
             if (jalview.bin.JalviewLite.debug)
             {
-              System.err.println(
+              jalview.bin.Console.errPrintln(
                       "AppletJmol:Creating new PDBfile IO parser.");
             }
             FileParse fp = new FileParse(pdbentry.getFile(), protocol);
             fp.mark();
-            // reader = new MCview.PDBfile(fp);
+            // reader = new mc_view.PDBfile(fp);
             // could set ID, etc.
             // if (!reader.isValid())
             // {
@@ -355,7 +355,7 @@ public class AppletJmol extends EmbmenuFrame implements
         } catch (Exception e)
         {
           // give up!
-          System.err.println("Couldn't access pdbentry id="
+          jalview.bin.Console.errPrintln("Couldn't access pdbentry id="
                   + pdbentry.getId() + " and file=" + pdbentry.getFile()
                   + " using protocol=" + protocol);
           e.printStackTrace();
@@ -411,7 +411,7 @@ public class AppletJmol extends EmbmenuFrame implements
 
   void closeViewer()
   {
-    jmb.closeViewer();
+    jmb.closeViewer(true);
     jmb = null;
     this.setVisible(false);
   }
@@ -433,7 +433,7 @@ public class AppletJmol extends EmbmenuFrame implements
       } catch (OutOfMemoryError ex)
       {
         frame.dispose();
-        System.err.println(
+        jalview.bin.Console.errPrintln(
                 "Out of memory when trying to create dialog box with sequence-structure mapping.");
         return;
       }