X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=a4d7ad0a824713414d616d4203f9ecc726fe6f0e;hb=1ecfa789eb230ccd658a8f1c59304bca56af8124;hp=457d87145a75b7c5fc5add33de0a7148f11a4c43;hpb=f6e438356f6e08a940b2f7003f241706f4e4a968;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index 457d871..a4d7ad0 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -20,6 +20,8 @@ */ package jalview.gui; +import jalview.api.AlignViewportI; +import jalview.api.FinderI; import jalview.datamodel.SearchResultMatchI; import jalview.datamodel.SearchResultsI; import jalview.datamodel.SequenceFeature; @@ -32,8 +34,9 @@ import java.awt.Dimension; 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.Vector; +import java.util.Map; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -42,6 +45,7 @@ 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; /** @@ -57,33 +61,39 @@ import javax.swing.event.InternalFrameEvent; */ public class Finder extends GFinder { - private static final int MY_HEIGHT = 120; + private static final int MIN_WIDTH = 350; - private static final int MY_WIDTH = 400; + private static final int MIN_HEIGHT = 120; - AlignmentViewport av; + private static final int MY_HEIGHT = 120; - AlignmentPanel ap; + private static final int MY_WIDTH = 400; - private static final int MIN_WIDTH = 350; + private AlignViewportI av; - private static final int MIN_HEIGHT = 120; + private AlignmentPanel ap; - JInternalFrame frame; + private JInternalFrame frame; - int seqIndex = 0; + /* + * Finder agent per viewport searched + */ + private Map finders; - int resIndex = -1; + private SearchResultsI searchResults; - SearchResultsI searchResults; + /* + * true if we only search a given alignment view + */ + private boolean focusfixed; /** - * Creates a new Finder object with no associated viewport or panel. + * Creates a new Finder object with no associated viewport or panel. Each Find + * or Find Next action will act on whichever viewport has focus at the time. */ public Finder() { this(null, null); - focusfixed = false; } /** @@ -97,18 +107,20 @@ public class Finder extends GFinder { av = viewport; ap = alignPanel; - focusfixed = true; + finders = new HashMap<>(); + focusfixed = viewport != null; frame = new JInternalFrame(); frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); - frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() - { - @Override - public void internalFrameClosing(InternalFrameEvent e) - { - closeAction(); - } - }); + frame.addInternalFrameListener( + new InternalFrameAdapter() + { + @Override + public void internalFrameClosing(InternalFrameEvent e) + { + closeAction(); + } + }); addEscapeHandler(); Desktop.addInternalFrame(frame, MessageManager.getString("label.find"), MY_WIDTH, MY_HEIGHT); @@ -121,8 +133,8 @@ public class Finder extends GFinder */ private void addEscapeHandler() { - getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( - KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Cancel"); + getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) + .put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Cancel"); getRootPane().getActionMap().put("Cancel", new AbstractAction() { @Override @@ -133,14 +145,11 @@ public class Finder extends GFinder }); } - /** - * Performs the 'Find Next' action. - * - * @param e + * Performs the 'Find Next' action on the alignment panel with focus */ @Override - public void findNext_actionPerformed(ActionEvent e) + public void findNext_actionPerformed() { if (getFocusedViewport()) { @@ -149,27 +158,18 @@ public class Finder extends GFinder } /** - * Performs the 'Find All' action. - * - * @param e + * Performs the 'Find All' action on the alignment panel with focus */ @Override - public void findAll_actionPerformed(ActionEvent e) + public void findAll_actionPerformed() { if (getFocusedViewport()) { - resIndex = -1; - seqIndex = 0; doSearch(true); } } /** - * do we only search a given alignment view ? - */ - private boolean focusfixed; - - /** * 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 @@ -193,7 +193,8 @@ public class Finder extends GFinder for (int f = 0; f < frames.length; f++) { JInternalFrame alignFrame = frames[f]; - if (alignFrame != null && alignFrame instanceof AlignFrame) + if (alignFrame != null && alignFrame instanceof AlignFrame + && !alignFrame.isIcon()) { av = ((AlignFrame) alignFrame).viewport; ap = ((AlignFrame) alignFrame).alignPanel; @@ -210,8 +211,8 @@ public class Finder extends GFinder @Override public void createFeatures_actionPerformed() { - List seqs = new ArrayList(); - List features = new ArrayList(); + List seqs = new ArrayList<>(); + List features = new ArrayList<>(); String searchString = searchBox.getEditor().getItem().toString().trim(); String desc = "Search Results"; @@ -223,7 +224,8 @@ public class Finder extends GFinder for (SearchResultMatchI match : searchResults.getResults()) { seqs.add(match.getSequence().getDatasetSequence()); - features.add(new SequenceFeature(searchString, desc, null, match + features.add(new SequenceFeature(searchString, desc, + match .getStart(), match.getEnd(), desc)); } @@ -260,63 +262,56 @@ 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.getAlignment(), av.getSelectionGroup(), seqIndex, resIndex); - finder.setCaseSensitive(caseSensitive.isSelected()); - finder.setIncludeDescription(searchDescription.isSelected()); - - finder.setFindAll(doFindAll); - - 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(); - boolean haveResults = false; - // set or reset the GUI - if ((idMatch.size() > 0)) + boolean isCaseSensitive = caseSensitive.isSelected(); + boolean doSearchDescription = searchDescription.isSelected(); + if (doFindAll) { - haveResults = true; - ap.getIdPanel().highlightSearchResults(idMatch); + finder.findAll(searchString, isCaseSensitive, doSearchDescription); } else { - ap.getIdPanel().highlightSearchResults(null); + finder.findNext(searchString, isCaseSensitive, doSearchDescription); } - if (searchResults.getSize() > 0) + searchResults = finder.getSearchResults(); + List idMatch = finder.getIdMatches(); + ap.getIdPanel().highlightSearchResults(idMatch); + + if (searchResults.isEmpty()) { - haveResults = true; - createFeatures.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 (!haveResults) + if (idMatch.isEmpty() && searchResults == null) { JvOptionPane.showInternalMessageDialog(this, MessageManager.getString("label.finished_searching"), null, JvOptionPane.INFORMATION_MESSAGE); - resIndex = -1; - seqIndex = 0; } else { if (doFindAll) { // then we report the matches that were found - String message = (idMatch.size() > 0) ? "" + idMatch.size() - + " IDs" : ""; + String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs" + : ""; if (searchResults != null) { if (idMatch.size() > 0 && searchResults.getSize() > 0) @@ -328,8 +323,6 @@ public class Finder extends GFinder } JvOptionPane.showInternalMessageDialog(this, message, null, JvOptionPane.INFORMATION_MESSAGE); - resIndex = -1; - seqIndex = 0; } } searchBox.updateCache();