X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=0da40cdaea98bc8f8674f00e681ff49e432a6989;hb=5efdb9bc69c081f0283a193f270f52cc01fe2cc2;hp=00b4fdc95ab943fa95a567a122da7058a3617987;hpb=51d6ad94bf0acf8c9d49dc2821e6b2067c711575;p=jalview.git diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index 00b4fdc..0da40cd 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -33,6 +33,7 @@ import java.awt.Font; import java.awt.GridLayout; import java.awt.Insets; import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -42,44 +43,23 @@ 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 { - JLabel jLabelFind = new JLabel(); + private static final java.awt.Font VERDANA_12 = new java.awt.Font("Verdana", 0, + 12); - protected JButton findAll = new JButton(); - - protected JButton findNext = new JButton(); - - JPanel actionsPanel = new JPanel(); - - GridLayout gridLayout1 = new GridLayout(); + private static final String FINDER_CACHE_KEY = "CACHE.FINDER"; protected JButton createFeatures = new JButton(); - protected JvCacheableInputBox searchBox = new JvCacheableInputBox(getCacheKey()); - - BorderLayout mainBorderLayout = new BorderLayout(); - - JPanel jPanel2 = new JPanel(); - - JPanel jPanel3 = new JPanel(); - - JPanel jPanel4 = new JPanel(); - - BorderLayout borderLayout2 = new BorderLayout(); - - JPanel jPanel6 = new JPanel(); + protected JvCacheableInputBox searchBox = new JvCacheableInputBox<>( + getCacheKey()); protected JCheckBox caseSensitive = new JCheckBox(); protected JCheckBox searchDescription = new JCheckBox(); - GridLayout optionsGridLayout = new GridLayout(); - - private static final String FINDER_CACHE_KEY = "CACHE.FINDER"; - public GFinder() { try @@ -93,35 +73,47 @@ public class GFinder extends JPanel private void jbInit() throws Exception { - jLabelFind.setFont(new java.awt.Font("Verdana", 0, 12)); - jLabelFind.setText(MessageManager.getString("label.find")); + BorderLayout mainBorderLayout = new BorderLayout(); this.setLayout(mainBorderLayout); - findAll.setFont(new java.awt.Font("Verdana", 0, 12)); - findAll.setText(MessageManager.getString("action.find_all")); + mainBorderLayout.setHgap(5); + mainBorderLayout.setVgap(5); + + JLabel jLabelFind = new JLabel(MessageManager.getString("label.find")); + jLabelFind.setFont(VERDANA_12); + + JButton findAll = new JButton( + MessageManager.getString("action.find_all")); + findAll.setFont(VERDANA_12); findAll.addActionListener(new java.awt.event.ActionListener() { @Override public void actionPerformed(ActionEvent e) { - findAll_actionPerformed(e); + findAll_actionPerformed(); } }); - findNext.setFont(new java.awt.Font("Verdana", 0, 12)); - findNext.setText(MessageManager.getString("action.find_next")); + + JButton findNext = new JButton( + MessageManager.getString("action.find_next")); + findNext.setFont(VERDANA_12); findNext.addActionListener(new java.awt.event.ActionListener() { @Override public void actionPerformed(ActionEvent e) { - findNext_actionPerformed(e); + findNext_actionPerformed(); } }); + + JPanel actionsPanel = new JPanel(); + GridLayout gridLayout1 = new GridLayout(); actionsPanel.setLayout(gridLayout1); gridLayout1.setHgap(0); gridLayout1.setRows(3); gridLayout1.setVgap(2); + createFeatures.setEnabled(false); - createFeatures.setFont(new java.awt.Font("Verdana", 0, 12)); + createFeatures.setFont(VERDANA_12); createFeatures.setMargin(new Insets(0, 0, 0, 0)); createFeatures.setText(MessageManager.getString("label.new_feature")); createFeatures.addActionListener(new java.awt.event.ActionListener() @@ -132,40 +124,51 @@ public class GFinder extends JPanel createFeatures_actionPerformed(); } }); - searchBox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12)); - ((JTextComponent) searchBox.getEditor().getEditorComponent()) - .addCaretListener(new CaretListener() - { - @Override - public void caretUpdate(CaretEvent e) - { - textfield_caretUpdate(e); - } - }); + searchBox.getComponent() + .setFont(new java.awt.Font("Verdana", Font.PLAIN, 12)); + searchBox.addCaretListener(new CaretListener() + { + @Override + public void caretUpdate(CaretEvent e) + { + textfield_caretUpdate(); + } + }); + searchBox.addKeyListener(new java.awt.event.KeyAdapter() + { + @Override + public void keyPressed(KeyEvent e) + { + textfield_keyPressed(e); + } + }); - mainBorderLayout.setHgap(5); - mainBorderLayout.setVgap(5); - jPanel4.setLayout(borderLayout2); - jPanel2.setPreferredSize(new Dimension(10, 1)); - jPanel3.setPreferredSize(new Dimension(10, 1)); caseSensitive.setHorizontalAlignment(SwingConstants.LEFT); caseSensitive.setText(MessageManager.getString("label.match_case")); - searchDescription.setText(MessageManager - .getString("label.include_description")); + searchDescription + .setText(MessageManager.getString("label.include_description")); actionsPanel.add(findNext, null); actionsPanel.add(findAll, null); actionsPanel.add(createFeatures, null); this.add(jLabelFind, java.awt.BorderLayout.WEST); this.add(actionsPanel, java.awt.BorderLayout.EAST); + + JPanel jPanel2 = new JPanel(); + jPanel2.setPreferredSize(new Dimension(10, 1)); + JPanel jPanel3 = new JPanel(); + jPanel3.setPreferredSize(new Dimension(10, 1)); + JPanel jPanel4 = new JPanel(); + jPanel4.setLayout(new BorderLayout()); this.add(jPanel2, java.awt.BorderLayout.SOUTH); this.add(jPanel3, java.awt.BorderLayout.NORTH); this.add(jPanel4, java.awt.BorderLayout.CENTER); - jPanel4.add(searchBox, java.awt.BorderLayout.NORTH); + jPanel4.add(searchBox.getComponent(), java.awt.BorderLayout.NORTH); JPanel optionsPanel = new JPanel(); + GridLayout optionsGridLayout = new GridLayout(); optionsGridLayout.setHgap(0); optionsGridLayout.setRows(2); optionsGridLayout.setVgap(2); @@ -176,22 +179,34 @@ 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(); + } + } } - protected void findAll_actionPerformed(ActionEvent e) + protected void findNext_actionPerformed() { } + protected void findAll_actionPerformed() + { + } public void createFeatures_actionPerformed() { } - public void textfield_caretUpdate(CaretEvent e) + public void textfield_caretUpdate() { - if (searchBox.getUserInput().indexOf(">") > -1) + // disabled as appears to be running a non-functional + if (false && searchBox.getUserInput().indexOf(">") > -1) { SwingUtilities.invokeLater(new Runnable() { @@ -210,19 +225,15 @@ public class GFinder extends JPanel if (al != null && al.getHeight() > 0) { str = jalview.analysis.AlignSeq.extractGaps( - jalview.util.Comparison.GapChars, al.getSequenceAt(0) - .getSequenceAsString()); - + jalview.util.Comparison.GapChars, + al.getSequenceAt(0).getSequenceAsString()); + // todo and what? set str as searchBox text? } } }); } } - - - - /** * Returns unique key used for storing Finder cache items in the cache data * structure @@ -234,6 +245,4 @@ public class GFinder extends JPanel return FINDER_CACHE_KEY; } - - }