X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationColumnChooser.java;h=c0d47088910a47da4b51e924af8db98bf4603013;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=8b66b8e540f48cffad5d6a72c02e756bfb37c1c9;hpb=e7338a61f3ce96dadf44ac80b2b32cc5ba4b94c8;p=jalview.git diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java index 8b66b8e..c0d4708 100644 --- a/src/jalview/gui/AnnotationColumnChooser.java +++ b/src/jalview/gui/AnnotationColumnChooser.java @@ -91,6 +91,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter private HiddenColumns oldHiddenColumns; protected static int MIN_WIDTH = (Platform.isJS() ? 370 : 420); + protected static int MIN_HEIGHT = (Platform.isJS() ? 370 : 430); public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap) @@ -100,9 +101,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); Desktop.addInternalFrame(frame, - MessageManager.getString("label.select_by_annotation"), 0, - 0); - // BH note: MIGLayout ignores this completely, + MessageManager.getString("label.select_by_annotation"), 0, 0); + // BH note: MIGLayout ignores this completely, // possibly creating a frame smaller than specified: frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT)); @@ -158,7 +158,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter MessageManager.getString("label.threshold_filter"))); thresholdPanel.setBackground(Color.white); thresholdPanel.setFont(JvSwingUtils.getLabelFont()); - thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]") ); + thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]")); percentThreshold.setBackground(Color.white); percentThreshold.setFont(JvSwingUtils.getLabelFont()); @@ -300,15 +300,14 @@ public class AnnotationColumnChooser extends AnnotationRowFilter if (currentAnnotation.threshold == null) { currentAnnotation.setThreshold(new jalview.datamodel.GraphLine( - (currentAnnotation.graphMax - - currentAnnotation.graphMin) / 2f, + (currentAnnotation.graphMax - currentAnnotation.graphMin) + / 2f, "Threshold", Color.black)); } adjusting = true; - setSliderModel(currentAnnotation.graphMin, - currentAnnotation.graphMax, + setSliderModel(currentAnnotation.graphMin, currentAnnotation.graphMax, currentAnnotation.threshold.value); setThresholdValueText(); @@ -322,8 +321,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter AnnotationFilterParameter.ThresholdType.NO_THRESHOLD); if (currentAnnotation.isQuantitative()) { - filterParams - .setThresholdValue(currentAnnotation.threshold.value); + filterParams.setThresholdValue(currentAnnotation.threshold.value); if (selectedThresholdItem == AnnotationColourGradient.ABOVE_THRESHOLD) { @@ -378,8 +376,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter // filterAnnotations, because showing hidden columns has the side effect of // adding them to the selection av.showAllHiddenColumns(); - av.getColumnSelection().filterAnnotations( - currentAnnotation.annotations, filterParams); + av.getColumnSelection().filterAnnotations(currentAnnotation.annotations, + filterParams); boolean hideCols = getActionOption() == ACTION_OPTION_HIDE; if (hideCols) @@ -495,7 +493,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter CardLayout switchableViewsLayout = (CardLayout) switchableViewsPanel .getLayout(); - switchableViewsLayout.show(switchableViewsPanel, currentView); + switchableViewsLayout.show(switchableViewsPanel, currentView); updateView(); } @@ -732,17 +730,17 @@ public class AnnotationColumnChooser extends AnnotationRowFilter searchBox.getComponent().setToolTipText( MessageManager.getString("info.enter_search_text_here")); searchBox.addKeyListener(new java.awt.event.KeyAdapter() - { - @Override - public void keyPressed(KeyEvent e) - { - if (e.getKeyCode() == KeyEvent.VK_ENTER) - { - e.consume(); - searchStringAction(); - } - } - }); + { + @Override + public void keyPressed(KeyEvent e) + { + if (e.getKeyCode() == KeyEvent.VK_ENTER) + { + e.consume(); + searchStringAction(); + } + } + }); searchBox.addFocusListener(new FocusAdapter() { @Override