*** empty log message ***

4 files changed, 18 insertions, 11 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/RemoteContentsCacheEntry.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/RemoteContentsCacheEntry.java
index 2204e6090..d34568898 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/RemoteContentsCacheEntry.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/RemoteContentsCacheEntry.java
@@ -108,7 +108,7 @@ public class RemoteContentsCacheEntry {
 	private void internalSetContents(InputStream stream, IProgressMonitor monitor) throws TeamException {
 		// if the state is DISPOSED then there is a problem
 		if (state == DISPOSED) {
-			throw new TeamException("Cache entry in {0} for {1} has been disposed" + cache.getName() + id);
+			throw new TeamException(Policy.bind("RemoteContentsCacheEntry.3", cache.getName(), id)); //$NON-NLS-1$
 		}
 		// Otherwise, the state is UNINITIALIZED or READY so we can proceed
 		registerHit();
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
index d5718370a..f2a509fb5 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
@@ -58,7 +58,7 @@ public abstract class SynchronizationCacheRefreshOperation {
 				return new IResource[0];
 			}
 			
-			monitor.setTaskName(Policy.bind("RemoteTagSynchronizer.0", resource.getFullPath().makeRelative().toString()));
+			monitor.setTaskName(Policy.bind("RemoteTagSynchronizer.0", resource.getFullPath().makeRelative().toString())); //$NON-NLS-1$
 			
 			// build the remote tree only if an initial tree hasn't been provided
 			ISubscriberResource	tree = getRemoteTree(resource, depth, cacheFileContentsHint, Policy.subMonitorFor(monitor, 70));
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DeploymentProviderManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DeploymentProviderManager.java
index c59fa7e38..018c8a860 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DeploymentProviderManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DeploymentProviderManager.java
@@ -19,12 +19,12 @@ import org.eclipse.core.runtime.jobs.ILock;
 import org.eclipse.team.core.*;
 import org.eclipse.team.internal.core.registry.DeploymentProviderDescriptor;
 import org.eclipse.team.internal.core.registry.DeploymentProviderRegistry;
+import org.eclipse.team.internal.core.Policy;
 
 public class DeploymentProviderManager implements IDeploymentProviderManager, IResourceChangeListener  {
 	
 	// key for remembering if state has been loaded for a project
-	private static final QualifiedName WRITE_TIMESTAMP = new QualifiedName(TeamPlugin.ID, "writetime"); //$NON-NLS-1$
-	private final static QualifiedName STATE_LOADED_KEY = new QualifiedName("org.eclipse.team.core.deployment", "state_restored_key");
+	private final static QualifiedName STATE_LOADED_KEY = new QualifiedName("org.eclipse.team.core.deployment", "state_restored_key"); //$NON-NLS-1$ //$NON-NLS-2$
 	
 	// {project -> list of Mapping}
 	private Map mappings = new HashMap(5);
@@ -96,7 +96,7 @@ public class DeploymentProviderManager implements IDeploymentProviderManager, IR
 			// extension point descriptor must exist
 			DeploymentProviderDescriptor descriptor = registry.find(deploymentProvider.getID());		
 			if(descriptor == null) {
-				throw new TeamException("Cannot map provider " + deploymentProvider.getID() + ". It's extension point description cannot be found.");
+				throw new TeamException(Policy.bind("DeploymentProviderManager.10", deploymentProvider.getID())); //$NON-NLS-1$
 			}
 			
 			// create the new mapping
@@ -179,7 +179,7 @@ public class DeploymentProviderManager implements IDeploymentProviderManager, IR
 		// was loaded from a repository or modified manually
 		if (providers.length > 1 && !providers[0].isMultipleMappingsSupported()) {
 			// Log and ignore all but one of the mappings
-			TeamPlugin.log(IStatus.WARNING, "Resource {0} is mapped to multiple deployment providers of type {1}." +resource +id, null);
+			TeamPlugin.log(IStatus.WARNING, Policy.bind("DeploymentProviderManager.12", resource.getFullPath().toString(), id), null); //$NON-NLS-1$
 			return new DeploymentProvider[] { providers[0] };
 		}
 		return providers;
@@ -198,7 +198,7 @@ public class DeploymentProviderManager implements IDeploymentProviderManager, IR
 				String first = m.getContainer().getFullPath().toString();
 				if(fullPath.startsWith(first) || first.startsWith(fullPath)) {
 					if (m.getDescription().getId().equals(id)) {
-						throw new TeamException(container.getFullPath().toString() + " is already mapped to " + m.getDescription().getId());
+						throw new TeamException(Policy.bind("DeploymentProviderManager.13", container.getFullPath().toString(), m.getDescription().getId())); //$NON-NLS-1$
 					}
 				}
 			}
@@ -239,7 +239,7 @@ public class DeploymentProviderManager implements IDeploymentProviderManager, IR
 					internalMap(mapping.getContainer(), mapping);
 				}
 				
-				project.setSessionProperty(STATE_LOADED_KEY, "true");
+				project.setSessionProperty(STATE_LOADED_KEY, new Object());
 			} catch (TeamException e) {
 			} catch (CoreException e) {
 			}		
@@ -294,7 +294,7 @@ public class DeploymentProviderManager implements IDeploymentProviderManager, IR
 				}
 			}
 		} catch (IOException e) {
-			throw new TeamException("An I/O error occurred while persisting the deployment configurations for project {0}." + project.getName(), e);
+			throw new TeamException(Policy.bind("DeploymentProviderManager.15", project.getName()), e); //$NON-NLS-1$
 		} catch(CoreException ce) {
 			throw TeamException.asTeamException(ce);
 		}
@@ -342,11 +342,11 @@ public class DeploymentProviderManager implements IDeploymentProviderManager, IR
 				IPath location = new Path(memento2.getString(CTX_PATH));
 				
 				if(! project.exists(location)) {
-					TeamPlugin.log(IStatus.ERROR, "Previously deployed folder {0} in project {1} no longer exists." + location + project.getName(), null);
+					TeamPlugin.log(IStatus.ERROR, Policy.bind("DeploymentProviderManager.16", location.toString(), project.getName()), null); //$NON-NLS-1$
 				}
 				IResource resource = location.isEmpty() ? (IContainer)project : project.findMember(location);
 				if (resource.getType() == IResource.FILE) {
-					TeamPlugin.log(IStatus.ERROR, "Previously deployed resource {0} in project {1} is now a file and cannot be deployed." + location + project.getName(), null);
+					TeamPlugin.log(IStatus.ERROR, Policy.bind("DeploymentProviderManager.17", location.toString(), project.getName()), null); //$NON-NLS-1$
 				}
 				IContainer container = (IContainer)resource;
 				DeploymentProviderDescriptor desc = registry.find(id);				
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 320e620b5..5e3b5c7f9 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
@@ -109,3 +109,10 @@ ContentComparisonCriteria.3=\ ignoring whitespace
 SubscriberEventHandler.2=Calculating synchronization state for {0}.
 SubscriberEventHandler.jobName=Updating synchronization states for {0}.
 SubscriberEventHandler.errors=Errors have occured while calculating the synchronization state for {0}.
+RemoteContentsCacheEntry.3=Cache entry in {0} for {1} has been disposed
+DeploymentProviderManager.10=Cannot map provider {0}. It's extension point description cannot be found.
+DeploymentProviderManager.12=Resource {0} is mapped to multiple deployment providers of type {1}.
+DeploymentProviderManager.13={0} is already mapped to {1}
+DeploymentProviderManager.15=An I/O error occurred while persisting the deployment configurations for project {0}.
+DeploymentProviderManager.16=Previously deployed folder {0} in project {1} no longer exists.
+DeploymentProviderManager.17=Previously deployed resource {0} in project {1} is now a file and cannot be deployed.