X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=57beaeeafbc487bec199c0a6bfcccdf0ba882e90;hb=b7014049e421026d0f2d57179af9688472cd78f2;hp=c335b33d376309a76eef6dfad6318b9214817e2f;hpb=1ed483c88a51302e76fcba18f685497b6307f1b3;p=jalview.git diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index c335b33..57beaee 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -28,11 +28,11 @@ import jalview.io.cache.JvCacheableInputBox; import jalview.util.MessageManager; import java.awt.BorderLayout; -import java.awt.Dimension; import java.awt.Font; import java.awt.GridLayout; -import java.awt.Insets; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import javax.swing.JButton; @@ -47,39 +47,20 @@ import javax.swing.text.JTextComponent; public class GFinder extends JPanel { - JLabel jLabelFind = new JLabel(); + private static final java.awt.Font VERDANA_12 = new Font("Verdana", + Font.PLAIN, 12); - protected JButton findAll = new JButton(); - - protected JButton findNext = new JButton(); - - JPanel actionsPanel = new JPanel(); - - GridLayout gridLayout1 = new GridLayout(); - - 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(); + private static final String FINDER_CACHE_KEY = "CACHE.FINDER"; - JPanel jPanel6 = new JPanel(); + protected JButton createFeatures; - protected JCheckBox caseSensitive = new JCheckBox(); + protected JvCacheableInputBox searchBox; - protected JCheckBox searchDescription = new JCheckBox(); + protected JCheckBox caseSensitive; - GridLayout optionsGridLayout = new GridLayout(); + protected JCheckBox searchDescription; - private static final String FINDER_CACHE_KEY = "CACHE.FINDER"; + protected JCheckBox ignoreHidden; public GFinder() { @@ -92,40 +73,121 @@ public class GFinder extends JPanel } } + /** + * Constructs the widgets and adds them to the layout + */ private void jbInit() throws Exception { - jLabelFind.setFont(new java.awt.Font("Verdana", 0, 12)); - jLabelFind.setText(MessageManager.getString("label.find")); - this.setLayout(mainBorderLayout); - findAll.setFont(new java.awt.Font("Verdana", 0, 12)); - findAll.setText(MessageManager.getString("action.find_all")); - findAll.addActionListener(new java.awt.event.ActionListener() + /* + * border layout + * West: 4 rows + * first row 'Find' + * remaining rows empty + * Center: 4 rows + * first row search box + * second row 'match case' checkbox + * third row 'include description' checkbox + * fourth row 'ignore hidden' checkbox + * East: four rows + * first row 'find next' button + * second row 'find all' button + * third row 'new feature' button + * fourth row empty + */ + this.setLayout(new BorderLayout()); + JPanel eastPanel = new JPanel(); + eastPanel.setLayout(new GridLayout(4, 1)); + this.add(eastPanel, BorderLayout.EAST); + JPanel centrePanel = new JPanel(); + centrePanel.setLayout(new GridLayout(4, 1)); + this.add(centrePanel, BorderLayout.CENTER); + JPanel westPanel = new JPanel(); + westPanel.setLayout(new GridLayout(4, 1)); + this.add(westPanel, BorderLayout.WEST); + + /* + * 'Find' prompt goes top left + */ + JLabel findLabel = new JLabel( + " " + MessageManager.getString("label.find") + " "); + findLabel.setFont(VERDANA_12); + westPanel.add(findLabel); + + /* + * search box + */ + searchBox = new JvCacheableInputBox<>(FINDER_CACHE_KEY, 25); + searchBox.setFont(VERDANA_12); + ((JTextComponent) searchBox.getEditor().getEditorComponent()) + .addCaretListener(new CaretListener() + { + @Override + public void caretUpdate(CaretEvent e) + { + textfield_caretUpdate(); + } + }); + searchBox.getEditor().getEditorComponent() + .addKeyListener(new KeyAdapter() + { + @Override + public void keyPressed(KeyEvent e) + { + textfield_keyPressed(e); + } + }); + centrePanel.add(searchBox); + + /* + * search options checkboxes + */ + caseSensitive = new JCheckBox(); + caseSensitive.setHorizontalAlignment(SwingConstants.LEFT); + caseSensitive.setText(MessageManager.getString("label.match_case")); + + searchDescription = new JCheckBox(); + searchDescription + .setText(MessageManager.getString("label.include_description")); + + ignoreHidden = new JCheckBox(); + ignoreHidden.setText(MessageManager.getString("label.ignore_hidden")); + ignoreHidden.setToolTipText( + MessageManager.getString("label.ignore_hidden_tooltip")); + + centrePanel.add(caseSensitive); + centrePanel.add(searchDescription); + centrePanel.add(ignoreHidden); + + /* + * action buttons + */ + JButton findAll = new JButton( + MessageManager.getString("action.find_all")); + findAll.setFont(VERDANA_12); + findAll.addActionListener(new 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")); - findNext.addActionListener(new java.awt.event.ActionListener() + JButton findNext = new JButton( + MessageManager.getString("action.find_next")); + findNext.setFont(VERDANA_12); + findNext.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - findNext_actionPerformed(e); + findNext_actionPerformed(); } }); - actionsPanel.setLayout(gridLayout1); - gridLayout1.setHgap(0); - gridLayout1.setRows(3); - gridLayout1.setVgap(2); + createFeatures = new JButton(); createFeatures.setEnabled(false); - createFeatures.setFont(new java.awt.Font("Verdana", 0, 12)); - createFeatures.setMargin(new Insets(0, 0, 0, 0)); + createFeatures.setFont(VERDANA_12); createFeatures.setText(MessageManager.getString("label.new_feature")); - createFeatures.addActionListener(new java.awt.event.ActionListener() + createFeatures.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) @@ -133,56 +195,9 @@ 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.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); - 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")); - - 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); - 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); - - JPanel optionsPanel = new JPanel(); - - optionsGridLayout.setHgap(0); - optionsGridLayout.setRows(2); - optionsGridLayout.setVgap(2); - optionsPanel.setLayout(optionsGridLayout); - optionsPanel.add(caseSensitive, null); - optionsPanel.add(searchDescription, null); - - jPanel4.add(optionsPanel, java.awt.BorderLayout.WEST); + eastPanel.add(findNext); + eastPanel.add(findAll); + eastPanel.add(createFeatures); } protected void textfield_keyPressed(KeyEvent e) @@ -192,27 +207,27 @@ public class GFinder extends JPanel if (!searchBox.isPopupVisible()) { e.consume(); - findNext_actionPerformed(null); + findNext_actionPerformed(); } } } - protected void findNext_actionPerformed(ActionEvent e) + protected void findNext_actionPerformed() { } - protected void findAll_actionPerformed(ActionEvent e) + 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() { @@ -231,30 +246,13 @@ 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 - * - * @return - */ - public String getCacheKey() - { - return FINDER_CACHE_KEY; - } - - - }