From a311aa642834cd6ab459911301485308453a54ba Mon Sep 17 00:00:00 2001
From: Kevin Sawicki
Date: Wed, 7 Nov 2012 13:38:07 -0500
Subject: Bug 344220 - [CommonNavigator]
 NavigatorContentServiceDescriptionProvider doesn't handle single selection
 size case

---
 .../org/eclipse/ui/internal/navigator/CommonNavigatorMessages.java  | 3 +++
 .../navigator/NavigatorContentServiceDescriptionProvider.java       | 6 +++---
 .../src/org/eclipse/ui/internal/navigator/messages.properties       | 1 +
 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 ad062732ecb..09529662c05 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
@@ -58,6 +58,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 47555bf10e7..0ecfeee6faa 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 fcf5eeda619..349eeb3090d 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...
-- 
cgit v1.2.3