git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2602 check for null or empty description when copying consensus
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
Jws2Client.java
diff --git
a/src/jalview/ws/jws2/Jws2Client.java
b/src/jalview/ws/jws2/Jws2Client.java
index
fd116c2
..
8855d96
100644
(file)
--- 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* 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 {
*/
* 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
}
}
else
@@
-174,7
+176,6
@@
public abstract class Jws2Client extends jalview.ws.WSClient
*/
abstract void attachWSMenuEntry(JMenu wsmenu, final Jws2Instance service,
final AlignFrame alignFrame);
*/
abstract void attachWSMenuEntry(JMenu wsmenu, final Jws2Instance service,
final AlignFrame alignFrame);
-
protected boolean registerAAConWSInstance(final 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());
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
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());
});
wsmenu.add(aaConEnabled);
final JMenuItem modifyParams = new JMenuItem(aaui.getAAeditSettings());
- modifyParams.setToolTipText("<html><p>"
- + JvSwingUtils.wrapTooltip(false, aaui.getAAeditSettingsTooltip()
- + "</p>") + "</html>");
+ modifyParams.setToolTipText(JvSwingUtils.wrapTooltip(true,
+ aaui.getAAeditSettingsTooltip()));
modifyParams.addActionListener(new ActionListener()
{
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.
{
// 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);
}
}
return new AAConSettings(true, service, null, null);
}