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-2591 Added readwrite locking on HiddenColumns
[jalview.git]
/
src
/
jalview
/
jbgui
/
GFinder.java
diff --git
a/src/jalview/jbgui/GFinder.java
b/src/jalview/jbgui/GFinder.java
index
bbd20ca
..
c335b33
100755
(executable)
--- a/
src/jalview/jbgui/GFinder.java
+++ b/
src/jalview/jbgui/GFinder.java
@@
-145,14
+145,13
@@
public class GFinder extends JPanel
});
searchBox.getEditor().getEditorComponent()
.addKeyListener(new java.awt.event.KeyAdapter()
});
searchBox.getEditor().getEditorComponent()
.addKeyListener(new java.awt.event.KeyAdapter()
- {
- @Override
- public void keyPressed(KeyEvent e)
- {
- textfield_keyPressed(e);
- }
- });
-
+ {
+ @Override
+ public void keyPressed(KeyEvent e)
+ {
+ textfield_keyPressed(e);
+ }
+ });
mainBorderLayout.setHgap(5);
mainBorderLayout.setVgap(5);
jPanel4.setLayout(borderLayout2);
mainBorderLayout.setHgap(5);
mainBorderLayout.setVgap(5);
jPanel4.setLayout(borderLayout2);
@@
-186,23
+185,27
@@
public class GFinder extends JPanel
jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST);
}
jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST);
}
- protected void findNext_actionPerformed(ActionEvent e)
+ protected void textfield_keyPressed(KeyEvent e)
{
{
+ if (e.getKeyCode() == KeyEvent.VK_ENTER)
+ {
+ if (!searchBox.isPopupVisible())
+ {
+ e.consume();
+ findNext_actionPerformed(null);
+ }
+ }
}
}
- protected void findAll_actionPerformed(ActionEvent e)
+ protected void findNext_actionPerformed(ActionEvent e)
{
}
{
}
- protected void textfield_keyPressed(KeyEvent e)
+ protected void findAll_actionPerformed(ActionEvent e)
{
{
- if (e.getKeyCode() == KeyEvent.VK_ENTER)
- {
- e.consume();
- findNext_actionPerformed(null);
- }
}
}
+
public void createFeatures_actionPerformed()
{
}
public void createFeatures_actionPerformed()
{
}