X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsPreferences.java;h=8b5e664d7b9536d9f270666fb3521b80ecfa298d;hb=48e68905336d8ee17ee6b3903d80b36bac8c56cf;hp=527750c5bfebbf6cbae99e037acd340c56494614;hpb=9d139ca8d1af8f0f2d78193d418ae9e9168a3e8a;p=jalview.git diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java index 527750c..8b5e664 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; @@ -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 { @@ -65,7 +64,7 @@ public class WsPreferences extends GWsPreferences private void initFromPreferences() { - wsUrls = Jws2Discoverer.getDiscoverer().getServiceUrls(); + wsUrls = Jws2Discoverer.getInstance().getServiceUrls(); if (!wsUrls.isEmpty()) { oldUrls = new Vector(wsUrls); @@ -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() @@ -122,17 +121,18 @@ public class WsPreferences extends GWsPreferences int r = 0; for (String url : wsUrls) { - int status = Jws2Discoverer.getDiscoverer().getServerStatusFor(url); - tdat[r][1] = new Integer(status); + int status = Jws2Discoverer.getInstance().getServerStatusFor(url); + 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() { @@ -187,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) { @@ -204,7 +206,7 @@ public class WsPreferences extends GWsPreferences @Override public String getColumnName(int column) { - return columnNames[column]; + return columnNames[column]; } @Override @@ -238,7 +240,7 @@ public class WsPreferences extends GWsPreferences private void updateServiceList() { - Jws2Discoverer.getDiscoverer().setServiceUrls(wsUrls); + Jws2Discoverer.getInstance().setServiceUrls(wsUrls); } private void updateRsbsServiceList() @@ -350,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++; } @@ -369,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()); @@ -451,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.getDesktopPane(), panel, title, + JvOptionPane.OK_CANCEL_OPTION)) == JvOptionPane.OK_OPTION) { try { @@ -477,19 +471,18 @@ public class WsPreferences extends GWsPreferences } catch (Exception e) { valid = false; - JOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), 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.getDesktopPane(), + 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 (Jws2Discoverer.testServiceUrl(foo)) { @@ -497,29 +490,22 @@ 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.getDesktopPane(), + "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.getDesktopPane(), + MessageManager.getString( + "warn.server_didnt_pass_validation")); } - } } else @@ -540,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)) @@ -572,6 +559,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { // force a refresh. @@ -597,6 +585,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { progressBar.setVisible(true); @@ -605,7 +594,7 @@ public class WsPreferences extends GWsPreferences if (lastrefresh != update) { lastrefresh = update; - Desktop.instance.startServiceDiscovery(true); // wait around for all + Desktop.getInstance().startServiceDiscovery(true); // wait around for all // threads to complete updateList(); @@ -622,18 +611,19 @@ 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.getInstance().setProgressBar(MessageManager + .getString("status.refreshing_web_service_menus"), ct); if (lastrefresh != update) { lastrefresh = update; - Desktop.instance.startServiceDiscovery(true); + Desktop.getInstance().startServiceDiscovery(true); updateList(); } - Desktop.instance.setProgressBar(null, ct); + Desktop.getInstance().setProgressBar(null, ct); } }).start(); @@ -655,8 +645,8 @@ public class WsPreferences extends GWsPreferences @Override protected void resetWs_actionPerformed(ActionEvent e) { - Jws2Discoverer.getDiscoverer().setServiceUrls(null); - List nwsUrls = Jws2Discoverer.getDiscoverer().getServiceUrls(); + Jws2Discoverer.getInstance().setServiceUrls(null); + List nwsUrls = Jws2Discoverer.getInstance().getServiceUrls(); if (!wsUrls.equals(nwsUrls)) { update++; @@ -679,6 +669,7 @@ public class WsPreferences extends GWsPreferences new Thread(new Runnable() { + @Override public void run() { updateWsMenuConfig(false);