X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=196eb32d09e712eb1b789af5868ea98436dd4a6f;hb=8a2a0cda7067530f8481c2aec203e18d555f2dfd;hp=10798f61077cde5f6ad862cd77b42d93ed95e0dd;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 10798f6..196eb32 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -20,19 +20,6 @@
  */
 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.jabaws2.Jws2Instance;
-import jalview.ws.params.ArgumentI;
-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;
@@ -69,14 +56,26 @@ import javax.swing.border.TitledBorder;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
-import net.miginfocom.swing.MigLayout;
-
 import compbio.metadata.Argument;
 import compbio.metadata.Option;
 import compbio.metadata.Parameter;
 import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.RunnerConfig;
+import jalview.bin.Console;
+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.jabaws2.Jws2Instance;
+import jalview.ws.params.ArgumentI;
+import jalview.ws.params.OptionI;
+import jalview.ws.params.ParamDatastoreI;
+import jalview.ws.params.ParameterI;
+import jalview.ws.params.WsParamSetI;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * job parameter editing/browsing dialog box. User can browse existing settings
@@ -494,7 +493,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     else
     {
       // TODO: show warning
-      System.err.println("Invalid name. Not saved.");
+      jalview.bin.Console.errPrintln("Invalid name. Not saved.");
     }
   }
 
@@ -643,7 +642,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
           }
           else
           {
-            System.err.println("Ignoring unknown service argument type "
+            jalview.bin.Console.errPrintln("Ignoring unknown service argument type "
                     + myarg.getClass().getName());
           }
         }
@@ -686,7 +685,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
         {
           if (arg instanceof OptionI)
           {
-            // System.out.println("Setting option "
+            // jalview.bin.Console.outPrintln("Setting option "
             // + System.identityHashCode(arg) + ":" + arg.getName()
             // + " with " + arg.getDefaultValue());
             opanp.selectOption((OptionI) arg, arg.getValue());
@@ -875,7 +874,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
         if (cw + 120 > panewidth)
         {
           jobOptions.add(pbox, "wrap");
-          // System.out.println("Wrap on "+pbox.option.getName());
+          // jalview.bin.Console.outPrintln("Wrap on "+pbox.option.getName());
           cw = hgap + pbox.getSize().width;
           fh = true;
         }
@@ -947,7 +946,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     }
     // TODO: waste some time trying to eliminate any unnecessary .validate calls
     // here
-    // System.out.println("Size will be : "+w+","+os);
+    // jalview.bin.Console.outPrintln("Size will be : "+w+","+os);
     // optsAndparams.setPreferredSize(null);
     // paramPane.getViewport().setView(optsAndparams);
     paramPane.getViewport().setAutoscrolls(true);
@@ -959,6 +958,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
    * testing method - grab a service and parameter set and show the window
    * 
    * @param args
+   * @j2sIgnore
    */
   public static void main(String[] args)
   {
@@ -967,7 +967,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
     int p = 0;
     if (args.length > 0)
     {
-      Vector<String> services = new Vector<String>();
+      Vector<String> services = new Vector<>();
       services.addElement(args[p++]);
       Jws2Discoverer.getDiscoverer().setServiceUrls(services);
     }
@@ -976,7 +976,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
       disc.run();
     } catch (Exception e)
     {
-      System.err.println("Aborting. Problem discovering services.");
+      jalview.bin.Console.errPrintln("Aborting. Problem discovering services.");
       e.printStackTrace();
       return;
     }
@@ -1023,7 +1023,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
               pr = en.next();
             }
             {
-              System.out.println("Testing opts dupes for "
+              jalview.bin.Console.outPrintln("Testing opts dupes for "
                       + lastserv.getUri() + " : " + lastserv.getActionText()
                       + ":" + pr.getName());
               List<Option> rg = lastserv.getRunnerConfig().getOptions();
@@ -1034,17 +1034,17 @@ public class WsJobParameters extends JPanel implements ItemListener,
                   Option cpy = jalview.ws.jws2.ParameterUtils.copyOption(o);
                 } catch (Exception e)
                 {
-                  System.err.println("Failed to copy " + o.getName());
+                  jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
                   e.printStackTrace();
                 } catch (Error e)
                 {
-                  System.err.println("Failed to copy " + o.getName());
+                  jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
                   e.printStackTrace();
                 }
               }
             }
             {
-              System.out.println("Testing param dupes:");
+              jalview.bin.Console.outPrintln("Testing param dupes:");
               List<Parameter> rg = lastserv.getRunnerConfig()
                       .getParameters();
               for (Parameter o : rg)
@@ -1055,17 +1055,17 @@ public class WsJobParameters extends JPanel implements ItemListener,
                           .copyParameter(o);
                 } catch (Exception e)
                 {
-                  System.err.println("Failed to copy " + o.getName());
+                  jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
                   e.printStackTrace();
                 } catch (Error e)
                 {
-                  System.err.println("Failed to copy " + o.getName());
+                  jalview.bin.Console.errPrintln("Failed to copy " + o.getName());
                   e.printStackTrace();
                 }
               }
             }
             {
-              System.out.println("Testing param write:");
+              jalview.bin.Console.outPrintln("Testing param write:");
               List<String> writeparam = null, readparam = null;
               try
               {
@@ -1073,7 +1073,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
                         .writeParameterSet(
                                 pr.getArguments(lastserv.getRunnerConfig()),
                                 " ");
-                System.out.println("Testing param read :");
+                jalview.bin.Console.outPrintln("Testing param read :");
                 List<Option> pset = jalview.ws.jws2.ParameterUtils
                         .processParameters(writeparam,
                                 lastserv.getRunnerConfig(), " ");
@@ -1087,7 +1087,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
                   String on = o.next(), sn = s.next(), st = t.next();
                   if (!sn.equals(st))
                   {
-                    System.out.println(
+                    jalview.bin.Console.outPrintln(
                             "Original was " + on + " Phase 1 wrote " + sn
                                     + "\tPhase 2 wrote " + st);
                     failed = true;
@@ -1095,11 +1095,11 @@ public class WsJobParameters extends JPanel implements ItemListener,
                 }
                 if (failed)
                 {
-                  System.out.println(
+                  jalview.bin.Console.outPrintln(
                           "Original parameters:\n" + pr.getOptions());
-                  System.out.println(
+                  jalview.bin.Console.outPrintln(
                           "Wrote parameters in first set:\n" + writeparam);
-                  System.out.println(
+                  jalview.bin.Console.outPrintln(
                           "Wrote parameters in second set:\n" + readparam);
 
                 }
@@ -1183,7 +1183,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
               {
                 inter = true;
               }
-              ;
             }
             jf.dispose();
           }
@@ -1224,7 +1223,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
    * + storeSetName + ": ", jobParams); }
    * 
    * private void writeParam(String nm, List<ArgumentI> params) { for (ArgumentI
-   * p : params) { System.out.println(nm + ":" + System.identityHashCode(p) +
+   * p : params) { jalview.bin.Console.outPrintln(nm + ":" + System.identityHashCode(p) +
    * " Name: " + p.getName() + " Value: " + p.getDefaultValue()); } }
    * 
    * private Object[] _getUserPreset(String setName) { Object[] pset =
@@ -1340,8 +1339,11 @@ public class WsJobParameters extends JPanel implements ItemListener,
     if (e.getSource() == setName && e.getStateChange() == e.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
@@ -1374,7 +1376,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
         return;
       }
       settingDialog = true;
-      System.out.println("Prompting to save " + lsetname);
+      jalview.bin.Console.outPrintln("Prompting to save " + lsetname);
       if (JvOptionPane.showConfirmDialog(this, "Parameter set '" + lsetname
               + "' is modifed, and your changes will be lost.\nReally change preset ?",
               "Warning: Unsaved Changes",
@@ -1386,7 +1388,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
         settingDialog = false;
         // and leave.
         return;
-        // System.out.println("Saving for " + lsetname);
+        // jalview.bin.Console.outPrintln("Saving for " + lsetname);
         // _storeCurrentPreset(lsetname);
 
       }
@@ -1465,7 +1467,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
           return;
         }
         curSetName = newname;
-        System.err.println("New name for user setting " + curSetName
+        jalview.bin.Console.errPrintln("New name for user setting " + curSetName
                 + " (was " + setName.getSelectedItem() + ")");
         if (curSetName.equals(setName.getSelectedItem()))
         {