JAL-1355

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 772a5d7..a3cec98 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -452,7 +452,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
           public void run()
           {
             long instance = System.currentTimeMillis();
-            Desktop.instance.setProgressBar("Refreshing news", instance);
+            Desktop.instance.setProgressBar(MessageManager.getString("status.refreshing_news"), instance);
             jvnews.refreshNews();
             Desktop.instance.setProgressBar(null, instance);
             jvnews.showNews();
@@ -1012,7 +1012,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       if (format.equals("URL NOT FOUND"))
       {
         JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                "Couldn't locate " + url, "URL not found",
+                MessageManager.formatMessage("label.couldnt_locate", new String[]{url}), MessageManager.getString("label.url_not_found"),
                 JOptionPane.WARNING_MESSAGE);
 
         return;
@@ -1386,7 +1386,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
             { "Jalview Project" }, "Jalview Project");
 
     chooser.setFileView(new JalviewFileView());
-    chooser.setDialogTitle("Save State");
+    chooser.setDialogTitle(MessageManager.getString("label.save_state"));
 
     int value = chooser.showSaveDialog(this);
 
@@ -1399,7 +1399,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
         public void run()
         {
 
-          setProgressBar("Saving jalview project " + choice.getName(),
+          setProgressBar(MessageManager.formatMessage("label.saving_jalview_project", new String[]{choice.getName()}),
                   choice.hashCode());
           jalview.bin.Cache.setProperty("LAST_DIRECTORY",
                   choice.getParent());
@@ -1443,7 +1443,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
             { "Jalview Project", "Jalview Project (old)" },
             "Jalview Project");
     chooser.setFileView(new JalviewFileView());
-    chooser.setDialogTitle("Restore state");
+    chooser.setDialogTitle(MessageManager.getString("label.restore_state"));
 
     int value = chooser.showOpenDialog(this);
 
@@ -1456,7 +1456,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       {
         public void run()
         {
-          setProgressBar("loading jalview project " + choice,
+          setProgressBar(MessageManager.formatMessage("label.loading_jalview_project", new String[]{choice}),
                   choice.hashCode());
           try
           {
@@ -1491,8 +1491,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   {
     if (fileLoadingCount == 0)
     {
-      fileLoadingPanels.add(addProgressPanel("Loading File: " + fileName
-              + "   "));
+      fileLoadingPanels.add(addProgressPanel(MessageManager.formatMessage("label.loading_file", new String[]{fileName})));
     }
     fileLoadingCount++;
   }
@@ -1730,7 +1729,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
               jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
 
       chooser.setFileView(new JalviewFileView());
-      chooser.setDialogTitle("Open a saved VAMSAS session");
+      chooser.setDialogTitle(MessageManager.getString("label.open_saved_vamsas_session"));
       chooser.setToolTipText(MessageManager
               .getString("label.select_vamsas_session_opened_as_new_vamsas_session"));
 
@@ -1823,22 +1822,22 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       return false;
     }
 
-    setProgressBar("Importing VAMSAS session from " + file.getName(),
+    setProgressBar(MessageManager.formatMessage("status.importing_vamsas_session_from", new String[]{file.getName()}),
             file.hashCode());
     try
     {
       v_client = new jalview.gui.VamsasApplication(this, file, null);
     } catch (Exception ex)
     {
-      setProgressBar("Importing VAMSAS session from " + file.getName(),
-              file.hashCode());
+        setProgressBar(MessageManager.formatMessage("status.importing_vamsas_session_from", new String[]{file.getName()}),
+                file.hashCode());
       jalview.bin.Cache.log.error(
               "New vamsas session from existing session file failed:", ex);
       return false;
     }
     setupVamsasConnectedGui();
     v_client.initial_update(); // TODO: thread ?
-    setProgressBar("Importing VAMSAS session from " + file.getName(),
+    setProgressBar(MessageManager.formatMessage("status.importing_vamsas_session_from", new String[]{file.getName()}),
             file.hashCode());
     return v_client.inSession();
   }
@@ -1847,12 +1846,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   {
     if (v_client != null)
     {
-      throw new Error(
-              "Trying to join a vamsas session when another is already connected.");
+      throw new Error(MessageManager.getString("error.try_join_vamsas_session_another"));
     }
     if (mysesid == null)
     {
-      throw new Error("Invalid vamsas session id.");
+      throw new Error(MessageManager.getString("error.invalid_vamsas_session_id"));
     }
     v_client = new VamsasApplication(this, mysesid);
     setupVamsasConnectedGui();
@@ -1999,15 +1997,14 @@ public class Desktop extends jalview.jbgui.GDesktop implements
               { "Vamsas Document" }, "Vamsas Document");
 
       chooser.setFileView(new JalviewFileView());
-      chooser.setDialogTitle("Save Vamsas Document Archive");
+      chooser.setDialogTitle(MessageManager.getString("label.save_vamsas_document_archive"));
 
       int value = chooser.showSaveDialog(this);
 
       if (value == JalviewFileChooser.APPROVE_OPTION)
       {
         java.io.File choice = chooser.getSelectedFile();
-        JPanel progpanel = addProgressPanel("Saving VAMSAS Document to "
-                + choice.getName());
+        JPanel progpanel = addProgressPanel(MessageManager.formatMessage("label.saving_vamsas_doc", new String[]{choice.getName()}));
         jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
         String warnmsg = null;
         String warnttl = null;
@@ -2059,7 +2056,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     }
     if (b)
     {
-      vamUpdate = this.addProgressPanel("Updating vamsas session");
+      vamUpdate = this.addProgressPanel(MessageManager.getString("label.updating_vamsas_session"));
     }
     vamsasStart.setVisible(!b);
     vamsasStop.setVisible(!b);
@@ -2290,8 +2287,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     // use reflection to avoid creating compilation dependency.
     if (!jalview.bin.Cache.groovyJarsPresent())
     {
-      throw new Error(
-              "Implementation Error. Cannot create groovyShell without Groovy on the classpath!");
+      throw new Error(MessageManager.getString("error.implementation_error_cannot_create_groovyshell"));
     }
     try
     {
@@ -2313,8 +2309,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
               .showInternalMessageDialog(
                       Desktop.desktop,
 
-                      "Couldn't create the groovy Shell. Check the error log for the details of what went wrong.",
-                      "Jalview Groovy Support Failed",
+                      MessageManager.getString("label.couldnt_create_groovy_shell"),
+                      MessageManager.getString("label.groovy_support_failed"),
                       JOptionPane.ERROR_MESSAGE);
     }
   }
@@ -2365,8 +2361,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   {
     if (progressBarHandlers == null || !progressBars.contains(new Long(id)))
     {
-      throw new Error(
-              "call setProgressBar before registering the progress bar's handler.");
+      throw new Error(MessageManager.getString("error.call_setprogressbar_before_registering_handler"));
     }
     progressBarHandlers.put(new Long(id), handler);
     final JPanel progressPanel = (JPanel) progressBars.get(new Long(id));
@@ -2381,10 +2376,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
         public void actionPerformed(ActionEvent e)
         {
           handler.cancelActivity(id);
-          us.setProgressBar(
-                  "Cancelled "
-                          + ((JLabel) progressPanel.getComponent(0))
-                                  .getText(), id);
+          us.setProgressBar(MessageManager.formatMessage("label.cancelled_params", new String[]{((JLabel) progressPanel.getComponent(0)).getText()}), id);
         }
       });
       progressPanel.add(cancel, BorderLayout.EAST);
@@ -2646,7 +2638,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
         {
           if (progress != null)
           {
-            progress.setProgressBar("Opening " + url, this.hashCode());
+            progress.setProgressBar(MessageManager.formatMessage("status.opening_params", new String[]{url}), this.hashCode());
           }
           jalview.util.BrowserLauncher.openURL(url);
         } catch (Exception ex)
@@ -2654,9 +2646,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
           JOptionPane
                   .showInternalMessageDialog(
                           Desktop.desktop,
-                          "Unixers: Couldn't find default web browser."
-                                  + "\nAdd the full path to your browser in Preferences.",
-                          "Web browser not found",
+                          MessageManager.getString("label.web_browser_not_found_unix"),
+                          MessageManager.getString("label.web_browser_not_found"),
                           JOptionPane.WARNING_MESSAGE);
 
           ex.printStackTrace();