X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsPreferences.java;h=e37f77c48087a18ce624c411a24c057e93ce110b;hb=197e43e3b7bc447d36ebdd690f1e8133b4f6262b;hp=632535b4b6e6bd07235f5d2a36c9473c0ff1ef8b;hpb=44fc22cf950ff114ce3a5a07600e7a7eb5fd1216;p=jalview.git diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java index 632535b..e37f77c 100644 --- a/src/jalview/gui/WsPreferences.java +++ b/src/jalview/gui/WsPreferences.java @@ -20,12 +20,6 @@ */ package jalview.gui; -import jalview.bin.Cache; -import jalview.jbgui.GWsPreferences; -import jalview.util.MessageManager; -import jalview.ws.jws2.Jws2Discoverer; -import jalview.ws.rest.RestServiceDescription; - import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; @@ -37,13 +31,18 @@ import java.util.List; import java.util.Vector; import javax.swing.JLabel; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableCellRenderer; +import jalview.bin.Cache; +import jalview.jbgui.GWsPreferences; +import jalview.util.MessageManager; +import jalview.ws.jws2.Jws2Discoverer; +import jalview.ws.rest.RestServiceDescription; + public class WsPreferences extends GWsPreferences { @@ -89,20 +88,20 @@ public class WsPreferences extends GWsPreferences rsbsUrls = new Vector(); } updateRsbsList(); - enableEnfinServices.setSelected(oldEnfin = Cache.getDefault( - "SHOW_ENFIN_SERVICES", true)); + enableEnfinServices.setSelected( + oldEnfin = Cache.getDefault("SHOW_ENFIN_SERVICES", true)); enableEnfinServices.addActionListener(updateAction); - enableJws2Services.setSelected(oldJws2 = Cache.getDefault( - "SHOW_JWS2_SERVICES", true)); + enableJws2Services.setSelected( + oldJws2 = Cache.getDefault("SHOW_JWS2_SERVICES", true)); enableJws2Services.addActionListener(updateAction); - indexByHost.setSelected(oldIndexByHost = Cache.getDefault( - "WSMENU_BYHOST", false)); + indexByHost.setSelected( + oldIndexByHost = Cache.getDefault("WSMENU_BYHOST", false)); indexByHost.addActionListener(updateAction); - indexByType.setSelected(oldIndexByType = Cache.getDefault( - "WSMENU_BYTYPE", false)); + indexByType.setSelected( + oldIndexByType = Cache.getDefault("WSMENU_BYTYPE", false)); indexByType.addActionListener(updateAction); - displayWsWarning.setSelected(oldWsWarning = Cache.getDefault( - "SHOW_WSDISCOVERY_ERRORS", true)); + displayWsWarning.setSelected(oldWsWarning = Cache + .getDefault("SHOW_WSDISCOVERY_ERRORS", true)); } ActionListener updateAction = new ActionListener() @@ -123,17 +122,17 @@ public class WsPreferences extends GWsPreferences for (String url : wsUrls) { int status = Jws2Discoverer.getDiscoverer().getServerStatusFor(url); - tdat[r][1] = new Integer(status); + tdat[r][1] = Integer.valueOf(status); tdat[r++][0] = url; } wsList.setModel(new WsUrlTableModel(tdat)); - wsList.getColumn(MessageManager.getString("label.status")).setMinWidth( - 10); + wsList.getColumn(MessageManager.getString("label.status")) + .setMinWidth(10); } - private class JabaWSStatusRenderer extends JPanel implements - TableCellRenderer + private class JabaWSStatusRenderer extends JPanel + implements TableCellRenderer { public JabaWSStatusRenderer() { @@ -353,16 +352,14 @@ public class WsPreferences extends GWsPreferences { if (old) { - if (oldUrls != wsUrls - || (wsUrls != null && oldUrls != null && !wsUrls - .equals(oldUrls))) + if (oldUrls != wsUrls || (wsUrls != null && oldUrls != null + && !wsUrls.equals(oldUrls))) { update++; } wsUrls = (oldUrls == null) ? null : new Vector(oldUrls); - if (oldRsbsUrls != rsbsUrls - || (rsbsUrls != null && oldRsbsUrls != null && !oldRsbsUrls - .equals(rsbsUrls))) + if (oldRsbsUrls != rsbsUrls || (rsbsUrls != null + && oldRsbsUrls != null && !oldRsbsUrls.equals(rsbsUrls))) { update++; } @@ -372,26 +369,21 @@ public class WsPreferences extends GWsPreferences { } - Cache.setProperty( - "SHOW_ENFIN_SERVICES", + Cache.setProperty("SHOW_ENFIN_SERVICES", Boolean.valueOf( old ? oldEnfin : enableEnfinServices.isSelected()) .toString()); - Cache.setProperty( - "SHOW_JWS2_SERVICES", + Cache.setProperty("SHOW_JWS2_SERVICES", Boolean.valueOf(old ? oldJws2 : enableJws2Services.isSelected()) .toString()); - Cache.setProperty( - "WSMENU_BYHOST", + Cache.setProperty("WSMENU_BYHOST", Boolean.valueOf(old ? oldIndexByHost : indexByHost.isSelected()) .toString()); - Cache.setProperty( - "WSMENU_BYTYPE", + Cache.setProperty("WSMENU_BYTYPE", Boolean.valueOf(old ? oldIndexByType : indexByType.isSelected()) .toString()); - Cache.setProperty( - "SHOW_WSDISCOVERY_ERRORS", + Cache.setProperty("SHOW_WSDISCOVERY_ERRORS", Boolean.valueOf( old ? oldWsWarning : displayWsWarning.isSelected()) .toString()); @@ -459,11 +451,10 @@ public class WsPreferences extends GWsPreferences pane12.add(urltf, BorderLayout.EAST); panel.add(pane12, BorderLayout.NORTH); boolean valid = false; - int resp = JOptionPane.CANCEL_OPTION; - while (!valid - && (resp = JOptionPane.showInternalConfirmDialog( - Desktop.desktop, panel, title, - JOptionPane.OK_CANCEL_OPTION)) == JOptionPane.OK_OPTION) + int resp = JvOptionPane.CANCEL_OPTION; + while (!valid && (resp = JvOptionPane.showInternalConfirmDialog( + Desktop.desktop, panel, title, + JvOptionPane.OK_CANCEL_OPTION)) == JvOptionPane.OK_OPTION) { try { @@ -480,18 +471,18 @@ public class WsPreferences extends GWsPreferences } catch (Exception e) { valid = false; - JOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.desktop, 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"), - JOptionPane.YES_NO_OPTION); + JvOptionPane.YES_NO_OPTION); - if (validate == JOptionPane.OK_OPTION) + if (validate == JvOptionPane.OK_OPTION) { if (Jws2Discoverer.testServiceUrl(foo)) { @@ -499,26 +490,20 @@ public class WsPreferences extends GWsPreferences } else { - int opt = JOptionPane - .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) + int opt = JvOptionPane.showInternalOptionDialog(Desktop.desktop, + "The Server '" + foo.toString() + + "' failed validation,\ndo you want to add it anyway? ", + "Server Validation Failed", JvOptionPane.YES_NO_OPTION, + JvOptionPane.INFORMATION_MESSAGE, null, null, null); + if (opt == JvOptionPane.YES_OPTION) { return foo.toString(); } else { - JOptionPane - .showInternalMessageDialog( - Desktop.desktop, - MessageManager - .getString("warn.server_didnt_pass_validation")); + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager.getString( + "warn.server_didnt_pass_validation")); } } @@ -648,7 +633,9 @@ public class WsPreferences extends GWsPreferences /** * state counters for ensuring that updates only happen if config has changed. */ - private long update = 0, lastrefresh = 0; + protected long update = 0; + + private long lastrefresh = 0; /* * (non-Javadoc)