X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=f44387f0b0a1b7cd92de10abaf34c6f521d89d74;hb=ca87cef11606dd9b1ba66222cea87e000e556817;hp=f9962a6e3d9fb345171946358ab6b7b77ad7cc82;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git
diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
old mode 100755
new mode 100644
index f9962a6..f44387f
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -1,46 +1,89 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program 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.
+ * 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.
+ *
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import jalview.datamodel.*;
+import jalview.api.AlignViewportI;
+import jalview.datamodel.SearchResultMatchI;
+import jalview.datamodel.SearchResultsI;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
+
+import java.awt.Button;
+import java.awt.Checkbox;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.Rectangle;
+import java.awt.TextField;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
public class Finder extends Panel implements ActionListener
{
- AlignViewport av;
+ private AlignViewportI av;
+
+ private AlignmentPanel ap;
+
+ private TextField textfield = new TextField();
+
+ private Button findAll = new Button();
+
+ private Button findNext = new Button();
+
+ private Button createFeatures = new Button();
+
+ private Checkbox caseSensitive = new Checkbox();
+
+ private Checkbox searchDescription = new Checkbox();
- AlignmentPanel ap;
+ private SearchResultsI searchResults;
- Frame frame;
+ /*
+ * sequence index and residue position of last match,
+ * for current search and per viewport
+ */
+ private int seqIndex = 0;
- SearchResults searchResults;
+ private int resIndex = -1;
- int seqIndex = 0;
+ Map seqIndices;
- int resIndex = 0;
+ Map resIndices;
public Finder(final AlignmentPanel ap)
{
+ seqIndices = new HashMap<>();
+ resIndices = new HashMap<>();
+
try
{
jbInit();
@@ -52,12 +95,14 @@ public class Finder extends Panel implements ActionListener
this.av = ap.av;
this.ap = ap;
- frame = new Frame();
+ Frame frame = new Frame();
frame.add(this);
- jalview.bin.JalviewLite.addFrame(frame, "Find", 340, 120);
+ jalview.bin.JalviewLite.addFrame(frame,
+ MessageManager.getString("action.find"), 340, 120);
frame.repaint();
frame.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosing(WindowEvent evt)
{
ap.highlightSearchResults(null);
@@ -66,6 +111,7 @@ public class Finder extends Panel implements ActionListener
textfield.requestFocus();
}
+ @Override
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == textfield)
@@ -80,153 +126,180 @@ public class Finder extends Panel implements ActionListener
else if (evt.getSource() == findAll)
{
- resIndex = 0;
+ resIndex = -1;
seqIndex = 0;
doSearch(true);
}
- else if (evt.getSource() == createNewGroup)
+ else if (evt.getSource() == createFeatures)
{
- createNewGroup_actionPerformed();
+ createFeatures_actionPerformed();
}
}
- public void createNewGroup_actionPerformed()
+ public void createFeatures_actionPerformed()
{
- SequenceI[] seqs = new SequenceI[searchResults.getSize()];
- SequenceFeature[] features = new SequenceFeature[searchResults
- .getSize()];
+ List seqs = new ArrayList<>();
+ List features = new ArrayList<>();
+ String searchString = textfield.getText().trim();
- for (int i = 0; i < searchResults.getSize(); i++)
+ for (SearchResultMatchI match : searchResults.getResults())
{
- seqs[i] = searchResults.getResultSequence(i);
-
- features[i] = new SequenceFeature(textfield.getText().trim(),
- "Search Results", null, searchResults.getResultStart(i),
- searchResults.getResultEnd(i), "Search Results");
+ seqs.add(match.getSequence().getDatasetSequence());
+ features.add(new SequenceFeature(searchString, "Search Results",
+ match.getStart(), match.getEnd(), "Search Results"));
}
if (ap.seqPanel.seqCanvas.getFeatureRenderer().amendFeatures(seqs,
features, true, ap))
{
ap.alignFrame.sequenceFeatures.setState(true);
- av.showSequenceFeatures(true);
+ av.setShowSequenceFeatures(true);
ap.highlightSearchResults(null);
}
}
- void doSearch(boolean findAll)
+ void doSearch(boolean doFindAll)
{
- if (jalview.bin.JalviewLite.currentAlignFrame != null)
+ if (ap.av.applet.currentAlignFrame != null)
{
- ap = jalview.bin.JalviewLite.currentAlignFrame.alignPanel;
+ ap = ap.av.applet.currentAlignFrame.alignPanel;
av = ap.av;
+ seqIndex = 0;
+ resIndex = -1;
+ if (seqIndices.containsKey(av))
+ {
+ seqIndex = seqIndices.get(av).intValue();
+ }
+ if (resIndices.containsKey(av))
+ {
+ resIndex = resIndices.get(av).intValue();
+ }
}
- createNewGroup.setEnabled(false);
- jalview.analysis.Finder finder = new jalview.analysis.Finder(av
- .getAlignment(), av.getSelectionGroup(), seqIndex, resIndex);
+ createFeatures.setEnabled(false);
+ jalview.analysis.Finder finder = new jalview.analysis.Finder(
+ av.getAlignment(), av.getSelectionGroup(), seqIndex, resIndex);
finder.setCaseSensitive(caseSensitive.getState());
- finder.setFindAll(findAll);
+ finder.setIncludeDescription(searchDescription.getState());
+ finder.setFindAll(doFindAll);
String searchString = textfield.getText();
finder.find(searchString);
+
seqIndex = finder.getSeqIndex();
resIndex = finder.getResIndex();
+ seqIndices.put(av, seqIndex);
+ resIndices.put(av, resIndex);
searchResults = finder.getSearchResults();
- Vector idMatch = finder.getIdMatch();
- if (searchResults.getSize() == 0 && idMatch.size() > 0)
- {
- ap.idPanel.highlightSearchResults(idMatch);
- }
+ Vector idMatch = finder.getIdMatch();
+ ap.idPanel.highlightSearchResults(idMatch);
- if (searchResults.getSize() > 0)
+ if (searchResults.isEmpty())
{
- createNewGroup.setEnabled(true);
-
+ searchResults = null;
}
else
{
- searchResults = null;
- resIndex = 0;
- seqIndex = 0;
+ createFeatures.setEnabled(true);
}
// if allResults is null, this effectively switches displaySearch flag in
// seqCanvas
ap.highlightSearchResults(searchResults);
-
- if (findAll)
+ // TODO: add enablers for 'SelectSequences' or 'SelectColumns' or
+ // 'SelectRegion' selection
+ if (idMatch.isEmpty() && searchResults == null)
{
- String message = (searchResults == null ? 0 : searchResults.getSize())
- + " matches found.";
- ap.alignFrame.statusBar.setText("Search results: " + searchString
- + " : " + message);
+ ap.alignFrame.statusBar.setText(
+ MessageManager.getString("label.finished_searching"));
+ resIndex = -1;
+ seqIndex = 0;
}
+ else
+ {
+ if (doFindAll)
+ {
+ String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs"
+ : "";
+ if (idMatch.size() > 0 && searchResults != null
+ && searchResults.getSize() > 0)
+ {
+ message += " and ";
+ }
+ if (searchResults != null)
+ {
+ message += searchResults.getSize() + " subsequence matches.";
+ }
+ ap.alignFrame.statusBar.setText(MessageManager
+ .formatMessage("label.search_results", new String[]
+ { searchString, message }));
+ }
+ else
+ {
+ // TODO: indicate sequence and matching position in status bar
+ ap.alignFrame.statusBar.setText(MessageManager
+ .formatMessage("label.found_match_for", new String[]
+ { searchString }));
+ }
+ }
}
- Label jLabel1 = new Label();
-
- protected TextField textfield = new TextField();
-
- protected Button findAll = new Button();
-
- protected Button findNext = new Button();
-
- Panel jPanel1 = new Panel();
-
- GridLayout gridLayout1 = new GridLayout();
-
- protected Button createNewGroup = new Button();
-
- Checkbox caseSensitive = new Checkbox();
-
private void jbInit() throws Exception
{
+ Label jLabel1 = new Label(MessageManager.getString("action.find"));
jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));
- jLabel1.setText("Find");
jLabel1.setBounds(new Rectangle(3, 30, 34, 15));
this.setLayout(null);
textfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
textfield.setText("");
- textfield.setBounds(new Rectangle(40, 27, 133, 21));
+ textfield.setBounds(new Rectangle(40, 17, 133, 21));
textfield.addKeyListener(new java.awt.event.KeyAdapter()
{
+ @Override
public void keyTyped(KeyEvent e)
{
- textfield_keyTyped(e);
+ textfield_keyTyped();
}
});
textfield.addActionListener(this);
findAll.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- findAll.setLabel("Find all");
+ findAll.setLabel(MessageManager.getString("action.find_all"));
findAll.addActionListener(this);
findNext.setEnabled(false);
findNext.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- findNext.setLabel("Find Next");
+ findNext.setLabel(MessageManager.getString("action.find_next"));
findNext.addActionListener(this);
- jPanel1.setBounds(new Rectangle(180, 5, 141, 64));
- jPanel1.setLayout(gridLayout1);
+
+ Panel actionsPanel = new Panel();
+ actionsPanel.setBounds(new Rectangle(195, 5, 141, 64));
+ 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", Font.PLAIN, 10));
- createNewGroup.setLabel("New Feature");
- createNewGroup.addActionListener(this);
- caseSensitive.setLabel("Match Case");
- caseSensitive.setBounds(new Rectangle(40, 49, 126, 23));
- jPanel1.add(findNext, null);
- jPanel1.add(findAll, null);
- jPanel1.add(createNewGroup, null);
+ createFeatures.setEnabled(false);
+ createFeatures.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
+ createFeatures.setLabel(MessageManager.getString("label.new_feature"));
+ createFeatures.addActionListener(this);
+ caseSensitive.setLabel(MessageManager.getString("label.match_case"));
+ caseSensitive.setBounds(new Rectangle(30, 39, 126, 23));
+
+ searchDescription.setLabel(
+ MessageManager.getString("label.include_description"));
+ searchDescription.setBounds(new Rectangle(30, 59, 170, 23));
+ actionsPanel.add(findNext, null);
+ actionsPanel.add(findAll, null);
+ actionsPanel.add(createFeatures, null);
this.add(caseSensitive);
this.add(textfield, null);
this.add(jLabel1, null);
- this.add(jPanel1, null);
+ this.add(actionsPanel, null);
+ this.add(searchDescription);
}
- void textfield_keyTyped(KeyEvent e)
+ void textfield_keyTyped()
{
findNext.setEnabled(true);
}