X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Client.java;h=983ef9167777f8d60cabb312858eb681a5253ecd;hb=d9c7868a610eff29a8eddb160b6dc78a94a72470;hp=fd116c27501fc10bcf35aecea3db6cfe47f92ea1;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java index fd116c2..983ef91 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.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -78,7 +78,9 @@ 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 @@ -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,7 +232,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient final JCheckBoxMenuItem aaConEnabled = new JCheckBoxMenuItem( aaui.getAAconToggle()); - aaConEnabled.setToolTipText(JvSwingUtils.wrapTooltip(true, aaui.getAAconToggleTooltip())); + aaConEnabled.setToolTipText(JvSwingUtils.wrapTooltip(true, + aaui.getAAconToggleTooltip())); aaConEnabled.addActionListener(new ActionListener() { @Override @@ -254,9 +256,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient }); wsmenu.add(aaConEnabled); final JMenuItem modifyParams = new JMenuItem(aaui.getAAeditSettings()); - modifyParams.setToolTipText("

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

") + ""); + modifyParams.setToolTipText(JvSwingUtils.wrapTooltip(true, + aaui.getAAeditSettingsTooltip())); modifyParams.addActionListener(new ActionListener() { @@ -408,7 +409,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); }