X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=40a2ce5fc497e39c74de1eeb81ec2c79d88aa193;hb=95b271e7afc0a09a6ccfcdb92422c69a9b989a7e;hp=bde68cc5302639052fcc05bc5714efd66ddf1b60;hpb=72b3f05a1157da32ada5aea139139996dddea219;p=jalview.git diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java index bde68cc..40a2ce5 100755 --- a/src/jalview/appletgui/FeatureSettings.java +++ b/src/jalview/appletgui/FeatureSettings.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,21 +20,52 @@ */ package jalview.appletgui; -import java.util.*; -import java.util.List; -import java.awt.*; -import java.awt.event.*; - -import jalview.analysis.AlignmentSorter; -import jalview.commands.OrderCommand; -import jalview.datamodel.*; +import jalview.api.FeatureSettingsControllerI; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.SequenceFeature; import jalview.schemes.AnnotationColourGradient; import jalview.schemes.GraduatedColor; import jalview.util.MessageManager; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Checkbox; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.GridLayout; +import java.awt.Image; +import java.awt.Label; +import java.awt.MenuItem; +import java.awt.Panel; +import java.awt.PopupMenu; +import java.awt.ScrollPane; +import java.awt.Scrollbar; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; +import java.awt.event.InputEvent; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; +import java.util.Vector; + public class FeatureSettings extends Panel implements ItemListener, MouseListener, MouseMotionListener, ActionListener, - AdjustmentListener + AdjustmentListener, FeatureSettingsControllerI { FeatureRenderer fr; @@ -84,12 +115,13 @@ public class FeatureSettings extends Panel implements ItemListener, fr.findAllFeatures(true); // was default - now true to make all visible } - setTableData(); + discoverAllFeatureData(); this.setLayout(new BorderLayout()); scrollPane = new ScrollPane(); scrollPane.add(featurePanel); - if (fr.getAllFeatureColours()!=null && fr.getAllFeatureColours().size()>0) + if (fr.getAllFeatureColours() != null + && fr.getAllFeatureColours().size() > 0) { add(scrollPane, BorderLayout.CENTER); } @@ -120,10 +152,11 @@ public class FeatureSettings extends Panel implements ItemListener, if (groupPanel != null) { - 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); @@ -133,6 +166,7 @@ public class FeatureSettings extends Panel implements ItemListener, final FeatureSettings me = this; frame.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { if (me.av.featureSettings == me) @@ -149,10 +183,11 @@ public class FeatureSettings extends Panel implements ItemListener, height = Math.min(400, height); int width = 300; jalview.bin.JalviewLite.addFrame(frame, - MessageManager.getString("label.feature_settings"), width, - height); + MessageManager.getString("label.sequence_feature_settings"), + width, height); } + @Override public void paint(Graphics g) { g.setColor(Color.black); @@ -166,14 +201,14 @@ public class FeatureSettings extends Panel implements ItemListener, 60); } - protected void popupSort(final MyCheckbox check, final Hashtable minmax, + protected void popupSort(final MyCheckbox check, + final Map minmax, int x, int y) { final String type = check.type; final Object typeCol = fr.getFeatureStyle(type); java.awt.PopupMenu men = new PopupMenu(MessageManager.formatMessage( - "label.settings_for_type", new String[] - { type })); + "label.settings_for_type", new String[] { type })); java.awt.MenuItem scr = new MenuItem( MessageManager.getString("label.sort_by_score")); men.add(scr); @@ -181,10 +216,11 @@ public class FeatureSettings extends Panel implements ItemListener, scr.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - me.ap.alignFrame.avc.sortAlignmentByFeatureScore(new String[] - { type }); + me.ap.alignFrame.avc.sortAlignmentByFeatureScore(Arrays + .asList(new String[] { type })); } }); @@ -193,17 +229,18 @@ public class FeatureSettings extends Panel implements ItemListener, dens.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - me.ap.alignFrame.avc.sortAlignmentByFeatureDensity(new String[] - { type }); + me.ap.alignFrame.avc.sortAlignmentByFeatureDensity(Arrays + .asList(new String[] { type })); } }); men.add(dens); if (minmax != null) { - final Object typeMinMax = minmax.get(type); + final float[][] typeMinMax = minmax.get(type); /* * final java.awt.CheckboxMenuItem chb = new * java.awt.CheckboxMenuItem("Vary Height"); // this is broken at the @@ -216,7 +253,7 @@ public class FeatureSettings extends Panel implements ItemListener, * * }); men.add(chb); */ - if (typeMinMax != null && ((float[][]) typeMinMax)[0] != null) + if (typeMinMax != null && typeMinMax[0] != null) { // graduated colourschemes for those where minmax exists for the // positional features @@ -227,6 +264,7 @@ public class FeatureSettings extends Panel implements ItemListener, mxcol.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if (typeCol instanceof Color) @@ -249,9 +287,11 @@ public class FeatureSettings extends Panel implements ItemListener, men.show(this.featurePanel, x, y); } - public void setTableData() + @Override + public void discoverAllFeatureData() { - if (fr.getAllFeatureColours()!=null && fr.getAllFeatureColours().size()>0) + if (fr.getAllFeatureColours() != null + && fr.getAllFeatureColours().size() > 0) { rebuildGroups(); @@ -276,12 +316,10 @@ public class FeatureSettings extends Panel implements ItemListener, } // TODO: JAL-964 - smoothly incorporate new group entries if panel already // displayed and new groups present - for (String group:(List)fr.getFeatureGroups()) + for (String group : fr.getFeatureGroups()) { boolean vis = fr.checkGroupVisibility(group, false); - Checkbox check = new MyCheckbox(group, vis, - (fr.featureLinks != null && fr.featureLinks - .containsKey(group))); + Checkbox check = new MyCheckbox(group, vis, false); check.addMouseListener(this); check.setFont(new Font("Serif", Font.BOLD, 12)); check.addItemListener(groupItemListener); @@ -294,13 +332,14 @@ public class FeatureSettings extends Panel implements ItemListener, groupPanel.validate(); } } + // This routine adds and removes checkboxes depending on // Group selection states void resetTable(boolean groupsChanged) { SequenceFeature[] tmpfeatures; String group = null, type; - Vector visibleChecks = new Vector(); + Vector visibleChecks = new Vector(); AlignmentI alignment = av.getAlignment(); for (int i = 0; i < alignment.getHeight(); i++) { @@ -366,7 +405,7 @@ public class FeatureSettings extends Panel implements ItemListener, // now add checkboxes which should be visible, // if they have not already been added - Enumeration en = visibleChecks.elements(); + Enumeration en = visibleChecks.elements(); while (en.hasMoreElements()) { @@ -418,10 +457,7 @@ public class FeatureSettings extends Panel implements ItemListener, selected = true; } - check = new MyCheckbox( - type, - selected, - (fr.featureLinks != null && fr.featureLinks.containsKey(type)), + check = new MyCheckbox(type, selected, false, fr.getFeatureStyle(type)); check.addMouseListener(this); @@ -440,6 +476,7 @@ public class FeatureSettings extends Panel implements ItemListener, } } + @Override public void actionPerformed(ActionEvent evt) { for (int i = 0; i < featurePanel.getComponentCount(); i++) @@ -450,11 +487,13 @@ public class FeatureSettings extends Panel implements ItemListener, selectionChanged(); } - private ItemListener groupItemListener = new ItemListener() { - public void itemStateChanged(ItemEvent evt) { + private ItemListener groupItemListener = new ItemListener() + { + @Override + public void itemStateChanged(ItemEvent evt) + { Checkbox source = (Checkbox) evt.getSource(); - fr.setGroupVisibility(source.getLabel(), - source.getState()); + fr.setGroupVisibility(source.getLabel(), source.getState()); ap.seqPanel.seqCanvas.repaint(); if (ap.overviewPanel != null) { @@ -464,6 +503,8 @@ public class FeatureSettings extends Panel implements ItemListener, return; }; }; + + @Override public void itemStateChanged(ItemEvent evt) { selectionChanged(); @@ -497,22 +538,7 @@ public class FeatureSettings extends Panel implements ItemListener, boolean dragging = false; - public void mousePressed(MouseEvent evt) - { - - selectedCheck = (MyCheckbox) evt.getSource(); - - if (fr.featureLinks != null - && fr.featureLinks.containsKey(selectedCheck.type)) - { - if (evt.getX() > selectedCheck.stringWidth + 20) - { - evt.consume(); - } - } - - } - + @Override public void mouseDragged(MouseEvent evt) { if (((Component) evt.getSource()).getParent() != featurePanel) @@ -522,6 +548,7 @@ public class FeatureSettings extends Panel implements ItemListener, dragging = true; } + @Override public void mouseReleased(MouseEvent evt) { if (((Component) evt.getSource()).getParent() != featurePanel) @@ -584,7 +611,8 @@ public class FeatureSettings extends Panel implements ItemListener, else { throw new Error( - "Implementation error: Unsupported feature colour object."); + MessageManager + .getString("error.implementation_error_unsupported_feature_colour_object")); } refreshTable(); } @@ -596,14 +624,17 @@ public class FeatureSettings extends Panel implements ItemListener, ap.paintAlignment(true); } + @Override public void mouseEntered(MouseEvent evt) { } + @Override public void mouseExited(MouseEvent evt) { } + @Override public void mouseClicked(MouseEvent evt) { MyCheckbox check = (MyCheckbox) evt.getSource(); @@ -611,16 +642,6 @@ public class FeatureSettings extends Panel implements ItemListener, { this.popupSort(check, fr.getMinMax(), evt.getX(), evt.getY()); } - if (fr.featureLinks != null && fr.featureLinks.containsKey(check.type)) - { - if (evt.getX() > check.stringWidth + 20) - { - evt.consume(); - String link = fr.featureLinks.get(check.type).toString(); - ap.alignFrame.showURL(link.substring(link.indexOf("|") + 1), - link.substring(0, link.indexOf("|"))); - } - } if (check.getParent() != featurePanel) { @@ -643,13 +664,15 @@ public class FeatureSettings extends Panel implements ItemListener, } } + @Override public void mouseMoved(MouseEvent evt) { } + @Override public void adjustmentValueChanged(AdjustmentEvent evt) { - fr.setTransparency((float) (100 - transparency.getValue()) / 100f); + fr.setTransparency((100 - transparency.getValue()) / 100f); ap.seqPanel.seqCanvas.repaint(); } @@ -680,7 +703,9 @@ public class FeatureSettings extends Panel implements ItemListener, } else { - throw new Error("Invalid color for MyCheckBox"); + throw new Error( + MessageManager + .getString("error.invalid_colour_for_mycheckbox")); } if (col != null) { @@ -725,6 +750,7 @@ public class FeatureSettings extends Panel implements ItemListener, updateColor(featureStyle); } + @Override public void paint(Graphics g) { Dimension d = getSize(); @@ -763,4 +789,9 @@ public class FeatureSettings extends Panel implements ItemListener, } } + @Override + public void mousePressed(MouseEvent e) + { + } + }