Merge branch 'Release_2_8_2_Branch' into

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

diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java
index 10082eb..236d094 100644 (file)
--- a/src/jalview/gui/ChimeraViewFrame.java
+++ b/src/jalview/gui/ChimeraViewFrame.java
@@ -154,7 +154,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
       _alignwith = new Vector<AlignmentPanel>();
     }
 
-    seqColourBy = new ViewSelectionMenu("Colour by ..", this, _colourwith,
+    seqColourBy = new ViewSelectionMenu(MessageManager.getString("label.colour_by"), this, _colourwith,
             new ItemListener()
             {
 
@@ -174,7 +174,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
             });
     viewMenu.add(seqColourBy);
     final ItemListener handler;
-    JMenu alpanels = new ViewSelectionMenu("Superpose with ..", this,
+    JMenu alpanels = new ViewSelectionMenu(MessageManager.getString("label.superpose_with"), this,
             _alignwith, handler = new ItemListener()
             {
 
@@ -698,7 +698,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
           long hdl = pdbid.hashCode() - System.currentTimeMillis();
           if (progressBar != null)
           {
-            progressBar.setProgressBar("Fetching PDB " + pdbid, hdl);
+            progressBar.setProgressBar(MessageManager.formatMessage("status.fetching_pdb", new String[]{pdbid}), hdl);
           }
           try
           {
@@ -714,7 +714,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
           }
           if (progressBar != null)
           {
-            progressBar.setProgressBar("Finished.", hdl);
+            progressBar.setProgressBar(MessageManager.getString("label.state_completed"), hdl);
           }
           if (pdbseq != null)
           {
@@ -866,7 +866,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
             jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
 
     chooser.setFileView(new JalviewFileView());
-    chooser.setDialogTitle("Save PDB File");
+    chooser.setDialogTitle(MessageManager.getString("label.save_pdb_file"));
     chooser.setToolTipText(MessageManager.getString("action.save"));
 
     int value = chooser.showSaveDialog(this);
@@ -928,7 +928,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
    */
   public void eps_actionPerformed(ActionEvent e)
   {
-    throw new Error("EPS Generation not yet implemented.");
+    throw new Error(MessageManager.getString("error.eps_generation_not_implemented"));
   }
 
   /**
@@ -939,7 +939,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
    */
   public void png_actionPerformed(ActionEvent e)
   {
-    throw new Error("PNG Generation not yet implemented.");
+           throw new Error(MessageManager.getString("error.png_generation_not_implemented"));
   }
 
   public void jmolColour_actionPerformed(ActionEvent actionEvent)
@@ -1044,7 +1044,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
   public void backGround_actionPerformed(ActionEvent actionEvent)
   {
     java.awt.Color col = JColorChooser.showDialog(this,
-            "Select Background Colour", null);
+               MessageManager.getString("label.select_backgroud_colour"), null);
     if (col != null)
     {
       jmb.setBackgroundColour(col);