git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3066 Fix NullPointerException thrown when showing HMMER run dialog
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationColumnChooser.java
diff --git
a/src/jalview/gui/AnnotationColumnChooser.java
b/src/jalview/gui/AnnotationColumnChooser.java
index
6924b63
..
fbc93b5
100644
(file)
--- a/
src/jalview/gui/AnnotationColumnChooser.java
+++ b/
src/jalview/gui/AnnotationColumnChooser.java
@@
-25,6
+25,7
@@
import jalview.datamodel.HiddenColumns;
import jalview.io.cache.JvCacheableInputBox;
import jalview.schemes.AnnotationColourGradient;
import jalview.util.MessageManager;
import jalview.io.cache.JvCacheableInputBox;
import jalview.schemes.AnnotationColourGradient;
import jalview.util.MessageManager;
+import jalview.util.Platform;
import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
import java.awt.BorderLayout;
import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
import java.awt.BorderLayout;
@@
-33,6
+34,8
@@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
@@
-86,9
+89,8
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
private HiddenColumns oldHiddenColumns;
private HiddenColumns oldHiddenColumns;
- protected int MIN_WIDTH = 420;
-
- protected int MIN_HEIGHT = 430;
+ 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)
{
public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap)
{
@@
-97,8
+99,10
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
frame.setContentPane(this);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
Desktop.addInternalFrame(frame,
frame.setContentPane(this);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
Desktop.addInternalFrame(frame,
- MessageManager.getString("label.select_by_annotation"), 520,
- 215);
+ 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));
addSliderChangeListener();
frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
addSliderChangeListener();
@@
-153,7
+157,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
MessageManager.getString("label.threshold_filter")));
thresholdPanel.setBackground(Color.white);
thresholdPanel.setFont(JvSwingUtils.getLabelFont());
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());
percentThreshold.setBackground(Color.white);
percentThreshold.setFont(JvSwingUtils.getLabelFont());
@@
-202,7
+206,6
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
AnnotationColumnChooser.NO_GRAPH_VIEW);
switchableViewsPanel.add(graphFilterView,
AnnotationColumnChooser.GRAPH_VIEW);
AnnotationColumnChooser.NO_GRAPH_VIEW);
switchableViewsPanel.add(graphFilterView,
AnnotationColumnChooser.GRAPH_VIEW);
-
this.setLayout(new BorderLayout());
this.add(annotationComboBoxPanel, java.awt.BorderLayout.PAGE_START);
this.add(switchableViewsPanel, java.awt.BorderLayout.CENTER);
this.setLayout(new BorderLayout());
this.add(annotationComboBoxPanel, java.awt.BorderLayout.PAGE_START);
this.add(switchableViewsPanel, java.awt.BorderLayout.CENTER);
@@
-494,7
+497,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
CardLayout switchableViewsLayout = (CardLayout) switchableViewsPanel
.getLayout();
CardLayout switchableViewsLayout = (CardLayout) switchableViewsPanel
.getLayout();
- switchableViewsLayout.show(switchableViewsPanel, currentView);
+ switchableViewsLayout.show(switchableViewsPanel, currentView);
updateView();
}
updateView();
}
@@
-729,10
+732,9
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
MessageManager.getString("label.search_filter")));
searchBox.setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXX");
MessageManager.getString("label.search_filter")));
searchBox.setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXX");
- searchBox.setToolTipText(
+ searchBox.getComponent().setToolTipText(
MessageManager.getString("info.enter_search_text_here"));
MessageManager.getString("info.enter_search_text_here"));
- searchBox.getEditor().getEditorComponent()
- .addKeyListener(new java.awt.event.KeyAdapter()
+ searchBox.addKeyListener(new java.awt.event.KeyAdapter()
{
@Override
public void keyPressed(KeyEvent e)
{
@Override
public void keyPressed(KeyEvent e)
@@
-744,6
+746,14
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
}
}
});
}
}
});
+ searchBox.addFocusListener(new FocusAdapter()
+ {
+ @Override
+ public void focusLost(FocusEvent e)
+ {
+ searchStringAction();
+ }
+ });
JvSwingUtils.jvInitComponent(displayName, "label.label");
displayName.addActionListener(new ActionListener()
JvSwingUtils.jvInitComponent(displayName, "label.label");
displayName.addActionListener(new ActionListener()
@@
-761,12
+771,12
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- discriptionCheckboxAction();
+ descriptionCheckboxAction();
}
});
syncState();
}
});
syncState();
- this.add(searchBox);
+ this.add(searchBox.getComponent());
this.add(displayName);
this.add(description);
}
this.add(displayName);
this.add(description);
}
@@
-777,7
+787,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
aColChooser.updateView();
}
aColChooser.updateView();
}
- public void discriptionCheckboxAction()
+ public void descriptionCheckboxAction()
{
aColChooser.setCurrentSearchPanel(this);
aColChooser.updateView();
{
aColChooser.setCurrentSearchPanel(this);
aColChooser.updateView();