X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureSettings.java;h=9ffcaee39d3cc30d0b756eeb18e5dd4c3a0a28ea;hb=refs%2Fheads%2FJAL-3253_applet_omnibus-BH;hp=b49593a1697a2842b036a8a55d02a6a02c3cc905;hpb=ab0e5f2223a993371761baf240d815abdfcbb950;p=jalview.git diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index b49593a..9ffcaee 100644 --- a/src/jalview/gui/FeatureSettings.java +++ b/src/jalview/gui/FeatureSettings.java @@ -408,8 +408,8 @@ public class FeatureSettings extends JPanel } else { - frame = new JInternalFrame(); - frame.setContentPane(this); + frame = new JInternalFrame(); + frame.setContentPane(this); Rectangle bounds = af.getFeatureSettingsGeometry(); String title; if (af.getAlignPanels().size() > 1 || Desktop.getAlignmentPanels( @@ -441,22 +441,22 @@ public class FeatureSettings extends JPanel frame.setBounds(bounds); frame.setVisible(true); } - frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT)); + frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT)); - frame.addInternalFrameListener( - new javax.swing.event.InternalFrameAdapter() + frame.addInternalFrameListener( + new javax.swing.event.InternalFrameAdapter() + { + @Override + public void internalFrameClosed( + javax.swing.event.InternalFrameEvent evt) { - @Override - public void internalFrameClosed( - javax.swing.event.InternalFrameEvent evt) - { featureSettings_isClosed(); }; - }); - frame.setLayer(JLayeredPane.PALETTE_LAYER); + }); + frame.setLayer(JLayeredPane.PALETTE_LAYER); } - inConstruction = false; - } + inConstruction = false; + } /** * Sets the state of buttons to show complement features from viewport @@ -485,12 +485,12 @@ public class FeatureSettings extends JPanel /** * Constructs and shows a popup menu of possible actions on the selected row and * feature type - * - * @param rowSelected - * @param type - * @param typeCol - * @param pt - */ + * + * @param rowSelected + * @param type + * @param typeCol + * @param pt + */ protected void showPopupMenu(final int rowSelected, final String type, final Object typeCol, final Point pt) { JPopupMenu men = new JPopupMenu(MessageManager @@ -517,8 +517,8 @@ public class FeatureSettings extends JPanel { if (e.getSource() == variableColourCB) { - // BH 2018 for JavaScript because this is a checkbox - men.setVisible(true); + // BH 2018 for JavaScript because this is a checkbox + men.setVisible(true); men.setVisible(false); if (featureColour.isSimpleColour()) { @@ -577,6 +577,7 @@ public class FeatureSettings extends JPanel men.add(scr); scr.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { @@ -587,6 +588,7 @@ public class FeatureSettings extends JPanel MessageManager.getString("label.sort_by_density")); dens.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { @@ -1297,7 +1299,7 @@ public class FeatureSettings extends JPanel if (frame != null) { af.setFeatureSettingsGeometry(frame.getBounds()); - frame.setClosed(true); + frame.setClosed(true); } else { @@ -1472,8 +1474,8 @@ public class FeatureSettings extends JPanel { if (!hasComplement) { - close(); - } + close(); + } else { storeOriginalSettings(); @@ -1614,7 +1616,7 @@ public class FeatureSettings extends JPanel * * @param fcol * @param withHint - * if true include 'click to edit' and similar text + * if true include 'click to edit' and similar text * @return */ public static String getColorTooltip(FeatureColourI fcol,