X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Client.java;h=2f996bd0939a249b2ae6f27fc7f304a6df2b089c;hb=cb8e52fbbc5f725e3f7f48c672cdddb0690bd978;hp=4f6e8f65c629d80beda23bc0a921220cfb5cf828;hpb=aced09c4feeaf3406269442c14e54abeeb4cad81;p=jalview.git

diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java
index 4f6e8f6..2f996bd 100644
--- a/src/jalview/ws/jws2/Jws2Client.java
+++ b/src/jalview/ws/jws2/Jws2Client.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -32,7 +32,7 @@ import javax.swing.event.MenuListener;
 
 import compbio.metadata.Argument;
 import jalview.api.AlignCalcWorkerI;
-import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
 import jalview.gui.JvSwingUtils;
@@ -66,7 +66,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient
     this.preset = preset;
     if (preset != null)
     {
-      if (!((preset instanceof JabaPreset) || preset instanceof JabaWsParamSet))
+      if (!((preset instanceof JabaPreset)
+              || preset instanceof JabaWsParamSet))
       {
         /*
          * { this.preset = ((JabaPreset) preset).p; } else if (preset instanceof
@@ -77,7 +78,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient
          * arguments. for (Argument opt : arguments) { newargs.add(opt); } }
          * paramset = newargs; } else {
          */
-        throw new Error(MessageManager.getString("error.implementation_error_can_only_instantiate_jaba_param_sets"));
+        throw new Error(MessageManager.getString(
+                "error.implementation_error_can_only_instantiate_jaba_param_sets"));
       }
     }
     else
@@ -103,9 +105,10 @@ public abstract class Jws2Client extends jalview.ws.WSClient
         sh.paramStore = new JabaParamStore(sh,
                 Desktop.getUserParameterStore());
       }
-      WsJobParameters jobParams = (preset == null && paramset != null && paramset
-              .size() > 0) ? new WsJobParameters(null, sh, null, paramset)
-              : new WsJobParameters(sh, preset);
+      WsJobParameters jobParams = (preset == null && paramset != null
+              && paramset.size() > 0)
+                      ? new WsJobParameters(null, sh, null, paramset)
+                      : new WsJobParameters(sh, preset);
       if (adjustingExisting)
       {
         jobParams.setName(MessageManager
@@ -118,8 +121,10 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       WsParamSetI prset = jobParams.getPreset();
       if (prset == null)
       {
-        paramset = jobParams.isServiceDefaults() ? null : JabaParamStore
-                .getJabafromJwsArgs(jobParams.getJobParams());
+        paramset =
+                /* JAL-3739 always take values from input form */
+                /* jobParams.isServiceDefaults() ? null : */
+                JabaParamStore.getJabafromJwsArgs(jobParams.getJobParams());
         this.preset = null;
       }
       else
@@ -146,9 +151,11 @@ public abstract class Jws2Client extends jalview.ws.WSClient
     WsURL = serv.hosturl;
     if (!b)
     {
-      return new WebserviceInfo(WebServiceJobTitle, WebServiceJobTitle
-              + " using service hosted at " + serv.hosturl + "\n"
-              + (serv.description != null ? serv.description : ""));
+      return new WebserviceInfo(WebServiceJobTitle,
+              WebServiceJobTitle + " using service hosted at "
+                      + serv.hosturl + "\n"
+                      + (serv.description != null ? serv.description : ""),
+              false);
     }
     return null;
   }
@@ -173,7 +180,6 @@ public abstract class Jws2Client extends jalview.ws.WSClient
    */
   abstract void attachWSMenuEntry(JMenu wsmenu, final Jws2Instance service,
           final AlignFrame alignFrame);
-  
 
   protected boolean registerAAConWSInstance(final JMenu wsmenu,
           final Jws2Instance service, final AlignFrame alignFrame)
@@ -218,7 +224,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
               removeCurrentAAConWorkerFor(aaui, alignFrame);
               buildCurrentAAConWorkerFor(aaui, alignFrame, service);
             }
-          }// );
+          } // );
         }
       }
     }
@@ -230,9 +236,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       final JCheckBoxMenuItem aaConEnabled = new JCheckBoxMenuItem(
               aaui.getAAconToggle());
 
-      aaConEnabled.setToolTipText("<html><p>"
-              + JvSwingUtils.wrapTooltip(aaui.getAAconToggleTooltip()
-                      + "</p>") + "</html>");
+      aaConEnabled.setToolTipText(
+              JvSwingUtils.wrapTooltip(true, aaui.getAAconToggleTooltip()));
       aaConEnabled.addActionListener(new ActionListener()
       {
         @Override
@@ -254,10 +259,10 @@ public abstract class Jws2Client extends jalview.ws.WSClient
 
       });
       wsmenu.add(aaConEnabled);
-      final JMenuItem modifyParams = new JMenuItem(aaui.getAAeditSettings());
-      modifyParams.setToolTipText("<html><p>"
-              + JvSwingUtils.wrapTooltip(aaui.getAAeditSettingsTooltip()
-                      + "</p>") + "</html>");
+      final JMenuItem modifyParams = new JMenuItem(
+              aaui.getAAeditSettings());
+      modifyParams.setToolTipText(JvSwingUtils.wrapTooltip(true,
+              aaui.getAAeditSettingsTooltip()));
       modifyParams.addActionListener(new ActionListener()
       {
 
@@ -275,8 +280,9 @@ public abstract class Jws2Client extends jalview.ws.WSClient
         public void menuSelected(MenuEvent arg0)
         {
           // TODO: refactor to the implementing class.
-          if (alignFrame.getViewport().getAlignment().isNucleotide() ? aaui
-                  .isNa() : aaui.isPr())
+          if (alignFrame.getViewport().getAlignment().isNucleotide()
+                  ? aaui.isNa()
+                  : aaui.isPr())
           {
             aaConEnabled.setEnabled(true);
             modifyParams.setEnabled(true);
@@ -361,7 +367,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       if (service != null
               && !fave.getService().hosturl.equals(service.hosturl))
       {
-        Cache.log.debug("Changing AACon service to " + service.hosturl
+        Console.debug("Changing AACon service to " + service.hosturl
                 + " from " + fave.getService().hosturl);
         fave.setService(service);
       }
@@ -380,11 +386,11 @@ public abstract class Jws2Client extends jalview.ws.WSClient
   {
     if (service != null)
     {
-      if (!service.serviceType.toString().equals(
-              compbio.ws.client.Services.AAConWS.toString()))
+      if (!service.serviceType.toString()
+              .equals(compbio.ws.client.Services.AAConWS.toString()))
       {
-        Cache.log
-                .warn("Ignoring invalid preferred service for AACon calculations (service type was "
+        Console.warn(
+                "Ignoring invalid preferred service for AACon calculations (service type was "
                         + service.serviceType + ")");
         service = null;
       }
@@ -409,7 +415,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient
     {
       // TODO raise dialog box explaining error, and/or open the JABA
       // preferences menu.
-      throw new Error(MessageManager.getString("error.no_aacon_service_found"));
+      throw new Error(
+              MessageManager.getString("error.no_aacon_service_found"));
     }
     return new AAConSettings(true, service, null, null);
   }