git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Java2Script/SwingJS 3.2.4.05
[jalview.git]
/
src
/
jalview
/
gui
/
Finder.java
diff --git
a/src/jalview/gui/Finder.java
b/src/jalview/gui/Finder.java
index
e44c956
..
2bad006
100755
(executable)
--- a/
src/jalview/gui/Finder.java
+++ b/
src/jalview/gui/Finder.java
@@
-28,9
+28,10
@@
import jalview.jbgui.GFinder;
import jalview.util.MessageManager;
import jalview.viewmodel.AlignmentViewport;
import jalview.util.MessageManager;
import jalview.viewmodel.AlignmentViewport;
-import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
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;
import java.util.Vector;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@
-40,6
+41,7
@@
import javax.swing.JComponent;
import javax.swing.JInternalFrame;
import javax.swing.JLayeredPane;
import javax.swing.KeyStroke;
import javax.swing.JInternalFrame;
import javax.swing.JLayeredPane;
import javax.swing.KeyStroke;
+import javax.swing.event.InternalFrameEvent;
/**
* Performs the menu option for searching the alignment, for the next or all
/**
* Performs the menu option for searching the alignment, for the next or all
@@
-54,9
+56,9
@@
import javax.swing.KeyStroke;
*/
public class Finder extends GFinder
{
*/
public class Finder extends GFinder
{
- private static final int HEIGHT = 120;
+ private static final int MY_HEIGHT = 120;
- private static final int WIDTH = 400;
+ private static final int MY_WIDTH = 400;
AlignmentViewport av;
AlignmentViewport av;
@@
-98,11
+100,19
@@
public class Finder extends GFinder
frame = new JInternalFrame();
frame.setContentPane(this);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
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"),
addEscapeHandler();
Desktop.addInternalFrame(frame, MessageManager.getString("label.find"),
- WIDTH, HEIGHT);
- frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
- textfield.requestFocus();
+ true, MY_WIDTH, MY_HEIGHT, true, true);
+ searchBox.getComponent().requestFocus();
}
/**
}
/**
@@
-110,28
+120,19
@@
public class Finder extends GFinder
*/
private void addEscapeHandler()
{
*/
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)
{
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.
*
* @param e
@@
-189,11
+190,11
@@
public class Finder extends GFinder
JInternalFrame[] frames = Desktop.desktop.getAllFrames();
for (int f = 0; f < frames.length; f++)
{
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;
}
}
return true;
}
}
@@
-201,49
+202,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
*/
@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<SequenceI> seqs = new ArrayList<SequenceI>();
+ List<SequenceFeature> features = new ArrayList<SequenceFeature>();
+
+ 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.
*
}
/**
* 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))
{
if (isInvalidSearchString(searchString))
{
@@
-258,7
+257,7
@@
public class Finder extends GFinder
finder.setCaseSensitive(caseSensitive.isSelected());
finder.setIncludeDescription(searchDescription.isSelected());
finder.setCaseSensitive(caseSensitive.isSelected());
finder.setIncludeDescription(searchDescription.isSelected());
- finder.setFindAll(findAll);
+ finder.setFindAll(doFindAll);
finder.find(searchString); // returns true if anything was actually found
finder.find(searchString); // returns true if anything was actually found
@@
-283,13
+282,15
@@
public class Finder extends GFinder
if (searchResults.getSize() > 0)
{
haveResults = true;
if (searchResults.getSize() > 0)
{
haveResults = true;
- createNewGroup.setEnabled(true);
+ createFeatures.setEnabled(true);
}
else
{
searchResults = null;
}
}
else
{
searchResults = null;
}
+ searchBox.updateCache();
+
// if allResults is null, this effectively switches displaySearch flag in
// seqCanvas
ap.highlightSearchResults(searchResults);
// if allResults is null, this effectively switches displaySearch flag in
// seqCanvas
ap.highlightSearchResults(searchResults);
@@
-297,19
+298,19
@@
public class Finder extends GFinder
// 'SelectRegion' selection
if (!haveResults)
{
// 'SelectRegion' selection
if (!haveResults)
{
- JvOptionPane.showInternalMessageDialog(this,
- MessageManager.getString("label.finished_searching"), null,
- JvOptionPane.INFORMATION_MESSAGE);
resIndex = -1;
seqIndex = 0;
resIndex = -1;
seqIndex = 0;
+ JvOptionPane.showInternalMessageDialog(this,
+ MessageManager.getString("label.finished_searching"), null,
+ JvOptionPane.PLAIN_MESSAGE);
}
else
{
}
else
{
- if (findAll)
+ if (doFindAll)
{
// then we report the matches that were found
{
// 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)
if (searchResults != null)
{
if (idMatch.size() > 0 && searchResults.getSize() > 0)
@@
-319,13
+320,12
@@
public class Finder extends GFinder
message += searchResults.getSize()
+ " subsequence matches found.";
}
message += searchResults.getSize()
+ " subsequence matches found.";
}
- JvOptionPane.showInternalMessageDialog(this, message, null,
- JvOptionPane.INFORMATION_MESSAGE);
resIndex = -1;
seqIndex = 0;
resIndex = -1;
seqIndex = 0;
+ JvOptionPane.showInternalMessageDialog(this, message, null,
+ JvOptionPane.PLAIN_MESSAGE);
}
}
}
}
-
}
/**
}
/**
@@
-377,4
+377,15
@@
public class Finder extends GFinder
}
return error;
}
}
return error;
}
+
+ protected void closeAction()
+ {
+ frame.setVisible(false);
+ frame.dispose();
+ searchBox.persistCache();
+ if (getFocusedViewport())
+ {
+ ap.alignFrame.requestFocus();
+ }
+ }
}
}