/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*/
package jalview.jbgui;
-import jalview.datamodel.Alignment;
+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;
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
{
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<String> searchBox = new JvCacheableInputBox<String>(
+ getCacheKey());
BorderLayout mainBorderLayout = new BorderLayout();
GridLayout optionsGridLayout = new GridLayout();
+ private static final String FINDER_CACHE_KEY = "CACHE.FINDER";
+
public GFinder()
{
try
}
}
-
private void jbInit() throws Exception
{
jLabelFind.setFont(new java.awt.Font("Verdana", 0, 12));
findAll.setText(MessageManager.getString("action.find_all"));
findAll.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
findAll_actionPerformed(e);
findNext.setText(MessageManager.getString("action.find_next"));
findNext.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
findNext_actionPerformed(e);
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);
- }
- });
- textfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12));
- textfield.setText("");
- textfield.setLineWrap(true);
- textfield.addCaretListener(new CaretListener()
- {
- public void caretUpdate(CaretEvent e)
- {
- textfield_caretUpdate(e);
+ createFeatures_actionPerformed();
}
});
- textfield.addKeyListener(new java.awt.event.KeyAdapter()
- {
- public void keyPressed(KeyEvent e)
- {
- textfield_keyPressed(e);
- }
- });
-
+ 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);
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);
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();
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();
- Alignment al = null;
+ String str = searchBox.getUserInput();
+ AlignmentI al = null;
try
{
- al = new FormatAdapter().readFile(str, "Paste", "FASTA");
+ al = new FormatAdapter().readFile(str, DataSourceType.PASTE,
+ FileFormat.Fasta);
} catch (Exception ex)
{
}
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());
- 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;
+ }
+
}
git://source.jalview.org / jalview.git / blobdiff