X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=537c323fa4b259f13ba80b6211bffe64245a2b30;hb=3d2750d886f1b6015b2fc3f8671a6cf3e32bb07a;hp=cad734b297d7ae1932e621f0f5251a09a9b21c31;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git
diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index cad734b..537c323 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -1,79 +1,140 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 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.gui;
-import java.util.*;
+import jalview.api.AlignViewportI;
+import jalview.api.FinderI;
+import jalview.datamodel.SearchResultMatchI;
+import jalview.datamodel.SearchResultsI;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
+import jalview.jbgui.GFinder;
+import jalview.util.MessageManager;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
-import jalview.datamodel.*;
-import jalview.jbgui.*;
+import javax.swing.AbstractAction;
+import javax.swing.JComponent;
+import javax.swing.JInternalFrame;
+import javax.swing.JLayeredPane;
+import javax.swing.KeyStroke;
+import javax.swing.event.InternalFrameAdapter;
+import javax.swing.event.InternalFrameEvent;
/**
- * DOCUMENT ME!
+ * Performs the menu option for searching the alignment, for the next or all
+ * matches. If matches are found, they are highlighted, and the user has the
+ * option to create a new feature on the alignment for the matched positions.
+ *
+ * Searches can be for a simple base sequence, or may use a regular expression.
+ * Any gaps are ignored.
*
* @author $author$
* @version $Revision$
*/
public class Finder extends GFinder
{
- AlignViewport av;
+ private static final int MIN_WIDTH = 350;
+
+ private static final int MIN_HEIGHT = 120;
- AlignmentPanel ap;
+ private static final int MY_HEIGHT = 150;
- JInternalFrame frame;
+ private static final int MY_WIDTH = 400;
- int seqIndex = 0;
+ private AlignViewportI av;
- int resIndex = 0;
+ private AlignmentPanel ap;
- SearchResults searchResults;
+ private JInternalFrame frame;
+
+ /*
+ * Finder agent per viewport searched
+ */
+ private Map finders;
+
+ private SearchResultsI searchResults;
/**
- * Creates a new Finder object.
+ * Constructor given an associated alignment panel. Constructs and displays an
+ * internal frame where the user can enter a search string.
*
- * @param av
- * DOCUMENT ME!
- * @param ap
- * DOCUMENT ME!
- * @param f
- * DOCUMENT ME!
+ * @param alignPanel
*/
- public Finder()
+ public Finder(AlignmentPanel alignPanel)
{
+ av = alignPanel.getAlignViewport();
+ ap = alignPanel;
+ finders = new HashMap<>();
frame = new JInternalFrame();
frame.setContentPane(this);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
- Desktop.addInternalFrame(frame, "Find", 340, 110);
+ frame.addInternalFrameListener(
+ new InternalFrameAdapter()
+ {
+ @Override
+ public void internalFrameClosing(InternalFrameEvent e)
+ {
+ closeAction();
+ }
+ });
+ addEscapeHandler();
- textfield.requestFocus();
+ Desktop.addInternalFrame(frame, MessageManager.getString("label.find"),
+ MY_WIDTH, MY_HEIGHT);
+ frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
+ searchBox.requestFocus();
}
/**
- * DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
+ * Add a handler for the Escape key when the window has focus
*/
- public void findNext_actionPerformed(ActionEvent e)
+ private void addEscapeHandler()
+ {
+ getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+ .put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Cancel");
+ getRootPane().getActionMap().put("Cancel", new AbstractAction()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ closeAction();
+ }
+ });
+ }
+
+ /**
+ * Performs the 'Find Next' action on the alignment panel with focus
+ */
+ @Override
+ public void findNext_actionPerformed()
{
if (getFocusedViewport())
{
@@ -82,58 +143,86 @@ public class Finder extends GFinder
}
/**
- * DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
+ * Performs the 'Find All' action on the alignment panel with focus
*/
- public void findAll_actionPerformed(ActionEvent e)
+ @Override
+ public void findAll_actionPerformed()
{
if (getFocusedViewport())
{
- resIndex = 0;
- seqIndex = 0;
doSearch(true);
}
}
+ /**
+ * if !focusfixed and not in a desktop environment, checks that av and ap are
+ * valid. Otherwise, gets the topmost alignment window and sets av and ap
+ * accordingly. Also sets the 'ignore hidden' checkbox disabled if the viewport
+ * has no hidden columns.
+ *
+ * @return false if no alignment window was found
+ */
boolean getFocusedViewport()
{
- JInternalFrame frame = Desktop.desktop.getAllFrames()[1];
-
- if (frame != null && frame instanceof AlignFrame)
+ if (Desktop.desktop == null)
+ {
+ if (ap != null && av != null)
+ {
+ return true;
+ }
+ // we aren't in a desktop environment, so give up now.
+ return false;
+ }
+ // now checks further down the window stack to fix bug
+ // https://mantis.lifesci.dundee.ac.uk/view.php?id=36008
+ JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+ for (int f = 0; f < frames.length; f++)
{
- av = ((AlignFrame) frame).viewport;
- ap = ((AlignFrame) frame).alignPanel;
- return true;
+ JInternalFrame alignFrame = frames[f];
+ if (alignFrame != null && alignFrame instanceof AlignFrame
+ && !alignFrame.isIcon())
+ {
+ av = ((AlignFrame) alignFrame).viewport;
+ ap = ((AlignFrame) alignFrame).alignPanel;
+ ignoreHidden.setEnabled(av.hasHiddenColumns());
+ return true;
+ }
}
return false;
}
/**
- * DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
+ * Opens a dialog that allows the user to create sequence features for the
+ * find match results.
*/
- public void createNewGroup_actionPerformed(ActionEvent e)
+ @Override
+ public void createFeatures_actionPerformed()
{
- SequenceI[] seqs = new SequenceI[searchResults.getSize()];
- SequenceFeature[] features = new SequenceFeature[searchResults
- .getSize()];
+ List seqs = new ArrayList<>();
+ List features = new ArrayList<>();
- for (int i = 0; i < searchResults.getSize(); i++)
- {
- seqs[i] = searchResults.getResultSequence(i).getDatasetSequence();
+ String searchString = searchBox.getEditor().getItem().toString().trim();
+ String desc = "Search Results";
- features[i] = new SequenceFeature(textfield.getText().trim(),
- "Search Results", null, searchResults.getResultStart(i),
- searchResults.getResultEnd(i), "Search Results");
+ /*
+ * assemble dataset sequences, and template new sequence features,
+ * for the amend features dialog
+ */
+ for (SearchResultMatchI match : searchResults.getResults())
+ {
+ seqs.add(match.getSequence().getDatasetSequence());
+ features.add(new SequenceFeature(searchString, desc,
+ match
+ .getStart(), match.getEnd(), desc));
}
- if (ap.seqPanel.seqCanvas.getFeatureRenderer().amendFeatures(seqs,
+ if (ap.getSeqPanel().seqCanvas.getFeatureRenderer().amendFeatures(seqs,
features, true, ap))
{
+ /*
+ * ensure feature display is turned on to show the new features,
+ * and remove them as highlighted regions
+ */
ap.alignFrame.showSeqFeatures.setSelected(true);
av.setShowSequenceFeatures(true);
ap.highlightSearchResults(null);
@@ -141,18 +230,18 @@ public class Finder extends GFinder
}
/**
- * DOCUMENT ME!
+ * Search the alignment for the next or all matches. If 'all matches', a
+ * dialog is shown with the number of sequence ids and subsequences matched.
*
- * @param findAll
- * DOCUMENT ME!
+ * @param doFindAll
*/
- void doSearch(boolean findAll)
+ void doSearch(boolean doFindAll)
{
- createNewGroup.setEnabled(false);
+ createFeatures.setEnabled(false);
- String searchString = textfield.getText().trim();
+ String searchString = searchBox.getUserInput().trim();
- if (searchString.length() < 1)
+ if (isInvalidSearchString(searchString))
{
return;
}
@@ -160,55 +249,144 @@ public class Finder extends GFinder
// other stuff
// TODO: add switches to control what is searched - sequences, IDS,
// descriptions, features
- jalview.analysis.Finder finder = new jalview.analysis.Finder(
- av.alignment, av.getSelectionGroup(), seqIndex, resIndex);
- finder.setCaseSensitive(caseSensitive.isSelected());
- finder.setFindAll(findAll);
-
- finder.find(searchString); // returns true if anything was actually found
-
- seqIndex = finder.getSeqIndex();
- resIndex = finder.getResIndex();
+ FinderI finder = finders.get(av);
+ if (finder == null)
+ {
+ /*
+ * first time we've searched this viewport
+ */
+ finder = new jalview.analysis.Finder(av);
+ finders.put(av, finder);
+ }
- searchResults = finder.getSearchResults(); // find(regex,
- // caseSensitive.isSelected(), )
- Vector idMatch = finder.getIdMatch();
- // set or reset the GUI
- if ((searchResults.getSize() == 0) && (idMatch.size() > 0))
+ boolean isCaseSensitive = caseSensitive.isSelected();
+ boolean doSearchDescription = searchDescription.isSelected();
+ boolean skipHidden = ignoreHidden.isSelected();
+ if (doFindAll)
+ {
+ finder.findAll(searchString, isCaseSensitive, doSearchDescription,
+ skipHidden);
+ }
+ else
{
- ap.idPanel.highlightSearchResults(idMatch);
+ finder.findNext(searchString, isCaseSensitive, doSearchDescription,
+ skipHidden);
}
- int resultSize = searchResults.getSize();
+ searchResults = finder.getSearchResults();
+ List idMatch = finder.getIdMatches();
+ ap.getIdPanel().highlightSearchResults(idMatch);
- if (searchResults.getSize() > 0)
+ if (searchResults.isEmpty())
{
- createNewGroup.setEnabled(true);
+ searchResults = null;
}
else
{
- searchResults = null;
+ createFeatures.setEnabled(true);
}
- // if allResults is null, this effectively switches displaySearch flag in
- // seqCanvas
ap.highlightSearchResults(searchResults);
// TODO: add enablers for 'SelectSequences' or 'SelectColumns' or
// 'SelectRegion' selection
- if (!findAll && resultSize == 0)
+ if (idMatch.isEmpty() && searchResults == null)
+ {
+ JvOptionPane.showInternalMessageDialog(this,
+ MessageManager.getString("label.finished_searching"), null,
+ JvOptionPane.INFORMATION_MESSAGE);
+ }
+ else
+ {
+ if (doFindAll)
+ {
+ // then we report the matches that were found
+ String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs"
+ : "";
+ if (searchResults != null)
+ {
+ if (idMatch.size() > 0 && searchResults.getCount() > 0)
+ {
+ message += " and ";
+ }
+ message += searchResults.getCount()
+ + " subsequence matches found.";
+ }
+ JvOptionPane.showInternalMessageDialog(this, message, null,
+ JvOptionPane.INFORMATION_MESSAGE);
+ }
+ }
+ searchBox.updateCache();
+ }
+
+ /**
+ * Displays an error dialog, and answers false, if the search string is
+ * invalid, else answers true.
+ *
+ * @param searchString
+ * @return
+ */
+ protected boolean isInvalidSearchString(String searchString)
+ {
+ String error = getSearchValidationError(searchString);
+ if (error == null)
+ {
+ return false;
+ }
+ JvOptionPane.showInternalMessageDialog(this, error,
+ MessageManager.getString("label.invalid_search"), // $NON-NLS-1$
+ JvOptionPane.ERROR_MESSAGE);
+ return true;
+ }
+
+ /**
+ * Returns an error message string if the search string is invalid, else
+ * returns null.
+ *
+ * Currently validation is limited to checking the string is not empty, and is
+ * a valid regular expression (simple searches for base sub-sequences will
+ * pass this test). Additional validations may be added in future if the
+ * search syntax is expanded.
+ *
+ * @param searchString
+ * @return
+ */
+ protected String getSearchValidationError(String searchString)
+ {
+ String error = null;
+ if (searchString == null || searchString.length() == 0)
{
- JOptionPane.showInternalMessageDialog(this, "Finished searching",
- null, JOptionPane.INFORMATION_MESSAGE);
- resIndex = 0;
- seqIndex = 0;
+ error = MessageManager.getString("label.invalid_search");
}
+ try
+ {
+ Pattern.compile(searchString);
+ } catch (PatternSyntaxException e)
+ {
+ error = MessageManager.getString("error.invalid_regex") + ": "
+ + e.getDescription();
+ }
+ return error;
+ }
- if (findAll)
+ protected void closeAction()
+ {
+ frame.setVisible(false);
+ frame.dispose();
+ searchBox.persistCache();
+ if (getFocusedViewport())
{
- String message = resultSize + " matches found.";
- JOptionPane.showInternalMessageDialog(this, message, null,
- JOptionPane.INFORMATION_MESSAGE);
+ ap.alignFrame.requestFocus();
}
+ }
+ @Override
+ protected void paintComponent(Graphics g)
+ {
+ /*
+ * enable 'hidden regions' option only if
+ * 'top' viewport has hidden columns
+ */
+ getFocusedViewport();
+ super.paintComponent(g);
}
}