JAL-1432 updated copyright notices

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

diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java
index 171bd7b..7114e1d 100644 (file)
--- a/src/jalview/jbgui/GWsPreferences.java
+++ b/src/jalview/jbgui/GWsPreferences.java
@@ -1,19 +1,20 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 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.
- * 
+ *  
  * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.jbgui;
 
@@ -36,8 +37,8 @@ import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
 import javax.swing.border.TitledBorder;
 
 /**
@@ -58,7 +59,8 @@ public class GWsPreferences extends JPanel
 
   protected JButton deleteSbrsUrl = new JButton();
 
-  protected JList wsList = new JList();
+  // Web service status and url table
+  protected JTable wsList = new JTable();
 
   protected TitledBorder wsListTitleBorder = new TitledBorder(
           "Web Service Discovery URLS");
@@ -112,7 +114,7 @@ public class GWsPreferences extends JPanel
   BorderLayout myBorderlayout = new BorderLayout();
 
   BorderLayout wsListBorderlayout = new BorderLayout();
-  
+
   BorderLayout srbsListBorderlayout = new BorderLayout();
 
   GridBagLayout wsPrefLayout = new GridBagLayout();
@@ -288,11 +290,12 @@ public class GWsPreferences extends JPanel
     progressBar.setString("");
     wsListUrlPanel.setBorder(BorderFactory.createEtchedBorder());
     wsListUrlPanel.setLayout(new BorderLayout());
-    // wsListUrlPanel.setPreferredSize(new Dimension(482,202));
     wsListPane.setBorder(BorderFactory.createEtchedBorder());
     wsListPane.getViewport().add(wsList);
-    // wsListPane.setPreferredSize(new Dimension(380, 80));
+    wsList.setPreferredSize(new Dimension(482, 202));
+    wsListPane.setPreferredSize(new Dimension(380, 80));
     wsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    wsList.setColumnSelectionAllowed(false);
     wsList.addMouseListener(new MouseListener()
     {
 
@@ -325,13 +328,11 @@ public class GWsPreferences extends JPanel
       }
 
     });
-    // wsListButtons.setPreferredSize(new Dimension(480, 60));
     wsListButtons.setLayout(new FlowLayout());
-    // wsListButtons.add(moveWsUrlUp);
-    // wsListButtons.add(moveWsUrlDown);
     wsListButtons.add(newWsUrl);
     wsListButtons.add(editWsUrl);
     wsListButtons.add(deleteWsUrl);
+    wsListButtons.setMinimumSize(new Dimension(350, 80));
     wsListNavButs.setSize(new Dimension(80, 80));
     wsListNavButs.setPreferredSize(new Dimension(80, 80));
     wsListNavButs.setLayout(new FlowLayout());
@@ -348,7 +349,6 @@ public class GWsPreferences extends JPanel
     srbsListUrlPanel.setLayout(new BorderLayout());
     srbsListPane.setBorder(BorderFactory.createEtchedBorder());
     srbsListPane.getViewport().add(sbrsList);
-    //srbsListPane.setMinimumSize(new Dimension(380, 80));
     sbrsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     sbrsList.addMouseListener(new MouseListener()
     {
@@ -405,13 +405,16 @@ public class GWsPreferences extends JPanel
     wsMenuRefreshButs.add(resetWs, null);
     wsMenuRefreshButs.add(progressBar, null);
     myBorderlayout.setHgap(3);
-    if (true) {
-       JTabbedPane listPanels=new JTabbedPane();
-       listPanels.addTab("JABAWS Servers",wsListPanel);
-       listPanels.addTab("RSB Services", srbsListPanel);
-       add(listPanels,  BorderLayout.NORTH);
-    } else {
-       add(wsListPanel, BorderLayout.NORTH);
+    if (jalview.bin.Cache.getDefault("ENABLE_RSBS_EDITOR", false))
+    {
+      JTabbedPane listPanels = new JTabbedPane();
+      listPanels.addTab("JABAWS Servers", wsListPanel);
+      listPanels.addTab("RSB Services", srbsListPanel);
+      add(listPanels, BorderLayout.NORTH);
+    }
+    else
+    {
+      add(wsListPanel, BorderLayout.NORTH);
     }
     add(wsMenuButtons, BorderLayout.CENTER);
     add(wsMenuRefreshButs, BorderLayout.SOUTH);
@@ -420,25 +423,25 @@ public class GWsPreferences extends JPanel
   protected void deleteSbrsUrl_actionPerformed(ActionEvent e)
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   protected void editSbrsUrl_actionPerformed(ActionEvent e)
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   protected void newSbrsUrl_actionPerformed(ActionEvent e)
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   protected void displayWsWarning_actionPerformed(ActionEvent e)
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   protected void resetWs_actionPerformed(ActionEvent e)