NLSed strings and added a name field to scope manager

6 files changed, 33 insertions, 8 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java
index 10f6a5a8c..3bab735cf 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java
@@ -71,6 +71,7 @@ public class SynchronizationScopeManager implements ISynchronizationScopeManager
 	private ISynchronizationScope scope;
 	private boolean initialized;
 	private ScopeManagerEventHandler handler;
+	private final String name;
 
 	/**
 	 * Convenience method for obtaining the set of resource
@@ -117,7 +118,8 @@ public class SynchronizationScopeManager implements ISynchronizationScopeManager
 	 * @param resourceMappingContext a resource mapping context
 	 * @param consultModels whether modle providers should be consulted
 	 */
-	public SynchronizationScopeManager(ResourceMapping[] inputMappings, ResourceMappingContext resourceMappingContext, boolean consultModels) {
+	public SynchronizationScopeManager(String name, ResourceMapping[] inputMappings, ResourceMappingContext resourceMappingContext, boolean consultModels) {
+		this.name = name;
 		this.context = resourceMappingContext;
 		this.consultModels = consultModels;
 		scope = createScope(inputMappings);
@@ -460,4 +462,13 @@ public class SynchronizationScopeManager implements ISynchronizationScopeManager
 			handler = new ScopeManagerEventHandler(this);
 		return handler;
 	}
+
+	/**
+	 * Returns the human readable name of this manager.  The name is never 
+	 * <code>null</code>.
+	 * @return the name associated with this scope manager
+	 */
+	public String getName() {
+		return name;
+	}
 }
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberScopeManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberScopeManager.java
index e7717e7b6..3a80ad647 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberScopeManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberScopeManager.java
@@ -41,8 +41,8 @@ public class SubscriberScopeManager extends SynchronizationScopeManager implemen
 	 * @param subscriber the subscriber
 	 * @param consultModels whether models should be consulted when calculating the scope
 	 */
-	public SubscriberScopeManager(ResourceMapping[] inputMappings, Subscriber subscriber, boolean consultModels) {
-		this(inputMappings, subscriber, SubscriberResourceMappingContext.createContext(subscriber), consultModels);
+	public SubscriberScopeManager(String name, ResourceMapping[] inputMappings, Subscriber subscriber, boolean consultModels) {
+		this(name, inputMappings, subscriber, SubscriberResourceMappingContext.createContext(subscriber), consultModels);
 	}
 
 	/**
@@ -52,8 +52,8 @@ public class SubscriberScopeManager extends SynchronizationScopeManager implemen
 	 * @param context a remote resource mapping conext for the subscriber
 	 * @param consultModels whether models should be consulted when calculating the scope
 	 */
-	public SubscriberScopeManager(ResourceMapping[] inputMappings, Subscriber subscriber, RemoteResourceMappingContext context, boolean consultModels) {
-		super(inputMappings, context, consultModels);
+	public SubscriberScopeManager(String name, ResourceMapping[] inputMappings, Subscriber subscriber, RemoteResourceMappingContext context, boolean consultModels) {
+		super(name, inputMappings, context, consultModels);
 		this.subscriber = subscriber;
 	}
 
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
index 75caae7ca..61088add7 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
@@ -102,4 +102,12 @@ public class Messages extends NLS {
 	public static String DelegatingStorageMerger_0;
 
 	public static String DelegatingStorageMerger_1;
+
+	public static String WorkspaceSubscriber_0;
+
+	public static String WorkspaceSubscriber_1;
+
+	public static String ScopeManagerEventHandler_0;
+
+	public static String ScopeManagerEventHandler_1;
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java
index 1853e4e4f..059fabddf 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java
@@ -16,10 +16,12 @@ import java.util.Set;
 import org.eclipse.core.resources.mapping.ResourceMapping;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.mapping.ISynchronizationScopeManager;
 import org.eclipse.team.core.mapping.provider.SynchronizationScopeManager;
 import org.eclipse.team.internal.core.BackgroundEventHandler;
+import org.eclipse.team.internal.core.Messages;
 
 public class ScopeManagerEventHandler extends BackgroundEventHandler {
 
@@ -36,7 +38,7 @@ public class ScopeManagerEventHandler extends BackgroundEventHandler {
 	}
 
 	public ScopeManagerEventHandler(SynchronizationScopeManager manager) {
-		super("Reconciling Scope", "Error occurred reconsiling the scope");
+		super(NLS.bind(Messages.ScopeManagerEventHandler_0, manager.getName()), NLS.bind(Messages.ScopeManagerEventHandler_1, manager.getName()));
 		this.manager = manager;
 	}
 
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/WorkspaceSubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/WorkspaceSubscriber.java
index e97332521..7c1530814 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/WorkspaceSubscriber.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/WorkspaceSubscriber.java
@@ -79,7 +79,7 @@ public class WorkspaceSubscriber extends Subscriber implements ISubscriberChange
 	 * @see org.eclipse.team.core.subscribers.Subscriber#getName()
 	 */
 	public String getName() {
-		return "Workspace";
+		return Messages.WorkspaceSubscriber_0;
 	}
 
 	/* (non-Javadoc)
@@ -288,7 +288,7 @@ public class WorkspaceSubscriber extends Subscriber implements ISubscriberChange
 			return;
 		if (exceptions.length == 1)
 			throw exceptions[0];
-		MultiStatus result = new MultiStatus(TeamPlugin.ID, 0, "Mulitple errors occurred", null);
+		MultiStatus result = new MultiStatus(TeamPlugin.ID, 0, Messages.WorkspaceSubscriber_1, null);
 		for (int i = 0; i < exceptions.length; i++) {
 			CoreException exception = exceptions[i];
 			IStatus status = new Status(
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
index e62bf0c8f..fc61fa657 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
@@ -90,3 +90,7 @@ DelegatingStorageMerger_1=An error occurred reading while reading from {0}
 LocalFileRevision_currentVersion=*({0})
 LocalFileRevision_currentVersionTag=<current version>
 LocalFileRevision_localRevisionTag=<local revision>
+WorkspaceSubscriber_0=Workspace
+WorkspaceSubscriber_1=Mulitple errors occurred
+ScopeManagerEventHandler_0=Refreshing {0}
+ScopeManagerEventHandler_1=Errors occurred while refreshing {0}