diff options
| author | Dani Megert | 2001-09-25 14:52:55 +0000 |
|---|---|---|
| committer | Dani Megert | 2001-09-25 14:52:55 +0000 |
| commit | be878edcbdea97ee2b399c5c92731b94277690b6 (patch) | |
| tree | 98b9f1a4ae38da5bb5f00e6b3b522e756d32a577 | |
| parent | 8767a9a6dc222a78defeb84f5704b50616249e1c (diff) | |
| download | eclipse.platform.text-be878edcbdea97ee2b399c5c92731b94277690b6.tar.gz eclipse.platform.text-be878edcbdea97ee2b399c5c92731b94277690b6.tar.xz eclipse.platform.text-be878edcbdea97ee2b399c5c92731b94277690b6.zip | |
Review feedback incorporated
3 files changed, 27 insertions, 22 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties index 4a83df97d27..3bc863dcbbe 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties @@ -77,9 +77,9 @@ Search.Error.createSorter.message= An error occurred while creating a sorter Search.Error.incorrectIconLocation.title= Search Error
Search.Error.incorrectIconLocation.message= Invalid icon location
-SearchResultCollector.matches= matches
-SearchResultCollector.match= match
-SearchResultCollector.done= Search done
+SearchResultCollector.match= 1 match
+SearchResultCollector.matches= {0} matches
+SearchResultCollector.done= Search done: {0}
SearchPage.expression.label= Se&arch Expression
SearchPage.expression.pattern= (* = any string, ? = any character, \\ = escape for literals: * ? \\)
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchResultCollector.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchResultCollector.java index 9c6d72230d5..7823f871bc8 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchResultCollector.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchResultCollector.java @@ -4,6 +4,7 @@ */
package org.eclipse.search.internal.ui.text;
+import java.text.MessageFormat;
import java.util.HashMap;
import org.eclipse.core.resources.IMarker;
@@ -20,14 +21,16 @@ import org.eclipse.search.internal.ui.SearchMessages; public class TextSearchResultCollector implements ITextSearchResultCollector {
- private static final String SPACE_MATCH= " " + SearchMessages.getString("SearchResultCollector.match"); //$NON-NLS-2$ //$NON-NLS-1$
- private static final String SPACE_MATCHES= " " + SearchMessages.getString("SearchResultCollector.matches"); //$NON-NLS-2$ //$NON-NLS-1$
+ private static final String MATCH= SearchMessages.getString("SearchResultCollector.match"); //$NON-NLS-1$
+ private static final String MATCHES= SearchMessages.getString("SearchResultCollector.matches"); //$NON-NLS-1$
+ private static final String DONE= SearchMessages.getString("SearchResultCollector.done"); //$NON-NLS-1$
private IProgressMonitor fMonitor;
private ISearchResultView fView;
private TextSearchOperation fOperation;
private int fMatchCount= 0;
-
+ private Integer[] fMessageFormatArgs= new Integer[1];
+
/**
* Returns the progress monitor used to setup and report progress.
*/
@@ -73,16 +76,13 @@ public class TextSearchResultCollector implements ITextSearchResultCollector { String description= resource.getFullPath().lastSegment();
if (description == null)
description= ""; //$NON-NLS-1$
+
fView.addMatch(description, resource, resource, marker);
- fMatchCount= fMatchCount + 1;
- if (!getProgressMonitor().isCanceled()) {
- String text;
- if (fMatchCount == 1)
- text= fMatchCount + SPACE_MATCH;
- else
- text= fMatchCount + SPACE_MATCHES;
- getProgressMonitor().subTask(text);
- }
+
+ fMatchCount++;
+ if (!getProgressMonitor().isCanceled())
+ getProgressMonitor().subTask(getFormattedMatchesString(fMatchCount));
+
}
/**
@@ -90,13 +90,10 @@ public class TextSearchResultCollector implements ITextSearchResultCollector { */
public void done() {
if (!getProgressMonitor().isCanceled()) {
- String matchString;
- if (fMatchCount == 1)
- matchString= fMatchCount + SPACE_MATCH;
- else
- matchString= fMatchCount + SPACE_MATCHES;
- getProgressMonitor().setTaskName(SearchMessages.getString("SearchResultCollector.done") + ": " + matchString + " "); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
+ String matchesString= getFormattedMatchesString(fMatchCount);
+ getProgressMonitor().setTaskName(MessageFormat.format(DONE, new String[]{matchesString}));
}
+
if (fView != null)
fView.searchFinished();
@@ -108,4 +105,12 @@ public class TextSearchResultCollector implements ITextSearchResultCollector { void setOperation(TextSearchOperation operation) {
fOperation= operation;
}
+
+ private String getFormattedMatchesString(int count) {
+ if (fMatchCount == 1)
+ return MATCH;
+ fMessageFormatArgs[0]= new Integer(count);
+ return MessageFormat.format(MATCHES, fMessageFormatArgs);
+
+ }
}
\ No newline at end of file diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/MessageLine.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/MessageLine.java index a8eef604551..eb664f582b4 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/MessageLine.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/MessageLine.java @@ -91,7 +91,7 @@ public class MessageLine extends CLabel { * Sets the default error color used by all message lines.
* Note: a call to this method only affects newly created MessageLines not existing ones.
*/
- public static void setErrorColor(RGB color) {
+ public static void setDefaultErrorColor(RGB color) {
fgErrorRGB= color;
}
|