X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=af1760f26dd04fe1d3ca9927df2c074259aa7e4a;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=ee1a4ffd5b2f3d24db0cb7fe19026af5e02185ec;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index ee1a4ff..af1760f 100755
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -1,39 +1,57 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 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.FormatAdapter;
+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.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
public class GFinder extends JPanel
{
- JLabel jLabel1 = new JLabel();
+ JLabel jLabelFind = new JLabel();
protected JButton findAll = new JButton();
protected JButton findNext = new JButton();
- JPanel jPanel1 = new JPanel();
+ JPanel actionsPanel = new JPanel();
GridLayout gridLayout1 = new GridLayout();
@@ -43,7 +61,7 @@ public class GFinder extends JPanel
protected JTextArea textfield = new JTextArea();
- BorderLayout borderLayout1 = new BorderLayout();
+ BorderLayout mainBorderLayout = new BorderLayout();
JPanel jPanel2 = new JPanel();
@@ -57,6 +75,10 @@ public class GFinder extends JPanel
protected JCheckBox caseSensitive = new JCheckBox();
+ protected JCheckBox searchDescription = new JCheckBox();
+
+ GridLayout optionsGridLayout = new GridLayout();
+
public GFinder()
{
try
@@ -70,11 +92,11 @@ 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);
+ 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("Find all");
+ findAll.setText(MessageManager.getString("action.find_all"));
findAll.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -83,7 +105,7 @@ public class GFinder extends JPanel
}
});
findNext.setFont(new java.awt.Font("Verdana", 0, 12));
- findNext.setText("Find Next");
+ findNext.setText(MessageManager.getString("action.find_next"));
findNext.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -91,14 +113,14 @@ public class GFinder extends JPanel
findNext_actionPerformed(e);
}
});
- jPanel1.setLayout(gridLayout1);
+ 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.setText(MessageManager.getString("label.new_feature"));
createNewGroup.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -124,25 +146,38 @@ public class GFinder extends JPanel
}
});
- borderLayout1.setHgap(5);
- borderLayout1.setVgap(5);
+ 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("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);
+ caseSensitive.setText(MessageManager.getString("label.match_case"));
+
+ searchDescription.setText(MessageManager
+ .getString("label.include_description"));
+
+ actionsPanel.add(findNext, null);
+ actionsPanel.add(findAll, null);
+ actionsPanel.add(createNewGroup, 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.CENTER);
+ jPanel4.add(jScrollPane1, java.awt.BorderLayout.NORTH);
jScrollPane1.getViewport().add(textfield);
- jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH);
- jPanel4.add(caseSensitive, java.awt.BorderLayout.SOUTH);
+
+ 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);
}
protected void findNext_actionPerformed(ActionEvent e)
@@ -175,7 +210,7 @@ public class GFinder extends JPanel
public void run()
{
String str = textfield.getText();
- Alignment al = null;
+ AlignmentI al = null;
try
{
al = new FormatAdapter().readFile(str, "Paste", "FASTA");