X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=c1b09b7471f50c4cadacc4d4b614f887d72e132e;hb=8edebdd9789b2d93fb8f9db24b8be2c1e6317690;hp=2266bf8d21abac6cfba80558ac685d0eba819b75;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 2266bf8..c1b09b7 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1,27 +1,32 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
 import jalview.gui.OptsAndParamsPage.OptionBox;
 import jalview.gui.OptsAndParamsPage.ParamBox;
+import jalview.util.MessageManager;
 import jalview.ws.jws2.JabaParamStore;
 import jalview.ws.jws2.JabaPreset;
 import jalview.ws.jws2.Jws2Discoverer;
+import jalview.ws.jws2.ParameterUtils;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ArgumentI;
 import jalview.ws.params.OptionI;
@@ -214,7 +219,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
     frame = new JDialog(Desktop.instance, true);
 
-    frame.setTitle("Edit parameters for " + service.getActionText());
+    frame.setTitle(MessageManager.formatMessage("label.edit_params_for",
+            new String[]
+            { service.getActionText() }));
     Rectangle deskr = Desktop.instance.getBounds();
     Dimension pref = this.getPreferredSize();
     frame.setBounds(new Rectangle(
@@ -261,8 +268,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
       }
     });
-    updatepref = JvSwingUtils.makeButton("Update",
-            "Update this existing user parameter set.",
+    updatepref = JvSwingUtils.makeButton(
+            MessageManager.getString("action.update"),
+            MessageManager.getString("label.update_user_parameter_set"),
             new ActionListener()
             {
 
@@ -271,8 +279,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
                 update_actionPerformed(e);
               }
             });
-    deletepref = JvSwingUtils.makeButton("Delete",
-            "Delete the currently selected user parameter set.",
+    deletepref = JvSwingUtils.makeButton(
+            MessageManager.getString("action.delete"),
+            MessageManager.getString("label.delete_user_parameter_set"),
             new ActionListener()
             {
 
@@ -281,8 +290,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
                 delete_actionPerformed(e);
               }
             });
-    createpref = JvSwingUtils.makeButton("Create",
-            "Create a new parameter set with the current settings.",
+    createpref = JvSwingUtils.makeButton(
+            MessageManager.getString("action.create"),
+            MessageManager.getString("label.create_user_parameter_set"),
             new ActionListener()
             {
 
@@ -291,8 +301,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
                 create_actionPerformed(e);
               }
             });
-    revertpref = JvSwingUtils.makeButton("Revert",
-            "Undo all changes to the current parameter set",
+    revertpref = JvSwingUtils.makeButton(MessageManager
+            .getString("action.revert"), MessageManager
+            .getString("label.revert_changes_user_parameter_set"),
             new ActionListener()
             {
 
@@ -301,16 +312,20 @@ public class WsJobParameters extends JPanel implements ItemListener,
                 revert_actionPerformed(e);
               }
             });
-    startjob = JvSwingUtils.makeButton("Start Job",
-            "Start Job with current settings.", new ActionListener()
+    startjob = JvSwingUtils.makeButton(
+            MessageManager.getString("action.start_job"),
+            MessageManager.getString("label.start_job_current_settings"),
+            new ActionListener()
             {
               public void actionPerformed(ActionEvent e)
               {
                 startjob_actionPerformed(e);
               }
             });
-    canceljob = JvSwingUtils.makeButton("Cancel Job",
-            "Close this dialog and cancel job.", new ActionListener()
+    canceljob = JvSwingUtils.makeButton(
+            MessageManager.getString("action.cancel_job"),
+            MessageManager.getString("label.cancel_job_close_dialog"),
+            new ActionListener()
             {
               public void actionPerformed(ActionEvent e)
               {
@@ -318,7 +333,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
               }
             });
 
-    setDetails.setBorder(new TitledBorder("Details"));
+    setDetails.setBorder(new TitledBorder(MessageManager
+            .getString("label.details")));
     setDetails.setLayout(new BorderLayout());
     setDescr.setColumns(40);
     setDescr.setWrapStyleWord(true);
@@ -326,9 +342,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
     setDescr.setBackground(getBackground());
     setDescr.setEditable(true);
     setDescr.getDocument().addDocumentListener(this);
-    setDescr.setToolTipText("Click to edit the notes for this parameter set.");
+    setDescr.setToolTipText(MessageManager
+            .getString("label.edit_notes_parameter_set"));
     JScrollPane setDescrView = new JScrollPane();
-    // setDescrView.setPreferredSize(new Dimension(350, 200));
     setDescrView.getViewport().setView(setDescr);
     setName.setEditable(true);
     setName.addItemListener(this);
@@ -337,7 +353,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
     GridBagLayout gbl = new GridBagLayout();
     SetNamePanel.setLayout(gbl);
 
-    JLabel setNameLabel = new JLabel("Current parameter set name :");
+    JLabel setNameLabel = new JLabel(
+            MessageManager.getString("label.current_parameter_set_name"));
     setNameLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
 
     setNameInfo.add(setNameLabel);
@@ -376,9 +393,11 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
     // paramPane.setPreferredSize(new Dimension(360, 400));
     // paramPane.setPreferredSize(null);
-    jobOptions.setBorder(new TitledBorder("Options"));
+    jobOptions.setBorder(new TitledBorder(MessageManager
+            .getString("label.options")));
     jobOptions.setOpaque(true);
-    paramList.setBorder(new TitledBorder("Parameters"));
+    paramList.setBorder(new TitledBorder(MessageManager
+            .getString("label.parameters")));
     paramList.setOpaque(true);
     JPanel bjo = new JPanel(new BorderLayout()), bjp = new JPanel(
             new BorderLayout());
@@ -409,6 +428,11 @@ public class WsJobParameters extends JPanel implements ItemListener,
     JPanel dialogpanel = new JPanel();
     dialogpanel.add(startjob);
     dialogpanel.add(canceljob);
+    // JAL-1580: setMaximumSize() doesn't work, so just size for the worst case:
+    // check for null is for JUnit usage
+    final int windowHeight = Desktop.instance == null ? 540
+            : Desktop.instance.getHeight();
+    setPreferredSize(new Dimension(540, windowHeight));
     add(dialogpanel, BorderLayout.SOUTH);
     validate();
   }
@@ -416,7 +440,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
   protected void revert_actionPerformed(ActionEvent e)
   {
     reInitDialog(lastParmSet);
-
+    updateWebServiceMenus();
   }
 
   protected void update_actionPerformed(ActionEvent e)
@@ -445,6 +469,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
       _deleteUserPreset(lastParmSet);
     }
     reInitDialog(null); // service default
+    updateWebServiceMenus();
   }
 
   protected void create_actionPerformed(ActionEvent e)
@@ -455,7 +480,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
       _storeCurrentPreset(curname);
       lastParmSet = curname;
       isUserPreset = true;
+      reInitDialog(curname);
       initArgSetModified();
+      updateWebServiceMenus();
     }
     else
     {
@@ -510,7 +537,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     Hashtable exnames = new Hashtable();
     for (int i = 0, iSize = setName.getItemCount(); i < iSize; i++)
     {
-      exnames.put((String) setName.getItemAt(i), setName.getItemAt(i));
+      exnames.put(setName.getItemAt(i), setName.getItemAt(i));
     }
     servicePresets = new Hashtable();
     // Add the default entry - if not present already.
@@ -566,12 +593,25 @@ public class WsJobParameters extends JPanel implements ItemListener,
   @SuppressWarnings("unchecked")
   private void updateTable(WsParamSetI p, List<ArgumentI> jobArgset)
   {
+    boolean setDefaultParams = false;
+    if (lastParmSet == null)
+    {
+      isUserPreset = false;
+      // First call - so provide Service default settings
+      setName.setSelectedItem(lastSetName = SVC_DEF);
+    }
+    if (p == null && SVC_DEF.equals("" + setName.getSelectedItem()))
+    {
+      // indicate that service defaults should be set if available
+      setDefaultParams = true;
+    }
     // populate table from default parameter set.
     List<ArgumentI> args = paramStore.getServiceParameters();
 
     // split to params and required arguments
     {
       int cw = 0;
+      boolean optset = false;
       for (ArgumentI myarg : args)
       {
         // Ideally, Argument would implement isRequired !
@@ -586,7 +626,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
           {
             OptionI opt = (OptionI) myarg;
             OptionBox ob = opanp.addOption(opt);
-            ob.resetToDefault();
+            ob.resetToDefault(setDefaultParams);
             if (MAX_OPTWIDTH < ob.getPreferredSize().width)
             {
               MAX_OPTWIDTH = ob.getPreferredSize().width;
@@ -620,16 +660,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
       // TODO: check if args should be unselected prior to resetting using the
       // preset
     }
-    else
-    {
-      if (lastParmSet == null)
-      {
-        isUserPreset = false;
-        // first call - so create a dummy name
-
-        setName.setSelectedItem(lastSetName = SVC_DEF);
-      }
-    }
 
     if (jobArgset != null)
     {
@@ -923,14 +953,13 @@ public class WsJobParameters extends JPanel implements ItemListener,
    */
   public static void main(String[] args)
   {
-    jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
-            .getDiscoverer();
+    Jws2Discoverer disc = Jws2Discoverer.getDiscoverer();
     int p = 0;
     if (args.length > 0)
     {
       Vector<String> services = new Vector<String>();
       services.addElement(args[p++]);
-      Jws2Discoverer.setServiceUrls(services);
+      Jws2Discoverer.getDiscoverer().setServiceUrls(services);
     }
     try
     {
@@ -992,7 +1021,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
               {
                 try
                 {
-                  Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o);
+                  Option cpy = ParameterUtils.copyOption(o);
                 } catch (Exception e)
                 {
                   System.err.println("Failed to copy " + o.getName());
@@ -1012,7 +1041,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
               {
                 try
                 {
-                  Parameter cpy = jalview.ws.jws2.ParameterUtils
+                  Parameter cpy = ParameterUtils
                           .copyParameter(o);
                 } catch (Exception e)
                 {
@@ -1030,15 +1059,15 @@ public class WsJobParameters extends JPanel implements ItemListener,
               List<String> writeparam = null, readparam = null;
               try
               {
-                writeparam = jalview.ws.jws2.ParameterUtils
+                writeparam = ParameterUtils
                         .writeParameterSet(
                                 pr.getArguments(lastserv.getRunnerConfig()),
                                 " ");
                 System.out.println("Testing param read :");
-                List<Option> pset = jalview.ws.jws2.ParameterUtils
+                List<Option> pset = ParameterUtils
                         .processParameters(writeparam,
                                 lastserv.getRunnerConfig(), " ");
-                readparam = jalview.ws.jws2.ParameterUtils
+                readparam = ParameterUtils
                         .writeParameterSet(pset, " ");
                 Iterator<String> o = pr.getOptions().iterator(), s = writeparam
                         .iterator(), t = readparam.iterator();
@@ -1071,8 +1100,9 @@ public class WsJobParameters extends JPanel implements ItemListener,
             }
             WsJobParameters pgui = new WsJobParameters(lastserv,
                     new JabaPreset(lastserv, pr));
-            JFrame jf = new JFrame("Parameters for "
-                    + lastserv.getActionText());
+            JFrame jf = new JFrame(MessageManager.formatMessage(
+                    "label.ws_parameters_for", new String[]
+                    { lastserv.getActionText() }));
             JPanel cont = new JPanel(new BorderLayout());
             pgui.validate();
             cont.setPreferredSize(pgui.getPreferredSize());
@@ -1271,7 +1301,18 @@ public class WsJobParameters extends JPanel implements ItemListener,
     SetNamePanel.validate();
     validate();
     settingDialog = false;
+  }
 
+  /**
+   * Rebuild the AlignFrame web service menus (after add/delete of a preset
+   * option).
+   */
+  protected void updateWebServiceMenus()
+  {
+    for (AlignFrame alignFrame : Desktop.getAlignFrames())
+    {
+      alignFrame.BuildWebServiceMenu();
+    }
   }
 
   String curSetName = null;
@@ -1382,7 +1423,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
       if (src.getParent() == setName)
       {
         // rename any existing records we know about for this set.
-        String newname = (String) e.getActionCommand().trim();
+        String newname = e.getActionCommand().trim();
         String msg = null;
         if (isServicePreset(newname))
         {
@@ -1396,9 +1437,10 @@ public class WsJobParameters extends JPanel implements ItemListener,
           {
             public void run()
             {
-              JOptionPane.showMessageDialog(ourframe,
-                      "Invalid name - preset already exists.",
-                      "Invalid name", JOptionPane.WARNING_MESSAGE);
+              JOptionPane.showMessageDialog(ourframe, MessageManager
+                      .getString("label.invalid_name_preset_exists"),
+                      MessageManager.getString("label.invalid_name"),
+                      JOptionPane.WARNING_MESSAGE);
             }
           });