Merge branch 'JAL-3878_ws-overhaul-3' into mmw/Release_2_12_ws_merge

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

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 9f92eb5..42f2ddb 100644 (file)
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -20,6 +20,7 @@
  */
 package jalview.gui;
 
+import jalview.bin.Console;
 import jalview.gui.OptsAndParamsPage.OptionBox;
 import jalview.gui.OptsAndParamsPage.ParamBox;
 import jalview.util.MessageManager;
@@ -29,7 +30,6 @@ import jalview.ws.params.OptionI;
 import jalview.ws.params.ParamDatastoreI;
 import jalview.ws.params.ParameterI;
 import jalview.ws.params.WsParamSetI;
-
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -190,10 +190,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
           WsParamSetI preset, List<ArgumentI> jobArgset)
   {
     super();
-
     // parameters dialog in 'expanded' format (help text boxes)
     opanp = new OptsAndParamsPage(this, false);
-
     jbInit();
     this.paramStore = paramStorei;
     if (paramStore == null && service != null)
@@ -205,6 +203,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     validate();
   }
 
+
   /**
    * Shows a modal dialog containing the parameters and Start or Cancel options.
    * Answers true if the job is started, false if cancelled.
@@ -213,6 +212,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
    */
   public CompletionStage<Boolean> showRunDialog()
   {
+
+    // Should JFrame hahve a parent of getDesktop ?
     frame = new JFrame();
     frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
     if (service != null)
@@ -242,6 +243,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     });
     
     frame.setVisible(true);
+
     return completionStage;
   }
 
@@ -359,7 +361,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
     paramPane.getViewport().setView(jp);
     paramPane.setBorder(null);
     setLayout(new BorderLayout());
-
     JPanel jobPanel = new JPanel();
     jobPanel.setPreferredSize(null);
     jobPanel.setLayout(new BorderLayout());
@@ -479,7 +480,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
       exnames.put(SVC_DEF, SVC_DEF);
       servicePresets.put(SVC_DEF, SVC_DEF);
     }
-
     // String curname = (p == null ? "" : p.getName());
     for (WsParamSetI pr : paramStore.getPresets())
     {
@@ -520,6 +520,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
       }
     }
     settingDialog = false;
+
   }
 
   private void updateTable(WsParamSetI p, List<ArgumentI> jobArgset)
@@ -629,6 +630,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     return modifiedElements.size() > 0;
   }
 
+
   /**
    * reset gui and modification state settings
    */
@@ -868,6 +870,8 @@ public class WsJobParameters extends JPanel implements ItemListener,
     paramPane.revalidate();
     revalidate();
   }
+
+
   public boolean isServiceDefaults()
   {
     return (!isModified()
@@ -879,6 +883,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     return opanp.getCurrentSettings();
   }
 
+
   /*
    * Hashtable<String, Object[]> editedParams = new Hashtable<String,
    * Object[]>();
@@ -1019,8 +1024,11 @@ public class WsJobParameters extends JPanel implements ItemListener,
             && e.getStateChange() == ItemEvent.SELECTED)
     {
       final String setname = (String) setName.getSelectedItem();
-      // System.out.println("Item state changed for " + setname
-      // + " (handling ? " + !settingDialog + ")");
+      if (Console.isDebugEnabled())
+      {
+        Console.debug("Item state changed for " + setname + " (handling ? "
+                + !settingDialog + ")");
+      }
       if (settingDialog)
       {
         // ignore event