X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Client.java;h=d8fb846064c4c31bf04599da0a494886280c3a8f;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=b2b676fdaf0eb7ef0c53a9479b06f490f263121c;hpb=2b8cf92a2483d206d9e574bbe8306ad845a308d8;p=jalview.git
diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java
index b2b676f..d8fb846 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 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
@@ -20,17 +20,6 @@
*/
package jalview.ws.jws2;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.List;
-
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
-
-import compbio.metadata.Argument;
import jalview.api.AlignCalcWorkerI;
import jalview.bin.Cache;
import jalview.gui.AlignFrame;
@@ -45,6 +34,18 @@ import jalview.ws.jws2.jabaws2.Jws2Instance;
import jalview.ws.params.WsParamSetI;
import jalview.ws.uimodel.AlignAnalysisUIText;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
+
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
+import compbio.metadata.Argument;
+
/**
* provides metadata for a jabaws2 service instance - resolves names, etc.
*
@@ -78,7 +79,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient
* paramset = newargs; } else {
*/
throw new Error(
- "Implementation error: Can only instantiate Jaba parameter sets.");
+ MessageManager
+ .getString("error.implementation_error_can_only_instantiate_jaba_param_sets"));
}
}
else
@@ -149,7 +151,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
{
return new WebserviceInfo(WebServiceJobTitle, WebServiceJobTitle
+ " using service hosted at " + serv.hosturl + "\n"
- + (serv.description != null ? serv.description : ""));
+ + (serv.description != null ? serv.description : ""), false);
}
return null;
}
@@ -174,7 +176,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)
@@ -231,9 +232,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient
final JCheckBoxMenuItem aaConEnabled = new JCheckBoxMenuItem(
aaui.getAAconToggle());
- aaConEnabled.setToolTipText(""
- + JvSwingUtils.wrapTooltip(aaui.getAAconToggleTooltip()
- + "
") + "");
+ aaConEnabled.setToolTipText(JvSwingUtils.wrapTooltip(true,
+ aaui.getAAconToggleTooltip()));
aaConEnabled.addActionListener(new ActionListener()
{
@Override
@@ -256,9 +256,11 @@ public abstract class Jws2Client extends jalview.ws.WSClient
});
wsmenu.add(aaConEnabled);
final JMenuItem modifyParams = new JMenuItem(aaui.getAAeditSettings());
- modifyParams.setToolTipText(""
- + JvSwingUtils.wrapTooltip(aaui.getAAeditSettingsTooltip()
- + "
") + "");
+ modifyParams
+ .setToolTipText(""
+ + JvSwingUtils.wrapTooltip(false,
+ aaui.getAAeditSettingsTooltip() + "
")
+ + "");
modifyParams.addActionListener(new ActionListener()
{
@@ -410,7 +412,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("No AACon service found.");
+ throw new Error(
+ MessageManager.getString("error.no_aacon_service_found"));
}
return new AAConSettings(true, service, null, null);
}