X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=f526592d9bc53fbef053d4e44336c75163734660;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=5d039a172b069e879a70dea9c134655dc3f33b3b;hpb=29c4cd117483f6bbeaab21a24c4a5811b7fcf915;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index 5d039a1..f526592 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import jalview.datamodel.SearchResultMatchI; import jalview.datamodel.SearchResultsI; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; @@ -27,8 +28,11 @@ import jalview.jbgui.GFinder; import jalview.util.MessageManager; import jalview.viewmodel.AlignmentViewport; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; +import java.util.ArrayList; +import java.util.List; import java.util.Vector; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -37,8 +41,8 @@ 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.InternalFrameEvent; /** * Performs the menu option for searching the alignment, for the next or all @@ -53,14 +57,18 @@ import javax.swing.KeyStroke; */ public class Finder extends GFinder { - private static final int HEIGHT = 110; + private static final int MY_HEIGHT = 120; - private static final int WIDTH = 340; + private static final int MY_WIDTH = 400; AlignmentViewport av; AlignmentPanel ap; + private static final int MIN_WIDTH = 350; + + private static final int MIN_HEIGHT = 120; + JInternalFrame frame; int seqIndex = 0; @@ -93,11 +101,20 @@ public class Finder extends GFinder 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(); + } + }); addEscapeHandler(); Desktop.addInternalFrame(frame, MessageManager.getString("label.find"), - WIDTH, HEIGHT); - - textfield.requestFocus(); + MY_WIDTH, MY_HEIGHT); + frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT)); + searchBox.requestFocus(); } /** @@ -105,28 +122,19 @@ 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 @@ -184,11 +192,11 @@ public class Finder extends GFinder JInternalFrame[] frames = Desktop.desktop.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) { - av = ((AlignFrame) frame).viewport; - ap = ((AlignFrame) frame).alignPanel; + av = ((AlignFrame) alignFrame).viewport; + ap = ((AlignFrame) alignFrame).alignPanel; return true; } } @@ -196,30 +204,36 @@ 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()]; + 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, null, + match.getStart(), match.getEnd(), desc)); } 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); @@ -230,13 +244,13 @@ public class Finder extends GFinder * 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().trim(); if (isInvalidSearchString(searchString)) { @@ -251,7 +265,7 @@ public class Finder extends GFinder finder.setCaseSensitive(caseSensitive.isSelected()); finder.setIncludeDescription(searchDescription.isSelected()); - finder.setFindAll(findAll); + finder.setFindAll(doFindAll); finder.find(searchString); // returns true if anything was actually found @@ -276,7 +290,7 @@ public class Finder extends GFinder if (searchResults.getSize() > 0) { haveResults = true; - createNewGroup.setEnabled(true); + createFeatures.setEnabled(true); } else { @@ -290,19 +304,19 @@ public class Finder extends GFinder // 'SelectRegion' selection if (!haveResults) { - JOptionPane.showInternalMessageDialog(this, + JvOptionPane.showInternalMessageDialog(this, MessageManager.getString("label.finished_searching"), null, - JOptionPane.INFORMATION_MESSAGE); + JvOptionPane.INFORMATION_MESSAGE); resIndex = -1; seqIndex = 0; } 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) @@ -312,13 +326,13 @@ public class Finder extends GFinder message += searchResults.getSize() + " subsequence matches found."; } - JOptionPane.showInternalMessageDialog(this, message, null, - JOptionPane.INFORMATION_MESSAGE); + JvOptionPane.showInternalMessageDialog(this, message, null, + JvOptionPane.INFORMATION_MESSAGE); resIndex = -1; seqIndex = 0; } } - + searchBox.updateCache(); } /** @@ -335,9 +349,9 @@ public class Finder extends GFinder { return false; } - JOptionPane.showInternalMessageDialog(this, error, + JvOptionPane.showInternalMessageDialog(this, error, MessageManager.getString("label.invalid_search"), // $NON-NLS-1$ - JOptionPane.ERROR_MESSAGE); + JvOptionPane.ERROR_MESSAGE); return true; } @@ -370,4 +384,15 @@ public class Finder extends GFinder } return error; } + + protected void closeAction() + { + frame.setVisible(false); + frame.dispose(); + searchBox.persistCache(); + if (getFocusedViewport()) + { + ap.alignFrame.requestFocus(); + } + } }