X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=b4335700d98f49697b1bb951c5efde4cec3c2553;hb=549cdd8bcac48cade7880c4a800d9c90b4d02632;hp=70606a1e33c3178719233b1faa7717566b8e715e;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index 70606a1..b433570 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -1,63 +1,66 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.jbgui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
-import jalview.datamodel.*;
-import jalview.io.*;
+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 java.awt.Dimension;
+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;
+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
{
- JLabel jLabel1 = new JLabel();
-
- protected JButton findAll = new JButton();
-
- protected JButton findNext = new JButton();
-
- JPanel jPanel1 = new JPanel();
-
- GridLayout gridLayout1 = new GridLayout();
-
- protected JButton createNewGroup = new JButton();
+ private static final java.awt.Font VERDANA_12 = new java.awt.Font("Verdana", 0,
+ 12);
- JScrollPane jScrollPane1 = new JScrollPane();
+ private static final String FINDER_CACHE_KEY = "CACHE.FINDER";
- protected JTextArea textfield = new JTextArea();
+ protected JButton createFeatures = new JButton();
- BorderLayout borderLayout1 = 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();
+
public GFinder()
{
try
@@ -71,128 +74,177 @@ public class GFinder extends JPanel
private void jbInit() throws Exception
{
- jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));
- jLabel1.setText("Find");
- this.setLayout(borderLayout1);
- findAll.setFont(new java.awt.Font("Verdana", 0, 12));
- findAll.setText("Find all");
+ BorderLayout mainBorderLayout = new BorderLayout();
+ this.setLayout(mainBorderLayout);
+ 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("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();
}
});
- jPanel1.setLayout(gridLayout1);
+
+ 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("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);
- }
- });
- 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);
- }
- });
- textfield.addKeyListener(new java.awt.event.KeyAdapter()
- {
- public void keyPressed(KeyEvent e)
- {
- textfield_keyPressed(e);
+ 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();
+ }
+ });
+ searchBox.getEditor().getEditorComponent()
+ .addKeyListener(new java.awt.event.KeyAdapter()
+ {
+ @Override
+ public void keyPressed(KeyEvent e)
+ {
+ textfield_keyPressed(e);
+ }
+ });
+
+ caseSensitive.setHorizontalAlignment(SwingConstants.LEFT);
+ caseSensitive.setText(MessageManager.getString("label.match_case"));
- borderLayout1.setHgap(5);
- borderLayout1.setVgap(5);
- jPanel4.setLayout(borderLayout2);
+ 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));
- caseSensitive.setHorizontalAlignment(SwingConstants.LEFT);
- caseSensitive.setText("Match Case");
- jPanel1.add(findNext, null);
- jPanel1.add(findAll, null);
- jPanel1.add(createNewGroup, null);
- this.add(jLabel1, java.awt.BorderLayout.WEST);
- this.add(jPanel1, java.awt.BorderLayout.EAST);
+ 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(jScrollPane1, java.awt.BorderLayout.CENTER);
- jScrollPane1.getViewport().add(textfield);
- jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH);
- jPanel4.add(caseSensitive, java.awt.BorderLayout.SOUTH);
- }
+ jPanel4.add(searchBox, java.awt.BorderLayout.NORTH);
- protected void findNext_actionPerformed(ActionEvent e)
- {
- }
+ JPanel optionsPanel = new JPanel();
- protected void findAll_actionPerformed(ActionEvent e)
- {
+ GridLayout optionsGridLayout = new GridLayout();
+ 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);
}
protected void textfield_keyPressed(KeyEvent e)
{
if (e.getKeyCode() == KeyEvent.VK_ENTER)
{
- e.consume();
- findNext_actionPerformed(null);
+ if (!searchBox.isPopupVisible())
+ {
+ e.consume();
+ findNext_actionPerformed();
+ }
}
}
- public void createNewGroup_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 (textfield.getText().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 = 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());
-
- textfield.setText(str);
+ 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;
+ }
+
}