X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Client.java;h=696ddeb4619b245a001be5382539c6145fd9c9ef;hb=828bb8cde756e18e25ffae5ac47bf6832d32eeda;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..696ddeb 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. * @@ -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. * @@ -77,8 +78,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient * arguments. for (Argument opt : arguments) { newargs.add(opt); } } * paramset = newargs; } else { */ - throw new Error( - "Implementation error: Can only instantiate Jaba parameter sets."); + throw new Error(MessageManager.getString("error.implementation_error_can_only_instantiate_jaba_param_sets")); } } else @@ -149,7 +149,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; } @@ -231,9 +231,7 @@ 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 @@ -257,7 +255,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient wsmenu.add(aaConEnabled); final JMenuItem modifyParams = new JMenuItem(aaui.getAAeditSettings()); modifyParams.setToolTipText("

" - + JvSwingUtils.wrapTooltip(aaui.getAAeditSettingsTooltip() + + JvSwingUtils.wrapTooltip(false, aaui.getAAeditSettingsTooltip() + "

") + ""); modifyParams.addActionListener(new ActionListener() { @@ -410,7 +408,7 @@ 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); }