X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGSliderPanel.java;h=2dabd1b5384422ecabdde8c86119da9c1b16b40c;hb=282aa9129a74235dc8d6c22b123d51eb1abd2f55;hp=0c79c6cd75e6ad466d35f8d9395fa2af4dc9e3cc;hpb=7dc7fb2a35c435d825bc91c5ae60ec6073419a69;p=jalview.git

diff --git a/src/jalview/jbgui/GSliderPanel.java b/src/jalview/jbgui/GSliderPanel.java
index 0c79c6c..2dabd1b 100755
--- a/src/jalview/jbgui/GSliderPanel.java
+++ b/src/jalview/jbgui/GSliderPanel.java
@@ -26,6 +26,7 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Font;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -50,6 +51,13 @@ import javax.swing.SwingConstants;
  */
 public class GSliderPanel extends JPanel
 {
+  private static final Font VERDANA_11 = new java.awt.Font("Verdana", 0,
+          11);
+
+  protected static final int FRAME_WIDTH = 420;
+
+  protected static final int FRAME_HEIGHT = 120;
+
   // this is used for conservation colours, PID colours and redundancy threshold
   protected JSlider slider = new JSlider();
 
@@ -59,24 +67,12 @@ public class GSliderPanel extends JPanel
 
   protected JPanel southPanel = new JPanel();
 
-  GridLayout gridLayout1 = new GridLayout();
-
-  JPanel jPanel2 = new JPanel();
-
   protected JButton applyButton = new JButton();
 
   protected JButton undoButton = new JButton();
 
-  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.
    */
@@ -92,19 +88,15 @@ public class GSliderPanel extends JPanel
   }
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @throws Exception
-   *           DOCUMENT ME!
+   * Constructs and lays out the controls
    */
-  private void jbInit() throws Exception
+  private void jbInit()
   {
-    this.setLayout(gridLayout1);
     slider.setMajorTickSpacing(10);
     slider.setMinorTickSpacing(1);
     slider.setPaintTicks(true);
     slider.setBackground(Color.white);
-    slider.setFont(new java.awt.Font("Verdana", 0, 11));
+    slider.setFont(VERDANA_11);
     slider.setDoubleBuffered(true);
     slider.addMouseListener(new MouseAdapter()
     {
@@ -114,7 +106,7 @@ public class GSliderPanel extends JPanel
         slider_mouseReleased(e);
       }
     });
-    valueField.setFont(new java.awt.Font("Verdana", 0, 11));
+    valueField.setFont(VERDANA_11);
     valueField.setMinimumSize(new Dimension(6, 14));
     valueField.setPreferredSize(new Dimension(50, 12));
     valueField.setText("");
@@ -135,17 +127,15 @@ public class GSliderPanel extends JPanel
         valueField_actionPerformed();
       }
     });
-    label.setFont(new java.awt.Font("Verdana", 0, 11));
+    label.setFont(VERDANA_11);
     label.setOpaque(false);
     label.setHorizontalAlignment(SwingConstants.CENTER);
     label.setText(MessageManager.getString("label.set_this_label_text"));
-    southPanel.setLayout(borderLayout1);
-    gridLayout1.setRows(2);
-    jPanel2.setLayout(flowLayout1);
-    applyButton.setFont(new java.awt.Font("Verdana", 0, 11));
+
+    applyButton.setFont(VERDANA_11);
     applyButton.setOpaque(false);
     applyButton.setText(MessageManager.getString("action.apply"));
-    applyButton.addActionListener(new java.awt.event.ActionListener()
+    applyButton.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -154,10 +144,10 @@ public class GSliderPanel extends JPanel
       }
     });
     undoButton.setEnabled(false);
-    undoButton.setFont(new java.awt.Font("Verdana", 0, 11));
+    undoButton.setFont(VERDANA_11);
     undoButton.setOpaque(false);
     undoButton.setText(MessageManager.getString("action.undo"));
-    undoButton.addActionListener(new java.awt.event.ActionListener()
+    undoButton.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -166,33 +156,31 @@ public class GSliderPanel extends JPanel
       }
     });
     allGroupsCheck.setEnabled(false);
-    allGroupsCheck.setFont(new java.awt.Font("Verdana", 0, 11));
+    allGroupsCheck.setFont(VERDANA_11);
     allGroupsCheck.setOpaque(false);
-    allGroupsCheck.setText(MessageManager
-            .getString("action.apply_all_groups"));
-    allGroupsCheck.addActionListener(new java.awt.event.ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        allGroupsCheck_actionPerformed(e);
-      }
-    });
+    allGroupsCheck
+            .setText(MessageManager.getString("action.apply_all_groups"));
+
+    this.setLayout(new GridLayout(2, 0));
     this.setBackground(Color.white);
-    this.setPreferredSize(new Dimension(415, 84));
-    jPanel2.setOpaque(false);
-    southPanel.setOpaque(false);
-    jPanel1.setLayout(borderLayout2);
+
+    JPanel firstRow = new JPanel(new FlowLayout());
+    firstRow.setOpaque(false);
+    firstRow.add(label);
+    firstRow.add(applyButton);
+    firstRow.add(undoButton);
+    this.add(firstRow);
+
+    JPanel jPanel1 = new JPanel(new BorderLayout());
     jPanel1.setOpaque(false);
-    this.add(jPanel2, null);
-    jPanel2.add(label, null);
-    jPanel2.add(applyButton, null);
-    jPanel2.add(undoButton, null);
-    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);
+    jPanel1.add(valueField, BorderLayout.CENTER);
+    jPanel1.add(allGroupsCheck, BorderLayout.EAST);
+
+    southPanel.setLayout(new BorderLayout());
+    southPanel.setOpaque(false);
+    southPanel.add(jPanel1, BorderLayout.EAST);
+    southPanel.add(slider, BorderLayout.CENTER);
+    this.add(southPanel);
   }
 
   /**
@@ -230,16 +218,6 @@ public class GSliderPanel extends JPanel
   {
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
-   */
-  protected void allGroupsCheck_actionPerformed(ActionEvent e)
-  {
-  }
-
   public void slider_mouseReleased(MouseEvent e)
   {