Merge branch 'releases/Release_2_10_0_Branch'

[jalview.git] / src / jalview / gui / AnnotationColumnChooser.java

diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java
index e87be35..358560e 100644 (file)
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -66,6 +66,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
 
   private CardLayout switchableViewsLayout = (CardLayout) (switchableViewsPanel
           .getLayout());
+
   private JPanel noGraphFilterView = new JPanel();
 
   private JPanel graphFilterView = new JPanel();
@@ -177,7 +178,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        ok_actionPerformed(e);
+        ok_actionPerformed();
       }
     });
 
@@ -188,7 +189,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        cancel_actionPerformed(e);
+        cancel_actionPerformed();
       }
     });
 
@@ -200,7 +201,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        threshold_actionPerformed(e);
+        threshold_actionPerformed();
       }
     });
 
@@ -211,7 +212,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        thresholdValue_actionPerformed(e);
+        thresholdValue_actionPerformed();
       }
     });
 
@@ -287,13 +288,15 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
     String defaultTtip = MessageManager
             .getString("info.change_threshold_mode_to_enable");
 
-    String threshold = getThreshold().getSelectedItem().toString();
-    if (threshold.equalsIgnoreCase("No Threshold"))
+    String thresh = getThreshold().getSelectedItem().toString();
+    if (thresh.equalsIgnoreCase("No Threshold"))
     {
       thresholdValue.setToolTipText(defaultTtip);
       slider.setToolTipText(defaultTtip);
     }
   }
+
+  @Override
   public void reset()
   {
     if (this.getOldColumnSelection() != null)
@@ -322,6 +325,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
 
   }
 
+  @Override
   public void valueChanged(boolean updateAllAnnotation)
   {
     if (slider.isEnabled())
@@ -585,7 +589,6 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
     updateView();
   }
 
-
   public class FurtherActionPanel extends JPanel
   {
     private AnnotationColumnChooser aColChooser;
@@ -646,8 +649,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
     {
       if (aColChooser.getActionOption() == AnnotationColumnChooser.ACTION_OPTION_HIDE)
       {
-        this.optionsGroup.setSelected(this.hideOption.getModel(),
-                true);
+        this.optionsGroup.setSelected(this.hideOption.getModel(), true);
       }
       else
       {
@@ -816,27 +818,26 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
       JvSwingUtils.jvInitComponent(searchBox);
       searchBox.setToolTipText(MessageManager
               .getString("info.enter_search_text_here"));
-      searchBox.getDocument().addDocumentListener(
-              new DocumentListener()
-              {
-                @Override
-                public void insertUpdate(DocumentEvent e)
-                {
-                  searchStringAction();
-                }
-
-                @Override
-                public void removeUpdate(DocumentEvent e)
-                {
-                  searchStringAction();
-                }
-
-                @Override
-                public void changedUpdate(DocumentEvent e)
-                {
-                  searchStringAction();
-                }
-              });
+      searchBox.getDocument().addDocumentListener(new DocumentListener()
+      {
+        @Override
+        public void insertUpdate(DocumentEvent e)
+        {
+          searchStringAction();
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e)
+        {
+          searchStringAction();
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e)
+        {
+          searchStringAction();
+        }
+      });
 
       JvSwingUtils.jvInitComponent(displayName, "label.label");
       displayName.setEnabled(false);
@@ -905,15 +906,14 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
     {
       String defaultTtip = MessageManager
               .getString("info.enter_search_text_to_enable");
-      String labelTtip = MessageManager
-.formatMessage(
+      String labelTtip = MessageManager.formatMessage(
               "info.search_in_annotation_label", annotations
                       .getSelectedItem().toString());
-      String descTtip = MessageManager
-.formatMessage(
+      String descTtip = MessageManager.formatMessage(
               "info.search_in_annotation_description", annotations
                       .getSelectedItem().toString());
-      displayName.setToolTipText(displayName.isEnabled() ? labelTtip : defaultTtip);
+      displayName.setToolTipText(displayName.isEnabled() ? labelTtip
+              : defaultTtip);
       description.setToolTipText(description.isEnabled() ? descTtip
               : defaultTtip);
     }