Merge branch 'develop' into improvement/JAL-3830_install4j9_macos_setup_application

[jalview.git] / src / jalview / jbgui / GWsPreferences.java

diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java
index 18df903..928b370 100644 (file)
--- a/src/jalview/jbgui/GWsPreferences.java
+++ b/src/jalview/jbgui/GWsPreferences.java
@@ -1,22 +1,26 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.jbgui;
 
+import jalview.bin.Cache;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -52,7 +56,8 @@ public class GWsPreferences extends JPanel
   protected JList sbrsList = new JList();
 
   protected TitledBorder sbrsListTitleBorder = new TitledBorder(
-          MessageManager.getString("label.simple_bioinformatics_rest_services"));
+          MessageManager
+                  .getString("label.simple_bioinformatics_rest_services"));
 
   protected JButton newSbrsUrl = new JButton();
 
@@ -142,6 +147,7 @@ public class GWsPreferences extends JPanel
     refreshWs.setText(MessageManager.getString("action.refresh_services"));
     refreshWs.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         refreshWs_actionPerformed(e);
@@ -152,6 +158,7 @@ public class GWsPreferences extends JPanel
 
     resetWs.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         resetWs_actionPerformed(e);
@@ -159,10 +166,11 @@ public class GWsPreferences extends JPanel
     });
     indexByHost.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
     indexByHost.setText(MessageManager.getString("label.index_by_host"));
-    indexByHost
-            .setToolTipText(MessageManager.getString("label.index_web_services_menu_by_host_site"));
+    indexByHost.setToolTipText(MessageManager
+            .getString("label.index_web_services_menu_by_host_site"));
     indexByHost.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         indexByHost_actionPerformed(e);
@@ -172,37 +180,32 @@ public class GWsPreferences extends JPanel
     indexByType.setText(MessageManager.getString("label.index_by_type"));
     indexByType.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         indexByType_actionPerformed(e);
       }
     });
-    enableEnfinServices
-            .setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    enableEnfinServices.setText(MessageManager.getString("label.enable_enfin_services"));
-    enableEnfinServices.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        enableEnfinServices_actionPerformed(e);
-      }
-    });
     enableJws2Services
             .setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    enableJws2Services.setText(MessageManager.getString("label.enable_jabaws_services"));
+    enableJws2Services.setText(
+            MessageManager.getString("label.enable_jabaws_services"));
     enableJws2Services.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         enableJws2Services_actionPerformed(e);
       }
     });
     displayWsWarning.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    displayWsWarning.setText(MessageManager.getString("label.display_warnings"));
     displayWsWarning
-            .setToolTipText("<html>" + MessageManager.getString("label.option_want_informed_web_service_URL_cannot_be_accessed_jalview_when_starts_up"));
+            .setText(MessageManager.getString("label.display_warnings"));
+    displayWsWarning.setToolTipText("<html>" + MessageManager.getString(
+            "label.option_want_informed_web_service_URL_cannot_be_accessed_jalview_when_starts_up"));
     displayWsWarning.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         displayWsWarning_actionPerformed(e);
@@ -212,6 +215,7 @@ public class GWsPreferences extends JPanel
     newWsUrl.setText(MessageManager.getString("label.new_service_url"));
     newWsUrl.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         newWsUrl_actionPerformed(e);
@@ -221,6 +225,7 @@ public class GWsPreferences extends JPanel
     editWsUrl.setText(MessageManager.getString("label.edit_service_url"));
     editWsUrl.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         editWsUrl_actionPerformed(e);
@@ -228,9 +233,11 @@ public class GWsPreferences extends JPanel
     });
 
     deleteWsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    deleteWsUrl.setText(MessageManager.getString("label.delete_service_url"));
+    deleteWsUrl
+            .setText(MessageManager.getString("label.delete_service_url"));
     deleteWsUrl.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         deleteWsUrl_actionPerformed(e);
@@ -238,9 +245,11 @@ public class GWsPreferences extends JPanel
     });
     moveWsUrlUp.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
     moveWsUrlUp.setText(MessageManager.getString("action.move_up"));
-    moveWsUrlUp.setToolTipText(MessageManager.getString("label.move_url_up"));
+    moveWsUrlUp
+            .setToolTipText(MessageManager.getString("label.move_url_up"));
     moveWsUrlUp.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         moveWsUrlUp_actionPerformed(e);
@@ -248,27 +257,33 @@ public class GWsPreferences extends JPanel
     });
     moveWsUrlDown.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
     moveWsUrlDown.setText(MessageManager.getString("action.move_down"));
-    moveWsUrlDown.setToolTipText(MessageManager.getString("label.move_url_down"));
+    moveWsUrlDown.setToolTipText(
+            MessageManager.getString("label.move_url_down"));
     moveWsUrlDown.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         moveWsUrlDown_actionPerformed(e);
       }
     });
     newSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    newSbrsUrl.setText(MessageManager.getString("label.add_sbrs_definition"));
+    newSbrsUrl
+            .setText(MessageManager.getString("label.add_sbrs_definition"));
     newSbrsUrl.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         newSbrsUrl_actionPerformed(e);
       }
     });
     editSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    editSbrsUrl.setText(MessageManager.getString("label.edit_sbrs_definition"));
+    editSbrsUrl.setText(
+            MessageManager.getString("label.edit_sbrs_definition"));
     editSbrsUrl.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         editSbrsUrl_actionPerformed(e);
@@ -276,9 +291,11 @@ public class GWsPreferences extends JPanel
     });
 
     deleteSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
-    deleteSbrsUrl.setText(MessageManager.getString("label.delete_sbrs_definition"));
+    deleteSbrsUrl.setText(
+            MessageManager.getString("label.delete_sbrs_definition"));
     deleteSbrsUrl.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         deleteSbrsUrl_actionPerformed(e);
@@ -292,14 +309,16 @@ public class GWsPreferences extends JPanel
     wsListUrlPanel.setBorder(BorderFactory.createEtchedBorder());
     wsListUrlPanel.setLayout(new BorderLayout());
     wsListPane.setBorder(BorderFactory.createEtchedBorder());
-    wsListPane.getViewport().add(wsList);
     wsList.setPreferredSize(new Dimension(482, 202));
+    wsList.getTableHeader().setReorderingAllowed(false);
+    wsListPane.getViewport().add(wsList);
     wsListPane.setPreferredSize(new Dimension(380, 80));
     wsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     wsList.setColumnSelectionAllowed(false);
     wsList.addMouseListener(new MouseListener()
     {
 
+      @Override
       public void mouseClicked(MouseEvent e)
       {
         if (e.getClickCount() > 1)
@@ -309,20 +328,24 @@ public class GWsPreferences extends JPanel
 
       }
 
+      @Override
       public void mouseEntered(MouseEvent e)
       {
 
       }
 
+      @Override
       public void mouseExited(MouseEvent e)
       {
       }
 
+      @Override
       public void mousePressed(MouseEvent e)
       {
 
       }
 
+      @Override
       public void mouseReleased(MouseEvent e)
       {
 
@@ -354,6 +377,7 @@ public class GWsPreferences extends JPanel
     sbrsList.addMouseListener(new MouseListener()
     {
 
+      @Override
       public void mouseClicked(MouseEvent e)
       {
         if (e.getClickCount() > 1)
@@ -363,20 +387,24 @@ public class GWsPreferences extends JPanel
 
       }
 
+      @Override
       public void mouseEntered(MouseEvent e)
       {
 
       }
 
+      @Override
       public void mouseExited(MouseEvent e)
       {
       }
 
+      @Override
       public void mousePressed(MouseEvent e)
       {
 
       }
 
+      @Override
       public void mouseReleased(MouseEvent e)
       {
 
@@ -397,7 +425,6 @@ public class GWsPreferences extends JPanel
     wsMenuButtons.add(indexByHost);
     wsMenuButtons.add(indexByType);
     wsMenuButtons.add(enableJws2Services);
-    wsMenuButtons.add(enableEnfinServices);
     wsMenuButtons.add(displayWsWarning);
     wsMenuRefreshButs.setLayout(new FlowLayout());
     wsMenuRefreshButs.setPreferredSize(new Dimension(480, 30));
@@ -406,7 +433,7 @@ public class GWsPreferences extends JPanel
     wsMenuRefreshButs.add(resetWs, null);
     wsMenuRefreshButs.add(progressBar, null);
     myBorderlayout.setHgap(3);
-    if (jalview.bin.Cache.getDefault("ENABLE_RSBS_EDITOR", false))
+    if (Cache.getDefault("ENABLE_RSBS_EDITOR", false))
     {
       JTabbedPane listPanels = new JTabbedPane();
       listPanels.addTab("JABAWS Servers", wsListPanel);