X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=01c8a1653cb5f4be26edaa2e22d5ab7684ffaee3;hb=f4b2472c686ae3ca2e19147f468c761b3eef0529;hp=af23cebca24d510715f9c224e577600866f602fd;hpb=fee1b781ca14aadea5d112fc554fe14879c787c5;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index af23ceb..01c8a16 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; @@ -30,7 +32,10 @@ import jalview.viewmodel.AlignmentViewport; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; -import java.util.Vector; +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; @@ -38,8 +43,9 @@ import javax.swing.AbstractAction; import javax.swing.JComponent; import javax.swing.JInternalFrame; import javax.swing.JLayeredPane; -import javax.swing.JOptionPane; import javax.swing.KeyStroke; +import javax.swing.event.InternalFrameAdapter; +import javax.swing.event.InternalFrameEvent; /** * Performs the menu option for searching the alignment, for the next or all @@ -54,29 +60,39 @@ import javax.swing.KeyStroke; */ public class Finder extends GFinder { - private static final int HEIGHT = 110; + private static final int MIN_WIDTH = 350; - private static final int WIDTH = 340; + 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; - JInternalFrame frame; + private AlignViewportI av; - int seqIndex = 0; + private AlignmentPanel ap; - int resIndex = -1; + private JInternalFrame frame; - SearchResultsI searchResults; + /* + * Finder agent per viewport searched + */ + private Map finders; + + private 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; } /** @@ -90,15 +106,24 @@ 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 InternalFrameAdapter() + { + @Override + public void internalFrameClosing(InternalFrameEvent e) + { + closeAction(); + } + }); addEscapeHandler(); - Desktop.addInternalFrame(frame, MessageManager.getString("label.find"), - WIDTH, HEIGHT); - - textfield.requestFocus(); + Desktop.addInternalFrame(frame, MessageManager.getString("label.find"), + Desktop.FRAME_MAKE_VISIBLE, MY_WIDTH, MY_HEIGHT, Desktop.FRAME_ALLOW_RESIZE, Desktop.FRAME_ALLOW_ANY_SIZE); + searchBox.getComponent().requestFocus(); } /** @@ -106,34 +131,23 @@ 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 public void actionPerformed(ActionEvent e) { - escapeActionPerformed(); + closeAction(); } }); } /** - * Close the panel on Escape key press - */ - protected void escapeActionPerformed() - { - setVisible(false); - frame.dispose(); - } - - /** - * 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()) { @@ -142,27 +156,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 @@ -171,7 +176,7 @@ public class Finder extends GFinder */ boolean getFocusedViewport() { - if (focusfixed || Desktop.desktop == null) + if (focusfixed || Desktop.getDesktopPane() == null) { if (ap != null && av != null) { @@ -182,14 +187,15 @@ public class Finder extends GFinder } // 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(); + JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames(); for (int f = 0; f < frames.length; f++) { - JInternalFrame frame = frames[f]; - if (frame != null && frame instanceof AlignFrame) + JInternalFrame alignFrame = frames[f]; + if (alignFrame != null && alignFrame instanceof AlignFrame + && !alignFrame.isIcon()) { - av = ((AlignFrame) frame).viewport; - ap = ((AlignFrame) frame).alignPanel; + av = ((AlignFrame) alignFrame).viewport; + ap = ((AlignFrame) alignFrame).alignPanel; return true; } } @@ -197,49 +203,47 @@ public class Finder extends GFinder } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Opens a dialog that allows the user to create sequence features for the + * find match results */ @Override - public void createNewGroup_actionPerformed(ActionEvent e) + public void createFeatures_actionPerformed() { - SequenceI[] seqs = new SequenceI[searchResults.getSize()]; - SequenceFeature[] features = new SequenceFeature[searchResults - .getSize()]; - - int i = 0; - for (SearchResultMatchI match : searchResults.getResults()) + if (searchResults.isEmpty()) { - seqs[i] = match.getSequence().getDatasetSequence(); - - features[i] = new SequenceFeature(textfield.getText().trim(), - "Search Results", null, match.getStart(), match.getEnd(), - "Search Results"); - i++; + return; // shouldn't happen } + List seqs = new ArrayList<>(); + List features = new ArrayList<>(); + + String searchString = searchBox.getUserInput(); + String desc = "Search Results"; - if (ap.getSeqPanel().seqCanvas.getFeatureRenderer().amendFeatures(seqs, - features, true, ap)) + /* + * assemble dataset sequences, and template new sequence features, + * for the amend features dialog + */ + for (SearchResultMatchI match : searchResults.getResults()) { - ap.alignFrame.showSeqFeatures.setSelected(true); - av.setShowSequenceFeatures(true); - ap.highlightSearchResults(null); + seqs.add(match.getSequence().getDatasetSequence()); + features.add(new SequenceFeature(searchString, desc, match.getStart(), + match.getEnd(), desc)); } + + new FeatureEditor(ap, seqs, features, true).showDialog(); } /** * 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 + * @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(); if (isInvalidSearchString(searchString)) { @@ -249,63 +253,58 @@ 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(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(); - 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; - createNewGroup.setEnabled(true); + searchResults = null; } else { - searchResults = null; + createFeatures.setEnabled(true); } - // if allResults is null, this effectively switches displaySearch flag in - // seqCanvas + searchBox.updateCache(); + 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; + JvOptionPane.PLAIN_MESSAGE); } else { - if (findAll) + 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) @@ -316,12 +315,9 @@ public class Finder extends GFinder + " subsequence matches found."; } JvOptionPane.showInternalMessageDialog(this, message, null, - JvOptionPane.INFORMATION_MESSAGE); - resIndex = -1; - seqIndex = 0; + JvOptionPane.PLAIN_MESSAGE); } } - } /** @@ -373,4 +369,15 @@ public class Finder extends GFinder } return error; } + + protected void closeAction() + { + frame.setVisible(false); + frame.dispose(); + searchBox.persistCache(); + if (getFocusedViewport()) + { + ap.alignFrame.requestFocus(); + } + } }