X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FMsaWSClient.java;h=b7230595f95f80244f812ae1b318d3f382932bf0;hb=aa2c6fc3fbfa5a5a60ffd3bfeb6321f1d5e4a2f2;hp=758d941b598a3d22cc942c5d8dbdd6d4bea955bb;hpb=36dceb54710feb97a81f4bd69ad051f316141dc3;p=jalview.git
diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java
index 758d941..b723059 100644
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -24,6 +24,7 @@ import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentView;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
+import jalview.gui.JvOptionPane;
import jalview.gui.JvSwingUtils;
import jalview.util.MessageManager;
import jalview.ws.jws2.jabaws2.Jws2Instance;
@@ -37,7 +38,6 @@ import java.util.List;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
import javax.swing.ToolTipManager;
import compbio.data.msa.MsaWS;
@@ -107,22 +107,22 @@ public class MsaWSClient extends Jws2Client
if (!(sh.service instanceof MsaWS))
{
// redundant at mo - but may change
- JOptionPane.showMessageDialog(Desktop.desktop, MessageManager
+ JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
.formatMessage("label.service_called_is_not_msa_service",
new String[] { sh.serviceType }), MessageManager
.getString("label.internal_jalview_error"),
- JOptionPane.WARNING_MESSAGE);
+ JvOptionPane.WARNING_MESSAGE);
return;
}
server = (MsaWS) sh.service;
if ((wsInfo = setWebService(sh, false)) == null)
{
- JOptionPane.showMessageDialog(Desktop.desktop, MessageManager
+ JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
.formatMessage("label.msa_service_is_unknown",
new String[] { sh.serviceType }), MessageManager
.getString("label.internal_jalview_error"),
- JOptionPane.WARNING_MESSAGE);
+ JvOptionPane.WARNING_MESSAGE);
return;
}
@@ -180,10 +180,10 @@ public class MsaWSClient extends Jws2Client
}
else
{
- JOptionPane.showMessageDialog(alignFrame,
+ JvOptionPane.showMessageDialog(alignFrame,
MessageManager.getString("info.invalid_msa_input_mininfo"),
MessageManager.getString("info.invalid_msa_notenough"),
- JOptionPane.INFORMATION_MESSAGE);
+ JvOptionPane.INFORMATION_MESSAGE);
wsInfo.setVisible(false);
}
}
@@ -338,13 +338,14 @@ public class MsaWSClient extends Jws2Client
}
});
- String tooltip = JvSwingUtils.wrapTooltip(
- true,
+ String tooltip = JvSwingUtils
+ .wrapTooltip(
+ true,
""
- + (preset.isModifiable() ? MessageManager
- .getString("label.user_preset")
- : MessageManager
- .getString("label.service_preset"))
+ + (preset.isModifiable() ? MessageManager
+ .getString("label.user_preset")
+ : MessageManager
+ .getString("label.service_preset"))
+ "
"
+ preset.getDescription());
methodR.setToolTipText(tooltip);