Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

[jalview.git] / src / jalview / gui / AppJmol.java

diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java
index 458abc6..41fdb8e 100644 (file)
--- a/src/jalview/gui/AppJmol.java
+++ b/src/jalview/gui/AppJmol.java
@@ -20,6 +20,8 @@
  */
 package jalview.gui;
 
+import java.util.Locale;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -50,7 +52,6 @@ import jalview.util.BrowserLauncher;
 import jalview.util.ImageMaker;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
-
 public class AppJmol extends StructureViewerBase
 {
   // ms to wait for Jmol to load files
@@ -104,7 +105,6 @@ public class AppJmol extends StructureViewerBase
               .toArray(new SequenceI[sequencesForPdb.size()]);
       i++;
     }
-
     // TODO: check if protocol is needed to be set, and if chains are
     // autodiscovered.
     jmb = new AppJmolBinding(this, ap.getStructureSelectionManager(),
@@ -132,7 +132,6 @@ public class AppJmol extends StructureViewerBase
       seqColour.setSelected(true);
       viewerColour.setSelected(false);
     }
-
     this.setBounds(viewerModel.getX(), viewerModel.getY(),
             viewerModel.getWidth(), viewerModel.getHeight());
     setViewId(viewid);
@@ -157,6 +156,7 @@ public class AppJmol extends StructureViewerBase
   {
     super.initMenus();
 
+
     viewerColour
             .setText(MessageManager.getString("label.colour_with_jmol"));
     viewerColour.setToolTipText(MessageManager
@@ -434,7 +434,7 @@ public class AppJmol extends StructureViewerBase
         jmb.jmolViewer.renderScreenImage(g, width, height);
       }
     };
-    String view = MessageManager.getString("action.view").toLowerCase();
+    String view = MessageManager.getString("action.view").toLowerCase(Locale.ROOT);
     ImageExporter exporter = new ImageExporter(writer,
             getProgressIndicator(), type, getTitle());
     exporter.doExport(null, this, width, height, view);
@@ -456,6 +456,7 @@ public class AppJmol extends StructureViewerBase
   @Override
   public void showConsole(boolean showConsole)
   {
+
     if (showConsole)
     {
       if (splitPane == null)