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
Merge branch 'Jalview-JS/develop' into merge_js_develop
[jalview.git]
/
src
/
jalview
/
gui
/
WsPreferences.java
diff --git
a/src/jalview/gui/WsPreferences.java
b/src/jalview/gui/WsPreferences.java
index
8b5e664
..
cf88718
100644
(file)
--- a/
src/jalview/gui/WsPreferences.java
+++ b/
src/jalview/gui/WsPreferences.java
@@
-20,6
+20,7
@@
*/
package jalview.gui;
*/
package jalview.gui;
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@
-27,6
+28,7
@@
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.net.URL;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.net.URL;
+import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
import java.util.List;
import java.util.Vector;
@@
-40,6
+42,7
@@
import javax.swing.table.TableCellRenderer;
import jalview.bin.Cache;
import jalview.jbgui.GWsPreferences;
import jalview.util.MessageManager;
import jalview.bin.Cache;
import jalview.jbgui.GWsPreferences;
import jalview.util.MessageManager;
+import jalview.ws.WSDiscovererI;
import jalview.ws.jws2.Jws2Discoverer;
import jalview.ws.rest.RestServiceDescription;
import jalview.ws.jws2.Jws2Discoverer;
import jalview.ws.rest.RestServiceDescription;
@@
-155,21
+158,22
@@
public class WsPreferences extends GWsPreferences
String t = new String("");
switch (((Integer) status).intValue())
{
String t = new String("");
switch (((Integer) status).intValue())
{
- case 1:
+ case WSDiscovererI.STATUS_OK:
// cb.setSelected(true);
// cb.setBackground(
c = Color.green;
break;
// cb.setSelected(true);
// cb.setBackground(
c = Color.green;
break;
- case 0:
+ case WSDiscovererI.STATUS_NO_SERVICES:
// cb.setSelected(true);
// cb.setBackground(
c = Color.lightGray;
break;
// cb.setSelected(true);
// cb.setBackground(
c = Color.lightGray;
break;
- case -1:
+ case WSDiscovererI.STATUS_INVALID:
// cb.setSelected(false);
// cb.setBackground(
c = Color.red;
break;
// cb.setSelected(false);
// cb.setBackground(
c = Color.red;
break;
+ case WSDiscovererI.STATUS_UNKNOWN:
default:
// cb.setSelected(false);
// cb.setBackground(
default:
// cb.setSelected(false);
// cb.setBackground(
@@
-484,7
+488,7
@@
public class WsPreferences extends GWsPreferences
if (validate == JvOptionPane.OK_OPTION)
{
if (validate == JvOptionPane.OK_OPTION)
{
- if (Jws2Discoverer.testServiceUrl(foo))
+ if (Jws2Discoverer.getInstance().testServiceUrl(foo))
{
return foo.toString();
}
{
return foo.toString();
}