Updated with latest from mchmmer branch
[jalview.git] / src / jalview / appletgui / FeatureSettings.java
index f6f9727..a60aacd 100755 (executable)
@@ -25,6 +25,7 @@ import jalview.api.FeatureSettingsControllerI;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
 import jalview.util.MessageManager;
+import jalview.viewmodel.seqfeatures.FeatureRendererModel.FeatureSettingsBean;
 
 import java.awt.BorderLayout;
 import java.awt.Button;
@@ -63,8 +64,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class FeatureSettings extends Panel implements ItemListener,
-        MouseListener, MouseMotionListener, ActionListener,
+public class FeatureSettings extends Panel
+        implements ItemListener, MouseListener, MouseMotionListener,
         AdjustmentListener, FeatureSettingsControllerI
 {
   FeatureRenderer fr;
@@ -120,8 +121,17 @@ public class FeatureSettings extends Panel implements ItemListener,
       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);
@@ -135,11 +145,18 @@ public class FeatureSettings extends Panel implements ItemListener,
 
     add(lowerPanel, BorderLayout.SOUTH);
 
-    groupPanel.setLayout(new GridLayout(
-            (fr.getFeatureGroupsSize()) / 4 + 1, 4)); // JBPNote - this was
-                                                      // scaled on number of
-                                                      // visible groups. seems
-                                                      // broken
+    groupPanel.setLayout(
+            new GridLayout((fr.getFeatureGroupsSize()) / 4 + 1, 4)); // JBPNote
+                                                                     // - this
+                                                                     // was
+                                                                     // scaled
+                                                                     // on
+                                                                     // number
+                                                                     // of
+                                                                     // visible
+                                                                     // groups.
+                                                                     // seems
+                                                                     // broken
     groupPanel.validate();
 
     add(groupPanel, BorderLayout.NORTH);
@@ -174,14 +191,12 @@ public class FeatureSettings extends Panel implements ItemListener,
   public void paint(Graphics g)
   {
     g.setColor(Color.black);
-    g.drawString(MessageManager
-            .getString("label.no_features_added_to_this_alignment"), 10, 20);
-    g.drawString(MessageManager
-            .getString("label.features_can_be_added_from_searches_1"), 10,
-            40);
-    g.drawString(MessageManager
-            .getString("label.features_can_be_added_from_searches_2"), 10,
-            60);
+    g.drawString(MessageManager.getString(
+            "label.no_features_added_to_this_alignment"), 10, 20);
+    g.drawString(MessageManager.getString(
+            "label.features_can_be_added_from_searches_1"), 10, 40);
+    g.drawString(MessageManager.getString(
+            "label.features_can_be_added_from_searches_2"), 10, 60);
   }
 
   protected void popupSort(final MyCheckbox check,
@@ -189,8 +204,9 @@ public class FeatureSettings extends Panel implements ItemListener,
   {
     final String type = check.type;
     final FeatureColourI typeCol = fr.getFeatureStyle(type);
-    PopupMenu men = new PopupMenu(MessageManager.formatMessage(
-            "label.settings_for_type", new String[] { type }));
+    PopupMenu men = new PopupMenu(MessageManager
+            .formatMessage("label.settings_for_type", new String[]
+            { type }));
     java.awt.MenuItem scr = new MenuItem(
             MessageManager.getString("label.sort_by_score"));
     men.add(scr);
@@ -201,8 +217,9 @@ public class FeatureSettings extends Panel implements ItemListener,
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        me.ap.alignFrame.avc.sortAlignmentByFeatureScore(Arrays
-                .asList(new String[] { type }));
+        me.ap.alignFrame.avc
+                .sortAlignmentByFeatureScore(Arrays.asList(new String[]
+                { type }));
       }
 
     });
@@ -214,8 +231,9 @@ public class FeatureSettings extends Panel implements ItemListener,
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        me.ap.alignFrame.avc.sortAlignmentByFeatureDensity(Arrays
-                .asList(new String[] { type }));
+        me.ap.alignFrame.avc
+                .sortAlignmentByFeatureDensity(Arrays.asList(new String[]
+                { type }));
       }
 
     });
@@ -279,8 +297,8 @@ public class FeatureSettings extends Panel implements ItemListener,
     });
     men.add(selectContaining);
 
-    MenuItem selectNotContaining = new MenuItem(
-            MessageManager.getString("label.select_columns_not_containing"));
+    MenuItem selectNotContaining = new MenuItem(MessageManager
+            .getString("label.select_columns_not_containing"));
     selectNotContaining.addActionListener(new ActionListener()
     {
       @Override
@@ -369,8 +387,8 @@ public class FeatureSettings extends Panel implements ItemListener,
   // Group selection states
   void resetTable(boolean groupsChanged)
   {
-    List<String> displayableTypes = new ArrayList<String>();
-    Set<String> foundGroups = new HashSet<String>();
+    List<String> displayableTypes = new ArrayList<>();
+    Set<String> foundGroups = new HashSet<>();
 
     AlignmentI alignment = av.getAlignment();
 
@@ -383,7 +401,7 @@ public class FeatureSettings extends Panel implements ItemListener,
        * and keep track of which groups are visible
        */
       Set<String> groups = seq.getFeatures().getFeatureGroups(true);
-      Set<String> visibleGroups = new HashSet<String>();
+      Set<String> visibleGroups = new HashSet<>();
       for (String group : groups)
       {
         // if (group == null || fr.checkGroupVisibility(group, true))
@@ -454,8 +472,8 @@ public class FeatureSettings extends Panel implements ItemListener,
       addCheck(groupsChanged, type);
     }
 
-    featurePanel.setLayout(new GridLayout(featurePanel.getComponentCount(),
-            1, 10, 5));
+    featurePanel.setLayout(
+            new GridLayout(featurePanel.getComponentCount(), 1, 10, 5));
     featurePanel.validate();
 
     if (scrollPane != null)
@@ -537,8 +555,7 @@ public class FeatureSettings extends Panel implements ItemListener,
     }
   }
 
-  @Override
-  public void actionPerformed(ActionEvent evt)
+  protected void invertSelection()
   {
     for (int i = 0; i < featurePanel.getComponentCount(); i++)
     {
@@ -575,24 +592,21 @@ public class FeatureSettings extends Panel implements ItemListener,
   {
     Component[] comps = featurePanel.getComponents();
     int cSize = comps.length;
-
-    Object[][] tmp = new Object[cSize][3];
-    int tmpSize = 0;
-    for (int i = 0; i < cSize; i++)
-    {
-      MyCheckbox check = (MyCheckbox) comps[i];
-      tmp[tmpSize][0] = check.type;
-      tmp[tmpSize][1] = fr.getFeatureStyle(check.type);
-      tmp[tmpSize][2] = new Boolean(check.getState());
-      tmpSize++;
+    FeatureSettingsBean[] rowData = new FeatureSettingsBean[cSize];
+    int i = 0;
+    for (Component comp : comps)
+    {
+      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][3];
-    System.arraycopy(tmp, 0, data, 0, tmpSize);
-
-    fr.setFeaturePriority(data);
+    fr.setFeaturePriority(rowData);
 
-    ap.paintAlignment(updateOverview);
+    ap.paintAlignment(updateOverview, updateOverview);
   }
 
   MyCheckbox selectedCheck;
@@ -634,8 +648,8 @@ public class FeatureSettings extends Panel implements ItemListener,
     }
     else
     {
-      comp = featurePanel.getComponentAt(evt.getX(), evt.getY()
-              + evt.getComponent().getLocation().y);
+      comp = featurePanel.getComponentAt(evt.getX(),
+              evt.getY() + evt.getComponent().getLocation().y);
     }
 
     if (comp != null && comp instanceof Checkbox)
@@ -672,7 +686,7 @@ public class FeatureSettings extends Panel implements ItemListener,
   {
     featurePanel.removeAll();
     resetTable(false);
-    ap.paintAlignment(true);
+    ap.paintAlignment(true, true);
   }
 
   @Override
@@ -724,7 +738,7 @@ public class FeatureSettings extends Panel implements ItemListener,
   public void adjustmentValueChanged(AdjustmentEvent evt)
   {
     fr.setTransparency((100 - transparency.getValue()) / 100f);
-    ap.paintAlignment(true);
+    ap.paintAlignment(true, true);
   }
 
   class MyCheckbox extends Checkbox