X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsPreferences.java;h=e37f77c48087a18ce624c411a24c057e93ce110b;hb=197e43e3b7bc447d36ebdd690f1e8133b4f6262b;hp=de892415c6796bfde4d819ff1272a60a5193f071;hpb=29cb995e1afc60500d32bbe02d5e447a634faafc;p=jalview.git diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java index de89241..e37f77c 100644 --- 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.8.2) - * Copyright (C) 2014 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. * @@ -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; @@ -33,16 +27,22 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.net.URL; +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 { @@ -52,7 +52,9 @@ public class WsPreferences extends GWsPreferences initFromPreferences(); } - Vector wsUrls, oldUrls, rsbsUrls, oldRsbsUrls; + List wsUrls; + + Vector oldUrls, rsbsUrls, oldRsbsUrls; private boolean needWsMenuUpdate; @@ -62,8 +64,8 @@ public class WsPreferences extends GWsPreferences private void initFromPreferences() { - wsUrls = jalview.ws.jws2.Jws2Discoverer.getServiceUrls(); - if (wsUrls != null) + wsUrls = Jws2Discoverer.getDiscoverer().getServiceUrls(); + if (!wsUrls.isEmpty()) { oldUrls = new Vector(wsUrls); } @@ -86,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() @@ -120,16 +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() { @@ -184,8 +187,10 @@ public class WsPreferences extends GWsPreferences { private Object[][] data; - private String[] columnNames = new String[] - { MessageManager.getString("label.service_url"), MessageManager.getString("label.status") }; + + private String[] columnNames = new String[] { + MessageManager.getString("label.service_url"), + MessageManager.getString("label.status") }; public WsUrlTableModel(Object[][] tdat) { @@ -201,7 +206,7 @@ public class WsPreferences extends GWsPreferences @Override public String getColumnName(int column) { - return columnNames[column]; + return columnNames[column]; } @Override @@ -235,7 +240,7 @@ public class WsPreferences extends GWsPreferences private void updateServiceList() { - jalview.ws.jws2.Jws2Discoverer.setServiceUrls(wsUrls); + Jws2Discoverer.getDiscoverer().setServiceUrls(wsUrls); } private void updateRsbsServiceList() @@ -256,7 +261,7 @@ public class WsPreferences extends GWsPreferences int sel = wsList.getSelectedRow(); if (sel > -1) { - wsUrls.removeElementAt(sel); + wsUrls.remove(sel); update++; updateList(); } @@ -274,21 +279,22 @@ public class WsPreferences extends GWsPreferences int sel = wsList.getSelectedRow(); if (sel > -1) { - String url = editUrl(wsUrls.elementAt(sel), MessageManager.getString("label.edit_jabaws_url")); + String url = editUrl(wsUrls.get(sel), + MessageManager.getString("label.edit_jabaws_url")); if (url != null) { int present = wsUrls.indexOf(url); if (present == -1) { update++; - wsUrls.setElementAt(url, sel); + wsUrls.set(sel, url); updateList(); } else { if (present != sel) { - wsUrls.removeElementAt(sel); + wsUrls.remove(sel); updateList(); } } @@ -346,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++; } @@ -365,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()); @@ -406,8 +405,8 @@ public class WsPreferences extends GWsPreferences if (p > -1 && p < wsUrls.size() - 1) { String t = wsUrls.get(p + 1); - wsUrls.setElementAt(wsUrls.elementAt(p), p + 1); - wsUrls.setElementAt(t, p); + wsUrls.set(p + 1, wsUrls.get(p)); + wsUrls.set(p, t); updateList(); wsList.getSelectionModel().setSelectionInterval(p + 1, p + 1); update++; @@ -428,8 +427,8 @@ public class WsPreferences extends GWsPreferences if (p > 0) { String t = wsUrls.get(p - 1); - wsUrls.setElementAt(wsUrls.elementAt(p), p - 1); - wsUrls.setElementAt(t, p); + wsUrls.set(p - 1, wsUrls.get(p)); + wsUrls.set(p, t); updateList(); wsList.getSelectionModel().setSelectionInterval(p - 1, p - 1); update++; @@ -447,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 { @@ -473,49 +471,41 @@ 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, - MessageManager.getString("info.validate_jabaws_server"), - MessageManager.getString("label.test_server"), JOptionPane.YES_NO_OPTION); + int validate = JvOptionPane.showInternalConfirmDialog(Desktop.desktop, + MessageManager.getString("info.validate_jabaws_server"), + MessageManager.getString("label.test_server"), + JvOptionPane.YES_NO_OPTION); - if (validate == JOptionPane.OK_OPTION) + if (validate == JvOptionPane.OK_OPTION) { - if (jalview.ws.jws2.Jws2Discoverer.testServiceUrl(foo)) + if (Jws2Discoverer.testServiceUrl(foo)) { return foo.toString(); } else { - int opt = JOptionPane - .showInternalOptionDialog( - Desktop.desktop, - "The Server '" - + foo.toString() - + "' failed validation, do you want to proceed and 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")); } - } } else @@ -536,7 +526,8 @@ public class WsPreferences extends GWsPreferences @Override protected void newWsUrl_actionPerformed(ActionEvent e) { - String url = editUrl(null, MessageManager.getString("label.add_jabaws_url")); + String url = editUrl(null, + MessageManager.getString("label.add_jabaws_url")); if (url != null) { if (!wsUrls.contains(url)) @@ -544,11 +535,11 @@ public class WsPreferences extends GWsPreferences int selind = wsList.getSelectedRow(); if (selind > -1) { - wsUrls.insertElementAt(url, selind); + wsUrls.add(selind, url); } else { - wsUrls.addElement(url); + wsUrls.add(url); } update++; updateList(); @@ -568,6 +559,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { // force a refresh. @@ -593,6 +585,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { progressBar.setVisible(true); @@ -618,11 +611,12 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { long ct = System.currentTimeMillis(); - Desktop.instance.setProgressBar(MessageManager.getString("status.refreshing_web_service_menus"), - ct); + Desktop.instance.setProgressBar(MessageManager + .getString("status.refreshing_web_service_menus"), ct); if (lastrefresh != update) { lastrefresh = update; @@ -639,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) @@ -651,8 +647,8 @@ public class WsPreferences extends GWsPreferences @Override protected void resetWs_actionPerformed(ActionEvent e) { - jalview.ws.jws2.Jws2Discoverer.setServiceUrls(null); - Vector nwsUrls = jalview.ws.jws2.Jws2Discoverer.getServiceUrls(); + Jws2Discoverer.getDiscoverer().setServiceUrls(null); + List nwsUrls = Jws2Discoverer.getDiscoverer().getServiceUrls(); if (!wsUrls.equals(nwsUrls)) { update++; @@ -675,6 +671,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { updateWsMenuConfig(false);