Reduced jar size by 20%

[jalview.git] / src / jalview / appletgui / SliderPanel.java

diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java
index caabbf9..c343df9 100755 (executable)
--- a/src/jalview/appletgui/SliderPanel.java
+++ b/src/jalview/appletgui/SliderPanel.java
@@ -25,11 +25,9 @@ import java.awt.*;
 import java.awt.event.*;\r
 \r
 import jalview.datamodel.*;\r
-import jalview.jbappletgui.*;\r
 import jalview.schemes.*;\r
 \r
-public class SliderPanel\r
-    extends GSliderPanel\r
+public class SliderPanel extends Panel implements ActionListener, AdjustmentListener\r
 {\r
   AlignmentPanel ap;\r
   boolean forConservation = true;\r
@@ -42,11 +40,10 @@ public class SliderPanel
                                           String source)\r
   {\r
     SliderPanel sp = null;\r
-    ConservationColourScheme ccs = (ConservationColourScheme) cs;\r
 \r
     if (conservationSlider == null)\r
     {\r
-      sp = new SliderPanel(ap, ccs.inc, true, cs);\r
+      sp = new SliderPanel(ap, cs.getConservationInc(), true, cs);\r
       conservationSlider = new Frame();\r
       conservationSlider.add(sp);\r
     }\r
@@ -154,6 +151,11 @@ public class SliderPanel
   public SliderPanel(AlignmentPanel ap, int value, boolean forConserve,\r
                      ColourSchemeI cs)\r
   {\r
+    try {\r
+        jbInit();\r
+    } catch (Exception e) {\r
+        e.printStackTrace();\r
+      }\r
     this.ap = ap;\r
     this.cs = cs;\r
     forConservation = forConserve;\r
@@ -174,14 +176,7 @@ public class SliderPanel
       slider.setBlockIncrement(1);\r
     }\r
 \r
-    slider.addAdjustmentListener(new AdjustmentListener()\r
-    {\r
-      public void adjustmentValueChanged(AdjustmentEvent evt)\r
-      {\r
-        valueField.setText(slider.getValue() + "");\r
-        valueChanged(slider.getValue());\r
-      }\r
-    });\r
+    slider.addAdjustmentListener(this);\r
 \r
     slider.setValue(value);\r
     valueField.setText(value + "");\r
@@ -217,14 +212,11 @@ public class SliderPanel
 \r
       if (forConservation)\r
       {\r
-        if (toChange instanceof ConservationColourScheme)\r
-        {\r
-          ( (ConservationColourScheme) toChange).inc = i;\r
-        }\r
+        toChange.setConservationInc(i);\r
       }\r
       else\r
       {\r
-        ( (ResidueColourScheme) toChange).setThreshold(i);\r
+        toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());\r
       }\r
 \r
       groupIndex--;\r
@@ -239,7 +231,24 @@ public class SliderPanel
     allGroupsCheck.setEnabled(b);\r
   }\r
 \r
-  public void valueField_actionPerformed(ActionEvent e)\r
+  public void actionPerformed(ActionEvent evt)\r
+  {\r
+    if(evt.getSource()==applyButton)\r
+      applyButton_actionPerformed();\r
+    else if(evt.getSource()==undoButton)\r
+      undoButton_actionPerformed();\r
+    else if(evt.getSource()==valueField)\r
+      valueField_actionPerformed();\r
+  }\r
+\r
+  public void adjustmentValueChanged(AdjustmentEvent evt)\r
+  {\r
+    valueField.setText(slider.getValue() + "");\r
+    valueChanged(slider.getValue());\r
+  }\r
+\r
+\r
+  public void valueField_actionPerformed()\r
   {\r
     try\r
     {\r
@@ -262,4 +271,64 @@ public class SliderPanel
     return Integer.parseInt(valueField.getText());\r
   }\r
 \r
+  // this is used for conservation colours, PID colours and redundancy threshold\r
+  protected Scrollbar slider = new Scrollbar();\r
+  protected TextField valueField = new TextField();\r
+  protected Label label = new Label();\r
+  Panel jPanel1 = new Panel();\r
+  Panel jPanel2 = new Panel();\r
+  protected Button applyButton = new Button();\r
+  protected Button undoButton = new Button();\r
+  FlowLayout flowLayout1 = new FlowLayout();\r
+  protected Checkbox allGroupsCheck = new Checkbox();\r
+  BorderLayout borderLayout1 = new BorderLayout();\r
+  BorderLayout borderLayout2 = new BorderLayout();\r
+  FlowLayout flowLayout2 = new FlowLayout();\r
+\r
+  private void jbInit() throws Exception {\r
+      this.setLayout(borderLayout2);\r
+\r
+      // slider.setMajorTickSpacing(10);\r
+      //  slider.setMinorTickSpacing(1);\r
+      //  slider.setPaintTicks(true);\r
+      slider.setBackground(Color.white);\r
+      slider.setFont(new java.awt.Font("Verdana", 0, 11));\r
+      slider.setOrientation(0);\r
+      valueField.setFont(new java.awt.Font("Verdana", 0, 11));\r
+      valueField.setText("      ");\r
+      valueField.addActionListener(this);\r
+      label.setFont(new java.awt.Font("Verdana", 0, 11));\r
+      label.setText("set this label text");\r
+      jPanel1.setLayout(borderLayout1);\r
+      jPanel2.setLayout(flowLayout1);\r
+      applyButton.setFont(new java.awt.Font("Verdana", 0, 11));\r
+      applyButton.setLabel("Apply");\r
+      applyButton.addActionListener(this);\r
+      undoButton.setEnabled(false);\r
+      undoButton.setFont(new java.awt.Font("Verdana", 0, 11));\r
+      undoButton.setLabel("Undo");\r
+      undoButton.addActionListener(this);\r
+      allGroupsCheck.setEnabled(false);\r
+      allGroupsCheck.setFont(new java.awt.Font("Verdana", 0, 11));\r
+      allGroupsCheck.setLabel("Apply threshold to all groups");\r
+      allGroupsCheck.setName("Apply to all Groups");\r
+      this.setBackground(Color.white);\r
+      this.setForeground(Color.black);\r
+      jPanel2.add(label, null);\r
+      jPanel2.add(applyButton, null);\r
+      jPanel2.add(undoButton, null);\r
+      jPanel2.add(allGroupsCheck);\r
+      jPanel1.add(valueField, java.awt.BorderLayout.EAST);\r
+      jPanel1.add(slider, java.awt.BorderLayout.CENTER);\r
+      this.add(jPanel1, java.awt.BorderLayout.SOUTH);\r
+      this.add(jPanel2, java.awt.BorderLayout.CENTER);\r
+  }\r
+\r
+  protected void applyButton_actionPerformed()\r
+  {\r
+  }\r
+\r
+  protected void undoButton_actionPerformed()\r
+  {\r
+  }\r
 }\r