aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Sawicki2012-11-07 13:38:07 (EST)
committerPaul Webster2012-11-07 13:38:07 (EST)
commita311aa642834cd6ab459911301485308453a54ba (patch)
tree1e892864b720bb6d2275e3b768b47b0293960c2c
parent807a045354f5489860672cf668618d44a88fa5b8 (diff)
downloadeclipse.platform.ui-a311aa642834cd6ab459911301485308453a54ba.zip
eclipse.platform.ui-a311aa642834cd6ab459911301485308453a54ba.tar.gz
eclipse.platform.ui-a311aa642834cd6ab459911301485308453a54ba.tar.bz2
Bug 344220 - [CommonNavigator]v20121107-183807
NavigatorContentServiceDescriptionProvider doesn't handle single selection size case
-rw-r--r--bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorMessages.java3
-rw-r--r--bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java6
-rw-r--r--bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/messages.properties1
3 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorMessages.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorMessages.java
index ad06273..0952966 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorMessages.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorMessages.java
@@ -59,6 +59,9 @@ public class CommonNavigatorMessages extends NLS {
public static String Navigator_statusLineMultiSelect;
/** */
+ public static String Navigator_statusLineSingleSelect;
+
+ /** */
public static String SelectFiltersActionDelegate_1;
/** */
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java
index 47555bf..0ecfeee 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceDescriptionProvider.java
@@ -73,11 +73,11 @@ public final class NavigatorContentServiceDescriptionProvider implements
/**
* @param aSize
* The number of items selected.
- * @return A string of the form "# items selected"
+ * @return A string of the form "# item(s) selected"
*/
protected final String getDefaultStatusBarMessage(int aSize) {
- return NLS.bind(
- CommonNavigatorMessages.Navigator_statusLineMultiSelect,
+ return NLS.bind(aSize != 1 ? CommonNavigatorMessages.Navigator_statusLineMultiSelect
+ : CommonNavigatorMessages.Navigator_statusLineSingleSelect,
new Object[] { new Integer(aSize) });
}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/messages.properties b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/messages.properties
index fcf5eed..349eeb3 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/messages.properties
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/messages.properties
@@ -18,6 +18,7 @@ Exception_Invoking_Extension=An exception occurred invoking extension\: {0} for
NewProjectWizard_errorTitle=New Project Problems
Link_With_Editor_Job_=Linking viewer selection with current editor
Navigator_statusLineMultiSelect={0} items selected
+Navigator_statusLineSingleSelect=1 item selected
SelectFiltersActionDelegate_1=Select and deselect filters to apply to the content in the tree
CommonFilterSelectionDialog_Select_the_available_extensions=Select the available extensions to show (unchecked extensions will not display content)\:
SelectFiltersActionDelegate_0=&Customize View...