X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=489cbb145d0bf7941f320502430479403782f43a;hb=48e68905336d8ee17ee6b3903d80b36bac8c56cf;hp=46498adac06c2650b7768070c6723d40753281e3;hpb=163ed5b997bbda48e4cdd950e87a8fe01baae7fb;p=jalview.git diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java index 46498ad..489cbb1 100755 --- a/src/jalview/appletgui/FeatureSettings.java +++ b/src/jalview/appletgui/FeatureSettings.java @@ -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 displayableTypes = new ArrayList(); - Set foundGroups = new HashSet(); + List displayableTypes = new ArrayList<>(); + Set 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 groups = seq.getFeatures().getFeatureGroups(true); - Set visibleGroups = new HashSet(); + Set 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,15 +555,14 @@ public class FeatureSettings extends Panel implements ItemListener, } } - @Override - public void actionPerformed(ActionEvent evt) + protected void invertSelection() { for (int i = 0; i < featurePanel.getComponentCount(); i++) { Checkbox check = (Checkbox) featurePanel.getComponent(i); check.setState(!check.getState()); } - selectionChanged(); + selectionChanged(true); } private ItemListener groupItemListener = new ItemListener() @@ -568,31 +585,28 @@ public class FeatureSettings extends Panel implements ItemListener, @Override public void itemStateChanged(ItemEvent evt) { - selectionChanged(); + selectionChanged(true); } - void selectionChanged() + void selectionChanged(boolean updateOverview) { 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(true); + 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 @@ -689,7 +703,7 @@ public class FeatureSettings extends Panel implements ItemListener, 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()); } @@ -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