X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=0da40cdaea98bc8f8674f00e681ff49e432a6989;hb=d55521c4db0fb537c343a28ce2294abf021eea3a;hp=76f75e17e4a39fbdfd6e82b4366234ed80887bfb;hpb=0ce95d9c8581b19c1d636f67f67dd670e41f1ca9;p=jalview.git diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index 76f75e1..0da40cd 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -24,8 +24,7 @@ import jalview.datamodel.AlignmentI; import jalview.io.DataSourceType; import jalview.io.FileFormat; import jalview.io.FormatAdapter; -import jalview.io.cache.AppCache; -import jalview.io.cache.Cacheable; +import jalview.io.cache.JvCacheableInputBox; import jalview.util.MessageManager; import java.awt.BorderLayout; @@ -38,53 +37,29 @@ import java.awt.event.KeyEvent; import javax.swing.JButton; import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; 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 implements Cacheable +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(); + private static final String FINDER_CACHE_KEY = "CACHE.FINDER"; - protected JButton findNext = new JButton(); + protected JButton createFeatures = new JButton(); - JPanel actionsPanel = new JPanel(); - - GridLayout gridLayout1 = new GridLayout(); - - protected JButton createNewGroup = new JButton(); - - - protected JComboBox searchBox = new JComboBox(); - - 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 = "FINDER_CACHE_KEY"; - public GFinder() { try @@ -98,91 +73,102 @@ public class GFinder extends JPanel implements Cacheable 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); - 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(VERDANA_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); - } - }); - searchBox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12)); - searchBox.setEditable(true); - searchBox -.setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - ((JTextComponent) searchBox.getEditor().getEditorComponent()) - .addCaretListener(new CaretListener() - { - @Override - public void caretUpdate(CaretEvent e) - { - textfield_caretUpdate(e); - } - }); - searchBox.getEditor().getEditorComponent() - .addKeyListener(new java.awt.event.KeyAdapter() - { - @Override - public void keyPressed(KeyEvent e) - { - textfield_keyPressed(e); + createFeatures_actionPerformed(); } }); + 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(createNewGroup, 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); @@ -191,41 +177,43 @@ public class GFinder extends JPanel implements Cacheable optionsPanel.add(searchDescription, null); jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST); - fireCache(); } - 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 textfield_keyPressed(KeyEvent e) + protected void findAll_actionPerformed() { - if (e.getKeyCode() == KeyEvent.VK_ENTER) - { - e.consume(); - findNext_actionPerformed(null); - fireCache(); - } } - public void createNewGroup_actionPerformed(ActionEvent e) + public void createFeatures_actionPerformed() { } - public void textfield_caretUpdate(CaretEvent e) + public void textfield_caretUpdate() { - if (searchBox.getEditor().getItem().toString().indexOf(">") > -1) + // disabled as appears to be running a non-functional + if (false && searchBox.getUserInput().indexOf(">") > -1) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - String str = searchBox.getEditor().getItem().toString(); + String str = searchBox.getUserInput(); AlignmentI al = null; try { @@ -237,43 +225,24 @@ public class GFinder extends JPanel implements Cacheable if (al != null && al.getHeight() > 0) { str = jalview.analysis.AlignSeq.extractGaps( - jalview.util.Comparison.GapChars, al.getSequenceAt(0) - .getSequenceAsString()); - - searchBox.setSelectedItem(str); + jalview.util.Comparison.GapChars, + al.getSequenceAt(0).getSequenceAsString()); + // todo and what? set str as searchBox text? } } }); } } - - protected void fireCache() - { - AppCache.getInstance().updateCache(this); - } - - @Override - public void init() - { - // TODO Auto-generated method stub - } - - @Override - public JComboBox getCacheComboBox() - { - return searchBox; - } - - @Override + /** + * Returns unique key used for storing Finder cache items in the cache data + * structure + * + * @return + */ public String getCacheKey() { return FINDER_CACHE_KEY; } - @Override - public JComponent getNextFocusableElement() - { - return this; - } }