From c84b84ed9f729eaa46e538d10ba4ffa6ec72b438 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 7 Jul 2006 13:03:39 +0000
Subject: [PATCH] New panel layouts

---
 src/jalview/jbgui/GSliderPanel.java |   61 +++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/jalview/jbgui/GSliderPanel.java b/src/jalview/jbgui/GSliderPanel.java
index c452d11..d245442 100755
--- a/src/jalview/jbgui/GSliderPanel.java
+++ b/src/jalview/jbgui/GSliderPanel.java
@@ -1,20 +1,20 @@
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program 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 2
-* of the License, or (at your option) any later version.
-*
-* This program 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 this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+*
+* This program 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 2
+* of the License, or (at your option) any later version.
+*
+* This program 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 this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 package jalview.jbgui;
 
@@ -22,7 +22,7 @@ import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;
-
+import java.awt.BorderLayout;
 
 /**
  * DOCUMENT ME!
@@ -36,7 +36,7 @@ public class GSliderPanel extends JPanel
     protected JSlider slider = new JSlider();
     protected JTextField valueField = new JTextField();
     protected JLabel label = new JLabel();
-    JPanel jPanel1 = new JPanel();
+    protected JPanel southPanel = new JPanel();
     GridLayout gridLayout1 = new GridLayout();
     JPanel jPanel2 = new JPanel();
     protected JButton applyButton = new JButton();
@@ -44,8 +44,10 @@ public class GSliderPanel extends JPanel
     FlowLayout flowLayout1 = new FlowLayout();
     protected JCheckBox allGroupsCheck = new JCheckBox();
     BorderLayout borderLayout1 = new BorderLayout();
+  JPanel jPanel1 = new JPanel();
+  BorderLayout borderLayout2 = new BorderLayout();
 
-    /**
+  /**
      * Creates a new GSliderPanel object.
      */
     public GSliderPanel()
@@ -90,7 +92,7 @@ public class GSliderPanel extends JPanel
         label.setOpaque(false);
         label.setHorizontalAlignment(SwingConstants.CENTER);
         label.setText("set this label text");
-        jPanel1.setLayout(borderLayout1);
+    southPanel.setLayout(borderLayout1);
         gridLayout1.setRows(2);
         jPanel2.setLayout(flowLayout1);
         applyButton.setFont(new java.awt.Font("Verdana", 0, 11));
@@ -128,16 +130,19 @@ public class GSliderPanel extends JPanel
         this.setBackground(Color.white);
         this.setPreferredSize(new Dimension(415, 84));
         jPanel2.setOpaque(false);
-        jPanel1.setOpaque(false);
-        this.add(jPanel2, null);
+    southPanel.setOpaque(false);
+    jPanel1.setLayout(borderLayout2);
+    jPanel1.setOpaque(false);
+    this.add(jPanel2, null);
         jPanel2.add(label, null);
         jPanel2.add(applyButton, null);
         jPanel2.add(undoButton, null);
-        this.add(jPanel1, null);
-        jPanel1.add(slider, BorderLayout.WEST);
-        jPanel1.add(valueField, BorderLayout.CENTER);
-        jPanel1.add(allGroupsCheck, BorderLayout.EAST);
-    }
+        this.add(southPanel, null);
+    southPanel.add(jPanel1, java.awt.BorderLayout.EAST);
+    southPanel.add(slider, java.awt.BorderLayout.CENTER);
+    jPanel1.add(valueField, java.awt.BorderLayout.CENTER);
+    jPanel1.add(allGroupsCheck, java.awt.BorderLayout.EAST);
+  }
 
     /**
      * DOCUMENT ME!
-- 
1.7.10.2