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-1632 add score model params to PCAModel and PCA constructors
[jalview.git]
/
src
/
jalview
/
gui
/
WsPreferences.java
diff --git
a/src/jalview/gui/WsPreferences.java
b/src/jalview/gui/WsPreferences.java
index
2023407
..
32671d5
100644
(file)
--- a/
src/jalview/gui/WsPreferences.java
+++ b/
src/jalview/gui/WsPreferences.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 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.
*
@@
-454,16
+454,16
@@
public class WsPreferences extends GWsPreferences
JTextField urltf = new JTextField(url, 40);
JPanel panel = new JPanel(new BorderLayout());
JPanel pane12 = new JPanel(new BorderLayout());
JTextField urltf = new JTextField(url, 40);
JPanel panel = new JPanel(new BorderLayout());
JPanel pane12 = new JPanel(new BorderLayout());
- pane12.add(new JLabel(MessageManager.getString("label.url")),
+ pane12.add(new JLabel(MessageManager.getString("label.url:")),
BorderLayout.CENTER);
pane12.add(urltf, BorderLayout.EAST);
panel.add(pane12, BorderLayout.NORTH);
boolean valid = false;
BorderLayout.CENTER);
pane12.add(urltf, BorderLayout.EAST);
panel.add(pane12, BorderLayout.NORTH);
boolean valid = false;
- int resp = JOptionPane.CANCEL_OPTION;
+ int resp = JvOptionPane.CANCEL_OPTION;
while (!valid
while (!valid
- && (resp = JOptionPane.showInternalConfirmDialog(
+ && (resp = JvOptionPane.showInternalConfirmDialog(
Desktop.desktop, panel, title,
Desktop.desktop, panel, title,
- JOptionPane.OK_CANCEL_OPTION)) == JOptionPane.OK_OPTION)
+ JvOptionPane.OK_CANCEL_OPTION)) == JvOptionPane.OK_OPTION)
{
try
{
{
try
{
@@
-480,18
+480,18
@@
public class WsPreferences extends GWsPreferences
} catch (Exception e)
{
valid = false;
} catch (Exception e)
{
valid = false;
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
+ JvOptionPane.showInternalMessageDialog(Desktop.desktop,
MessageManager.getString("label.invalid_url"));
}
}
MessageManager.getString("label.invalid_url"));
}
}
- if (valid && resp == JOptionPane.OK_OPTION)
+ if (valid && resp == JvOptionPane.OK_OPTION)
{
{
- int validate = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
+ int validate = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
MessageManager.getString("info.validate_jabaws_server"),
MessageManager.getString("label.test_server"),
MessageManager.getString("info.validate_jabaws_server"),
MessageManager.getString("label.test_server"),
- JOptionPane.YES_NO_OPTION);
+ JvOptionPane.YES_NO_OPTION);
- if (validate == JOptionPane.OK_OPTION)
+ if (validate == JvOptionPane.OK_OPTION)
{
if (Jws2Discoverer.testServiceUrl(foo))
{
{
if (Jws2Discoverer.testServiceUrl(foo))
{
@@
-499,22
+499,22
@@
public class WsPreferences extends GWsPreferences
}
else
{
}
else
{
- int opt = JOptionPane
+ int opt = JvOptionPane
.showInternalOptionDialog(
Desktop.desktop,
"The Server '"
+ foo.toString()
+ "' failed validation,\ndo you want to add it anyway? ",
"Server Validation Failed",
.showInternalOptionDialog(
Desktop.desktop,
"The Server '"
+ foo.toString()
+ "' failed validation,\ndo you want to add it anyway? ",
"Server Validation Failed",
- JOptionPane.YES_NO_OPTION,
- JOptionPane.INFORMATION_MESSAGE, null, null, null);
- if (opt == JOptionPane.YES_OPTION)
+ JvOptionPane.YES_NO_OPTION,
+ JvOptionPane.INFORMATION_MESSAGE, null, null, null);
+ if (opt == JvOptionPane.YES_OPTION)
{
return foo.toString();
}
else
{
{
return foo.toString();
}
else
{
- JOptionPane
+ JvOptionPane
.showInternalMessageDialog(
Desktop.desktop,
MessageManager
.showInternalMessageDialog(
Desktop.desktop,
MessageManager
@@
-574,6
+574,7
@@
public class WsPreferences extends GWsPreferences
new Thread(new Runnable()
{
new Thread(new Runnable()
{
+ @Override
public void run()
{
// force a refresh.
public void run()
{
// force a refresh.
@@
-599,6
+600,7
@@
public class WsPreferences extends GWsPreferences
new Thread(new Runnable()
{
new Thread(new Runnable()
{
+ @Override
public void run()
{
progressBar.setVisible(true);
public void run()
{
progressBar.setVisible(true);
@@
-624,6
+626,7
@@
public class WsPreferences extends GWsPreferences
new Thread(new Runnable()
{
new Thread(new Runnable()
{
+ @Override
public void run()
{
long ct = System.currentTimeMillis();
public void run()
{
long ct = System.currentTimeMillis();
@@
-681,6
+684,7
@@
public class WsPreferences extends GWsPreferences
new Thread(new Runnable()
{
new Thread(new Runnable()
{
+ @Override
public void run()
{
updateWsMenuConfig(false);
public void run()
{
updateWsMenuConfig(false);