JAL-1953 2.11.2 with Archeopteryx!

[jalview.git] / src / jalview / gui / WsPreferences.java

diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java
index 32671d5..64ea1b1 100644 (file)
--- 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
 {
 
@@ -68,12 +67,12 @@ public class WsPreferences extends GWsPreferences
     wsUrls = Jws2Discoverer.getDiscoverer().getServiceUrls();
     if (!wsUrls.isEmpty())
     {
-      oldUrls = new Vector<String>(wsUrls);
+      oldUrls = new Vector<>(wsUrls);
     }
     else
     {
       oldUrls = null;
-      wsUrls = new Vector<String>();
+      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<String>(rsbsUrls);
+      oldRsbsUrls = new Vector<>(rsbsUrls);
     }
     else
     {
       oldRsbsUrls = null;
-      rsbsUrls = new Vector<String>();
+      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());
@@ -460,10 +452,9 @@ public class WsPreferences extends GWsPreferences
     panel.add(pane12, BorderLayout.NORTH);
     boolean valid = false;
     int resp = JvOptionPane.CANCEL_OPTION;
-    while (!valid
-            && (resp = JvOptionPane.showInternalConfirmDialog(
-                    Desktop.desktop, panel, title,
-                    JvOptionPane.OK_CANCEL_OPTION)) == JvOptionPane.OK_OPTION)
+    while (!valid && (resp = JvOptionPane.showInternalConfirmDialog(
+            Desktop.desktop, panel, title,
+            JvOptionPane.OK_CANCEL_OPTION)) == JvOptionPane.OK_OPTION)
     {
       try
       {
@@ -499,26 +490,20 @@ public class WsPreferences extends GWsPreferences
         }
         else
         {
-          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);
+          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
           {
-            JvOptionPane
-                    .showInternalMessageDialog(
-                            Desktop.desktop,
-                            MessageManager
-                                    .getString("warn.server_didnt_pass_validation"));
+            JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+                    MessageManager.getString(
+                            "warn.server_didnt_pass_validation"));
           }
 
         }
@@ -582,7 +567,7 @@ public class WsPreferences extends GWsPreferences
         updateWsMenuConfig(false);
         refreshWsMenu(true);
       }
-    }).start();
+    }, "RefreshWebServices").start();
 
   }
 
@@ -618,7 +603,7 @@ public class WsPreferences extends GWsPreferences
           progressBar.setVisible(false);
           validate();
         }
-      }).start();
+      }, "RefreshWebServicesMenuProgressBar").start();
 
     }
     else
@@ -641,14 +626,16 @@ public class WsPreferences extends GWsPreferences
           Desktop.instance.setProgressBar(null, ct);
         }
 
-      }).start();
+      }, "RefreshWebServicesMenu").start();
     }
   }
 
   /**
    * 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)
@@ -690,7 +677,7 @@ public class WsPreferences extends GWsPreferences
         updateWsMenuConfig(false);
         refreshWsMenu(showProgressInDialog);
       }
-    }).start();
+    }, "UpdateAndRefreshWebServicesMenu").start();
 
   }
 }