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
JAL-2326 updated references of JOptionPane to JvOptionPane
[jalview.git]
/
src
/
jalview
/
gui
/
Finder.java
diff --git
a/src/jalview/gui/Finder.java
b/src/jalview/gui/Finder.java
index
1a7da1f
..
af23ceb
100755
(executable)
--- a/
src/jalview/gui/Finder.java
+++ b/
src/jalview/gui/Finder.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,7
+20,8
@@
*/
package jalview.gui;
*/
package jalview.gui;
-import jalview.datamodel.SearchResults;
+import jalview.datamodel.SearchResultMatchI;
+import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.jbgui.GFinder;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.jbgui.GFinder;
@@
-67,7
+68,7
@@
public class Finder extends GFinder
int resIndex = -1;
int resIndex = -1;
- SearchResults searchResults;
+ SearchResultsI searchResults;
/**
* Creates a new Finder object with no associated viewport or panel.
/**
* Creates a new Finder object with no associated viewport or panel.
@@
-109,6
+110,7
@@
public class Finder extends GFinder
KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Cancel");
getRootPane().getActionMap().put("Cancel", new AbstractAction()
{
KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Cancel");
getRootPane().getActionMap().put("Cancel", new AbstractAction()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
escapeActionPerformed();
public void actionPerformed(ActionEvent e)
{
escapeActionPerformed();
@@
-130,6
+132,7
@@
public class Finder extends GFinder
*
* @param e
*/
*
* @param e
*/
+ @Override
public void findNext_actionPerformed(ActionEvent e)
{
if (getFocusedViewport())
public void findNext_actionPerformed(ActionEvent e)
{
if (getFocusedViewport())
@@
-143,6
+146,7
@@
public class Finder extends GFinder
*
* @param e
*/
*
* @param e
*/
+ @Override
public void findAll_actionPerformed(ActionEvent e)
{
if (getFocusedViewport())
public void findAll_actionPerformed(ActionEvent e)
{
if (getFocusedViewport())
@@
-198,19
+202,22
@@
public class Finder extends GFinder
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
+ @Override
public void createNewGroup_actionPerformed(ActionEvent e)
{
SequenceI[] seqs = new SequenceI[searchResults.getSize()];
SequenceFeature[] features = new SequenceFeature[searchResults
.getSize()];
public void createNewGroup_actionPerformed(ActionEvent e)
{
SequenceI[] seqs = new SequenceI[searchResults.getSize()];
SequenceFeature[] features = new SequenceFeature[searchResults
.getSize()];
- for (int i = 0; i < searchResults.getSize(); i++)
+ int i = 0;
+ for (SearchResultMatchI match : searchResults.getResults())
{
{
- seqs[i] = searchResults.getResultSequence(i).getDatasetSequence();
+ seqs[i] = match.getSequence().getDatasetSequence();
features[i] = new SequenceFeature(textfield.getText().trim(),
features[i] = new SequenceFeature(textfield.getText().trim(),
- "Search Results", null, searchResults.getResultStart(i),
- searchResults.getResultEnd(i), "Search Results");
+ "Search Results", null, match.getStart(), match.getEnd(),
+ "Search Results");
+ i++;
}
if (ap.getSeqPanel().seqCanvas.getFeatureRenderer().amendFeatures(seqs,
}
if (ap.getSeqPanel().seqCanvas.getFeatureRenderer().amendFeatures(seqs,
@@
-256,7
+263,7
@@
public class Finder extends GFinder
searchResults = finder.getSearchResults(); // find(regex,
// caseSensitive.isSelected(), )
searchResults = finder.getSearchResults(); // find(regex,
// caseSensitive.isSelected(), )
- Vector idMatch = finder.getIdMatch();
+ Vector<SequenceI> idMatch = finder.getIdMatch();
boolean haveResults = false;
// set or reset the GUI
if ((idMatch.size() > 0))
boolean haveResults = false;
// set or reset the GUI
if ((idMatch.size() > 0))
@@
-286,9
+293,9
@@
public class Finder extends GFinder
// 'SelectRegion' selection
if (!haveResults)
{
// 'SelectRegion' selection
if (!haveResults)
{
- JOptionPane.showInternalMessageDialog(this,
+ JvOptionPane.showInternalMessageDialog(this,
MessageManager.getString("label.finished_searching"), null,
MessageManager.getString("label.finished_searching"), null,
- JOptionPane.INFORMATION_MESSAGE);
+ JvOptionPane.INFORMATION_MESSAGE);
resIndex = -1;
seqIndex = 0;
}
resIndex = -1;
seqIndex = 0;
}
@@
-308,8
+315,8
@@
public class Finder extends GFinder
message += searchResults.getSize()
+ " subsequence matches found.";
}
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;
}
resIndex = -1;
seqIndex = 0;
}
@@
-331,9
+338,9
@@
public class Finder extends GFinder
{
return false;
}
{
return false;
}
- JOptionPane.showInternalMessageDialog(this, error,
+ JvOptionPane.showInternalMessageDialog(this, error,
MessageManager.getString("label.invalid_search"), // $NON-NLS-1$
MessageManager.getString("label.invalid_search"), // $NON-NLS-1$
- JOptionPane.ERROR_MESSAGE);
+ JvOptionPane.ERROR_MESSAGE);
return true;
}
return true;
}