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 6665ec8..cca9aff 100644 (file)
--- a/src/jalview/appletgui/AppletJmol.java
+++ b/src/jalview/appletgui/AppletJmol.java
@@ -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,7 +330,7 @@ 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);
@@ -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();
@@ -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;
       }