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
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
[jalview.git]
/
src
/
jalview
/
gui
/
Finder.java
diff --git
a/src/jalview/gui/Finder.java
b/src/jalview/gui/Finder.java
index
5d039a1
..
af23ceb
100755
(executable)
--- a/
src/jalview/gui/Finder.java
+++ b/
src/jalview/gui/Finder.java
@@
-20,6
+20,7
@@
*/
package jalview.gui;
*/
package jalview.gui;
+import jalview.datamodel.SearchResultMatchI;
import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
@@
-208,13
+209,15
@@
public class Finder extends GFinder
SequenceFeature[] features = new SequenceFeature[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,
@@
-290,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;
}
@@
-312,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;
}
@@
-335,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;
}