JAL-3130 Lots of deprecation fixes. See utils/deprecation_auto_fixes.sh for commands...

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

diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java
index 7db1fbe..489cbb1 100755 (executable)
--- a/src/jalview/appletgui/FeatureSettings.java
+++ b/src/jalview/appletgui/FeatureSettings.java
@@ -66,14 +66,8 @@ import java.util.Set;
 
 public class FeatureSettings extends Panel
         implements ItemListener, MouseListener, MouseMotionListener,
-        ActionListener, AdjustmentListener, FeatureSettingsControllerI
+        AdjustmentListener, FeatureSettingsControllerI
 {
-  private static final int TYPE_COLUMN = 0;
-
-  private static final int COLOUR_COLUMN = 1;
-
-  private static final int SHOW_COLUMN = 2;
-
   FeatureRenderer fr;
 
   AlignmentPanel ap;
@@ -127,8 +121,17 @@ public class FeatureSettings extends Panel
       add(scrollPane, BorderLayout.CENTER);
     }
 
-    Button invert = new Button("Invert Selection");
-    invert.addActionListener(this);
+    Button invert = new Button(
+            MessageManager.getString("label.invert_selection"));
+    invert.addActionListener(new ActionListener()
+    {
+
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        invertSelection();
+      }
+    });
 
     Panel lowerPanel = new Panel(new GridLayout(2, 1, 5, 10));
     lowerPanel.add(invert);
@@ -552,8 +555,7 @@ public class FeatureSettings extends Panel
     }
   }
 
-  @Override
-  public void actionPerformed(ActionEvent evt)
+  protected void invertSelection()
   {
     for (int i = 0; i < featurePanel.getComponentCount(); i++)
     {
@@ -590,47 +592,23 @@ public class FeatureSettings extends Panel
   {
     Component[] comps = featurePanel.getComponents();
     int cSize = comps.length;
-
-    /*
-     * temporary! leave column[2] empty - used for Filter in
-     * gui.FeatureSettings
-     */
-    int columnCount = 4;
-    Object[][] tmp = new Object[cSize][columnCount];
-    int tmpSize = 0;
-    for (int i = 0; i < cSize; i++)
+    FeatureSettingsBean[] rowData = new FeatureSettingsBean[cSize];
+    int i = 0;
+    for (Component comp : comps)
     {
-      MyCheckbox check = (MyCheckbox) comps[i];
-      tmp[tmpSize][TYPE_COLUMN /* 0 */] = check.type;
-      tmp[tmpSize][COLOUR_COLUMN /* 1 */] = fr.getFeatureStyle(check.type);
-      tmp[tmpSize][SHOW_COLUMN /* 3 */] = new Boolean(check.getState());
-      tmpSize++;
+      MyCheckbox check = (MyCheckbox) comp;
+      // feature filter set to null as not (yet) offered in applet
+      FeatureColourI colour = fr.getFeatureStyle(check.type);
+      rowData[i] = new FeatureSettingsBean(check.type, colour, null,
+              check.getState());
+      i++;
     }
 
-    Object[][] data = new Object[tmpSize][columnCount];
-    System.arraycopy(tmp, 0, data, 0, tmpSize);
-
-    fr.setFeaturePriority(getTableAsBeans(data));
+    fr.setFeaturePriority(rowData);
 
     ap.paintAlignment(updateOverview, updateOverview);
   }
 
-  /**
-   * Converts table data into an array of data beans
-   */
-  private FeatureSettingsBean[] getTableAsBeans(Object[][] data)
-  {
-    FeatureSettingsBean[] rowData = new FeatureSettingsBean[data.length];
-    for (int i = 0; i < data.length; i++)
-    {
-      String type = (String) data[i][TYPE_COLUMN];
-      FeatureColourI colour = (FeatureColourI) data[i][COLOUR_COLUMN];
-      Boolean isShown = (Boolean) data[i][SHOW_COLUMN];
-      // feature filter set to null as not (yet) offered in applet
-      rowData[i] = new FeatureSettingsBean(type, colour, null, isShown);
-    }
-    return rowData;
-  }
   MyCheckbox selectedCheck;
 
   boolean dragging = false;
@@ -725,7 +703,7 @@ public class FeatureSettings extends Panel
   public void mouseClicked(MouseEvent evt)
   {
     MyCheckbox check = (MyCheckbox) evt.getSource();
-    if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) != 0)
+    if ((evt.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK) != 0)
     {
       this.popupSort(check, fr.getMinMax(), evt.getX(), evt.getY());
     }