refactor labelled button creator to JvSwingUtils

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

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 9448065..1a1f9d3 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -17,6 +17,8 @@
  */
 package jalview.jbgui;
 
+import jalview.gui.JvSwingUtils;
+
 import java.awt.*;
 import java.awt.event.*;
 
@@ -239,26 +241,6 @@ public class GPreferences extends JPanel
 
   protected JCheckBox followHighlight = new JCheckBox();
 
-  public void addtoLayout(JPanel panel, String tooltip, JComponent label, JComponent valBox)
-  {
-    JPanel laypanel = new JPanel(),labPanel=new JPanel(), valPanel=new JPanel();
-    // laypanel.setSize(panel.getPreferredSize());
-    // laypanel.setLayout(null);
-    labPanel.setBounds(new Rectangle(7, 7, 158, 23));
-    valPanel.setBounds(new Rectangle(172, 7, 270,23));
-    //labPanel.setLayout(new GridLayout(1,1));
-    //valPanel.setLayout(new GridLayout(1,1));
-    labPanel.add(label);
-    valPanel.add(valBox);
-    laypanel.add(labPanel);
-    laypanel.add(valPanel);
-    valPanel.setToolTipText(tooltip);
-    labPanel.setToolTipText(tooltip);
-    valBox.setToolTipText(tooltip);
-    panel.add(laypanel);
-    panel.validate();
-    
-  }
   /**
    * Creates a new GPreferences object.
    */
@@ -727,12 +709,12 @@ public class GPreferences extends JPanel
     tooltipSettings.add(showNpTooltip);
     visualTab.add(tooltipSettings);
     visualTab.add(jPanel2);
-    addtoLayout(visual2Tab, "Default Colourscheme for alignment", colourLabel, colour);
+    JvSwingUtils.addtoLayout(visual2Tab, "Default Colourscheme for alignment", colourLabel, colour);
     JPanel annotationShding=new JPanel();
     annotationShding.setBorder(new TitledBorder("Annotation Shading Default"));
     annotationShding.setLayout(new GridLayout(1,2));
-    addtoLayout(annotationShding, "Default Minimum Colour for annotation shading", mincolourLabel,minColour);
-    addtoLayout(annotationShding,"Default Maximum Colour for annotation shading", maxcolourLabel, maxColour);
+    JvSwingUtils.addtoLayout(annotationShding, "Default Minimum Colour for annotation shading", mincolourLabel,minColour);
+    JvSwingUtils.addtoLayout(annotationShding,"Default Maximum Colour for annotation shading", maxcolourLabel, maxColour);
     visual2Tab.add(annotationShding); // , FlowLayout.LEFT);
 
 //    visual2panel.add(minColour);