Merge branch 'develop' into develop_m2_8_1_2

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

diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java
index 4e855af..b16aa67 100644 (file)
--- a/src/jalview/jbgui/GWsPreferences.java
+++ b/src/jalview/jbgui/GWsPreferences.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 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
  * 
  * 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 
@@ -59,8 +59,8 @@ public class GWsPreferences extends JPanel
   protected JButton deleteSbrsUrl = new JButton();
 
   // Web service status and url table
-  protected JTable wsList=new JTable();
-  
+  protected JTable wsList = new JTable();
+
   protected TitledBorder wsListTitleBorder = new TitledBorder(
           "Web Service Discovery URLS");
 
@@ -113,7 +113,7 @@ public class GWsPreferences extends JPanel
   BorderLayout myBorderlayout = new BorderLayout();
 
   BorderLayout wsListBorderlayout = new BorderLayout();
-  
+
   BorderLayout srbsListBorderlayout = new BorderLayout();
 
   GridBagLayout wsPrefLayout = new GridBagLayout();
@@ -291,7 +291,7 @@ public class GWsPreferences extends JPanel
     wsListUrlPanel.setLayout(new BorderLayout());
     wsListPane.setBorder(BorderFactory.createEtchedBorder());
     wsListPane.getViewport().add(wsList);
-    wsList.setPreferredSize(new Dimension(482,202));
+    wsList.setPreferredSize(new Dimension(482, 202));
     wsListPane.setPreferredSize(new Dimension(380, 80));
     wsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     wsList.setColumnSelectionAllowed(false);
@@ -331,7 +331,7 @@ public class GWsPreferences extends JPanel
     wsListButtons.add(newWsUrl);
     wsListButtons.add(editWsUrl);
     wsListButtons.add(deleteWsUrl);
-    wsListButtons.setMinimumSize(new Dimension(350,80));
+    wsListButtons.setMinimumSize(new Dimension(350, 80));
     wsListNavButs.setSize(new Dimension(80, 80));
     wsListNavButs.setPreferredSize(new Dimension(80, 80));
     wsListNavButs.setLayout(new FlowLayout());
@@ -404,13 +404,16 @@ 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)) {
-       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);
@@ -419,25 +422,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)