X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=c335b33d376309a76eef6dfad6318b9214817e2f;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=fef456868059b631b8d88561e24e15e82234f4d5;hpb=8677e6e34e291edc58c1da2fc9c958473754143f;p=jalview.git diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index fef4568..c335b33 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -24,6 +24,7 @@ import jalview.datamodel.AlignmentI; import jalview.io.DataSourceType; import jalview.io.FileFormat; import jalview.io.FormatAdapter; +import jalview.io.cache.JvCacheableInputBox; import jalview.util.MessageManager; import java.awt.BorderLayout; @@ -38,12 +39,11 @@ import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.CaretEvent; import javax.swing.event.CaretListener; +import javax.swing.text.JTextComponent; public class GFinder extends JPanel { @@ -57,11 +57,9 @@ public class GFinder extends JPanel GridLayout gridLayout1 = new GridLayout(); - protected JButton createNewGroup = new JButton(); + protected JButton createFeatures = new JButton(); - JScrollPane jScrollPane1 = new JScrollPane(); - - protected JTextArea textfield = new JTextArea(); + protected JvCacheableInputBox searchBox = new JvCacheableInputBox(getCacheKey()); BorderLayout mainBorderLayout = new BorderLayout(); @@ -81,6 +79,8 @@ public class GFinder extends JPanel GridLayout optionsGridLayout = new GridLayout(); + private static final String FINDER_CACHE_KEY = "CACHE.FINDER"; + public GFinder() { try @@ -121,22 +121,21 @@ public class GFinder extends JPanel gridLayout1.setHgap(0); gridLayout1.setRows(3); gridLayout1.setVgap(2); - createNewGroup.setEnabled(false); - createNewGroup.setFont(new java.awt.Font("Verdana", 0, 12)); - createNewGroup.setMargin(new Insets(0, 0, 0, 0)); - createNewGroup.setText(MessageManager.getString("label.new_feature")); - createNewGroup.addActionListener(new java.awt.event.ActionListener() + createFeatures.setEnabled(false); + createFeatures.setFont(new java.awt.Font("Verdana", 0, 12)); + createFeatures.setMargin(new Insets(0, 0, 0, 0)); + createFeatures.setText(MessageManager.getString("label.new_feature")); + createFeatures.addActionListener(new java.awt.event.ActionListener() { @Override public void actionPerformed(ActionEvent e) { - createNewGroup_actionPerformed(e); + createFeatures_actionPerformed(); } }); - textfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12)); - textfield.setText(""); - textfield.setLineWrap(true); - textfield.addCaretListener(new CaretListener() + searchBox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12)); + ((JTextComponent) searchBox.getEditor().getEditorComponent()) + .addCaretListener(new CaretListener() { @Override public void caretUpdate(CaretEvent e) @@ -144,15 +143,15 @@ public class GFinder extends JPanel textfield_caretUpdate(e); } }); - textfield.addKeyListener(new java.awt.event.KeyAdapter() - { - @Override - public void keyPressed(KeyEvent e) - { - textfield_keyPressed(e); - } - }); - + searchBox.getEditor().getEditorComponent() + .addKeyListener(new java.awt.event.KeyAdapter() + { + @Override + public void keyPressed(KeyEvent e) + { + textfield_keyPressed(e); + } + }); mainBorderLayout.setHgap(5); mainBorderLayout.setVgap(5); jPanel4.setLayout(borderLayout2); @@ -166,14 +165,13 @@ public class GFinder extends JPanel actionsPanel.add(findNext, null); actionsPanel.add(findAll, null); - actionsPanel.add(createNewGroup, null); + actionsPanel.add(createFeatures, null); this.add(jLabelFind, java.awt.BorderLayout.WEST); this.add(actionsPanel, java.awt.BorderLayout.EAST); this.add(jPanel2, java.awt.BorderLayout.SOUTH); this.add(jPanel3, java.awt.BorderLayout.NORTH); this.add(jPanel4, java.awt.BorderLayout.CENTER); - jPanel4.add(jScrollPane1, java.awt.BorderLayout.NORTH); - jScrollPane1.getViewport().add(textfield); + jPanel4.add(searchBox, java.awt.BorderLayout.NORTH); JPanel optionsPanel = new JPanel(); @@ -187,37 +185,41 @@ public class GFinder extends JPanel 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 createNewGroup_actionPerformed(ActionEvent e) + + public void createFeatures_actionPerformed() { } public void textfield_caretUpdate(CaretEvent e) { - if (textfield.getText().indexOf(">") > -1) + if (searchBox.getUserInput().indexOf(">") > -1) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - String str = textfield.getText(); + String str = searchBox.getUserInput(); AlignmentI al = null; try { @@ -232,10 +234,27 @@ public class GFinder extends JPanel jalview.util.Comparison.GapChars, al.getSequenceAt(0) .getSequenceAsString()); - textfield.setText(str); } } }); } } + + + + + + /** + * Returns unique key used for storing Finder cache items in the cache data + * structure + * + * @return + */ + public String getCacheKey() + { + return FINDER_CACHE_KEY; + } + + + }