X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsPreferences.java;h=dc3cadd00f23adfdadbeca44dbbc547a185b3497;hb=9f327c52e2dc32b445f87c1852b7f5ffa0196870;hp=6ec25b2dcdc6ad7c94fefc985b360c3ed30f6a8f;hpb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;p=jalview.git diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java index 6ec25b2..dc3cadd 100644 --- a/src/jalview/gui/WsPreferences.java +++ b/src/jalview/gui/WsPreferences.java @@ -37,7 +37,6 @@ 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; @@ -68,12 +67,12 @@ public class WsPreferences extends GWsPreferences wsUrls = Jws2Discoverer.getDiscoverer().getServiceUrls(); if (!wsUrls.isEmpty()) { - oldUrls = new Vector(wsUrls); + oldUrls = new Vector<>(wsUrls); } else { oldUrls = null; - wsUrls = new Vector(); + wsUrls = new Vector<>(); } wsList.setDefaultRenderer(Integer.class, new JabaWSStatusRenderer()); wsList.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); @@ -81,28 +80,28 @@ public class WsPreferences extends GWsPreferences rsbsUrls = jalview.ws.rest.RestClient.getRsbsDescriptions(); if (rsbsUrls != null) { - oldRsbsUrls = new Vector(rsbsUrls); + oldRsbsUrls = new Vector<>(rsbsUrls); } else { oldRsbsUrls = null; - rsbsUrls = new Vector(); + 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() @@ -128,12 +127,12 @@ public class WsPreferences extends GWsPreferences } 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()); @@ -454,16 +446,15 @@ public class WsPreferences extends GWsPreferences 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; - 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")); } } @@ -574,6 +559,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { // force a refresh. @@ -581,7 +567,7 @@ public class WsPreferences extends GWsPreferences updateWsMenuConfig(false); refreshWsMenu(true); } - }).start(); + }, "RefreshWebServicesThread").start(); } @@ -599,6 +585,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { progressBar.setVisible(true); @@ -616,7 +603,7 @@ public class WsPreferences extends GWsPreferences progressBar.setVisible(false); validate(); } - }).start(); + }, "RefreshWebServicesMenuProgressBarThread").start(); } else @@ -624,6 +611,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { long ct = System.currentTimeMillis(); @@ -638,7 +626,7 @@ public class WsPreferences extends GWsPreferences Desktop.instance.setProgressBar(null, ct); } - }).start(); + }, "RefreshWebServicesMenuThread").start(); } } @@ -681,12 +669,13 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { updateWsMenuConfig(false); refreshWsMenu(showProgressInDialog); } - }).start(); + }, "UpdateAndRefreshWebServicesMenuThread").start(); } }