Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-05-19 18:35:46 -0400
committerjames2002-05-19 18:35:46 -0400
commit93e652d66207ae21da2fb4e1e5c1c73acd93878b (patch)
tree5d77e864bde503943768e7aa8f118e7fbf4619d0
parent2e09f39029efb31434a3dd282b94dcc43845eb4f (diff)
downloadeclipse.platform.team-93e652d66207ae21da2fb4e1e5c1c73acd93878b.tar.gz
eclipse.platform.team-93e652d66207ae21da2fb4e1e5c1c73acd93878b.tar.xz
eclipse.platform.team-93e652d66207ae21da2fb4e1e5c1c73acd93878b.zip
String fixes
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/TargetManager.java18
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Assert.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties22
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ITeamStatusConstants.java16
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ResourceState.java4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/StreamUtil.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java2
7 files changed, 44 insertions, 22 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/TargetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/TargetManager.java
index a23396de0..bcb4e3482 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/TargetManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/target/TargetManager.java
@@ -42,10 +42,10 @@ import org.eclipse.team.internal.core.TeamPlugin;
import org.eclipse.team.internal.core.target.LocationMapping;
public class TargetManager {
- private static final String TARGET_SITES_FILE = ".targetSites";
+ private static final String TARGET_SITES_FILE = ".targetSites"; //$NON-NLS-1$
private static QualifiedName TARGET_MAPPINGS =
- new QualifiedName("org.eclipse.team.core.target", "mappings");
+ new QualifiedName("org.eclipse.team.core.target", "mappings"); //$NON-NLS-1$ //$NON-NLS-2$
private static Map factories = new Hashtable();
private static List sites = new ArrayList();
@@ -78,7 +78,7 @@ public class TargetManager {
ISynchronizer s = ResourcesPlugin.getWorkspace().getSynchronizer();
byte[] mappingBytes = s.getSyncInfo(TARGET_MAPPINGS, project);
if (mappingBytes != null) {
- throw new TeamException("Problems mapping project. Project is already mapped.");
+ throw new TeamException(Policy.bind("TargetManager.Problems_mapping_project._Project_is_already_mapped._4")); //$NON-NLS-1$
}
LocationMapping mapping = new LocationMapping(site, path);
s.setSyncInfo(
@@ -86,9 +86,9 @@ public class TargetManager {
project,
mapping.encode());
} catch (CoreException e) {
- throw new TeamException("Problems mapping project" + project.getName(), e);
+ throw new TeamException(Policy.bind("TargetManager.Problems_mapping_project", project.getName()), e); //$NON-NLS-1$
} catch (IOException e) {
- throw new TeamException("Problems mapping project" + project.getName(), e);
+ throw new TeamException(Policy.bind("TargetManager.Problems_mapping_project", project.getName()), e); //$NON-NLS-1$
}
}
@@ -100,14 +100,14 @@ public class TargetManager {
ISynchronizer s = ResourcesPlugin.getWorkspace().getSynchronizer();
byte[] mappingBytes = s.getSyncInfo(TARGET_MAPPINGS, project);
if (mappingBytes == null) {
- throw new TeamException("Unable to unmap project. It wasn't mapped to the location." + project.getName(), null);
+ throw new TeamException(Policy.bind("TargetManager.unableToUnmap", project.getName()), null); //$NON-NLS-1$
} else {
TargetProvider provider = getProvider(project);
provider.deregister(project);
s.flushSyncInfo(TARGET_MAPPINGS, project, IResource.DEPTH_ZERO);
}
} catch (CoreException e) {
- throw new TeamException("Problems unmapping project" + project.getName(), e);
+ throw new TeamException(Policy.bind("TargetManager.problemsUnmapping", project.getName()), e); //$NON-NLS-1$
}
}
@@ -127,9 +127,9 @@ public class TargetManager {
}
return null;
} catch (CoreException e) {
- throw new TeamException("Problems getting default target provider" + project.getName(), e);
+ throw new TeamException(Policy.bind("TargetManager.problemsGettingProvider", project.getName()), e); //$NON-NLS-1$
} catch (IOException e) {
- throw new TeamException("Problems getting default target provider" + project.getName(), e);
+ throw new TeamException(Policy.bind("TargetManager.problemsGettingProvider", project.getName()), e); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Assert.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Assert.java
index 1c79d6ee5..5b73a8353 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Assert.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Assert.java
@@ -12,7 +12,7 @@ public final class Assert {
public AssertionFailedException() {
}
public AssertionFailedException(String detail) {
- super("Assertion failed: " + detail);
+ super(Policy.bind("Assert.assertionFailed", detail)); //$NON-NLS-1$
}
}
/* This class is not intended to be instantiated. */
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 87b7fc4d9..4694bd864 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
@@ -1,4 +1,6 @@
+Assert.assertionFailed=Assertion failed: {0}
+
manager.providerAlreadyMapped=Error associating {0} with provider named {1}. The project is already associated with a provider.
manager.errorFlushSync=Error flushing provider mapping information for {0}.
manager.errorDeconfigure=Error deconfiguring provider named {0} from project {1}.
@@ -43,3 +45,23 @@ PollingOutputStream.writeTimeout=Timeout while writing to output stream
PollingOutputStream.closeTimeout=Timeout while closing output stream
TimeoutOutputStream.cannotWriteToStream=Cannot write to output stream
+TargetManager.Problems_mapping_project._Project_is_already_mapped._4=Problems mapping project. Project is already mapped.
+TargetManager.Problems_mapping_project=Problems mapping project {0}
+TargetManager.unableToUnmap=Unable to unmap project. It wasn't mapped to the location. {0}
+TargetManager.problemsUnmapping=Problems unmapping project {0}
+TargetManager.problemsGettingProvider=Problems getting default target provider for {0}
+
+Config.error=Error configuring the provider
+
+teamStatus.notCheckedOut=Not checked out.
+teamStatus.notCheckedIn=Not checked in.
+teamStatus.unmanagedResource=Unmanaged resource.
+teamStatus.noRemoteResource=Remote resource does not exist.
+teamStatus.ioFailed=An IO error occurred.
+teamStatus.conflict=A conflict occurred.
+
+multiStatus.errorsOccurred=Errors occurred.
+provider.configuration.missing=Required configuration value missing.
+provider.configuration.invalid=Configuration value is invalid.
+filetransfer.monitor={0} ({1}K of {2}K bytes)
+OK_1=OK
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ITeamStatusConstants.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ITeamStatusConstants.java
index 6135823e7..e6500a226 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ITeamStatusConstants.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ITeamStatusConstants.java
@@ -19,14 +19,14 @@ import org.eclipse.team.internal.core.TeamPlugin;
public interface ITeamStatusConstants {
public static final IStatus OK_STATUS =
- new Status(IStatus.OK, TeamPlugin.ID, TeamException.OK, "OK", null);
+ new Status(IStatus.OK, TeamPlugin.ID, TeamException.OK, Policy.bind("OK_1"), null); //$NON-NLS-1$
public static final IStatus NOT_CHECKED_OUT_STATUS =
new Status(
IStatus.ERROR,
TeamPlugin.ID,
TeamException.NOT_CHECKED_OUT,
- Policy.bind("teamStatus.notCheckedOut"),
+ Policy.bind("teamStatus.notCheckedOut"), //$NON-NLS-1$
null);
public static final IStatus NOT_CHECKED_IN_STATUS =
@@ -34,7 +34,7 @@ public interface ITeamStatusConstants {
IStatus.ERROR,
TeamPlugin.ID,
TeamException.NOT_CHECKED_IN,
- Policy.bind("teamStatus.notCheckedIn"),
+ Policy.bind("teamStatus.notCheckedIn"), //$NON-NLS-1$
null);
public static final IStatus NO_REMOTE_RESOURCE_STATUS =
@@ -42,7 +42,7 @@ public interface ITeamStatusConstants {
IStatus.ERROR,
TeamPlugin.ID,
TeamException.NO_REMOTE_RESOURCE,
- Policy.bind("teamStatus.noRemoteResource"),
+ Policy.bind("teamStatus.noRemoteResource"), //$NON-NLS-1$
null);
public static final IStatus IO_FAILED_STATUS =
@@ -50,7 +50,7 @@ public interface ITeamStatusConstants {
IStatus.ERROR,
TeamPlugin.ID,
TeamException.IO_FAILED,
- Policy.bind("teamStatus.ioFailed"),
+ Policy.bind("teamStatus.ioFailed"), //$NON-NLS-1$
null);
public static final IStatus CONFLICT_STATUS =
@@ -58,7 +58,7 @@ public interface ITeamStatusConstants {
IStatus.ERROR,
TeamPlugin.ID,
TeamException.CONFLICT,
- Policy.bind("teamStatus.conflict"),
+ Policy.bind("teamStatus.conflict"), //$NON-NLS-1$
null);
public static final IStatus REQUIRED_CONFIGURATION_MISSING =
@@ -66,7 +66,7 @@ public interface ITeamStatusConstants {
IStatus.ERROR,
TeamPlugin.ID,
-100,
- Policy.bind("provider.configuration.missing"),
+ Policy.bind("provider.configuration.missing"), //$NON-NLS-1$
null);
public static final IStatus INVALID_CONFIGURATION =
@@ -74,6 +74,6 @@ public interface ITeamStatusConstants {
IStatus.ERROR,
TeamPlugin.ID,
-101,
- Policy.bind("provider.configuration.invalid"),
+ Policy.bind("provider.configuration.invalid"), //$NON-NLS-1$
null);
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ResourceState.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ResourceState.java
index af3df0962..ef182c0a1 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ResourceState.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/ResourceState.java
@@ -52,7 +52,7 @@ public abstract class ResourceState {
* base timestamp and remote base identifier.
*/
protected static final long EMPTY_LOCALBASETS = -1L;
- protected static final String EMPTY_REMOTEBASEID = "Undefined:";
+ protected static final String EMPTY_REMOTEBASEID = "Undefined:"; //$NON-NLS-1$
/*
* The base state of the resource. The 'base' is the state of the resource
@@ -70,7 +70,7 @@ public abstract class ResourceState {
*/
protected IResource localResource;
- protected QualifiedName stateKey = new QualifiedName("org.eclipse.team.target", "state_info");
+ protected QualifiedName stateKey = new QualifiedName("org.eclipse.team.target", "state_info"); //$NON-NLS-1$ //$NON-NLS-2$
protected URL rootUrl;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/StreamUtil.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/StreamUtil.java
index c7db653fb..87c4d4566 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/StreamUtil.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/StreamUtil.java
@@ -49,7 +49,7 @@ public class StreamUtil {
bytesCopied = bytesCopied + read;
progress.subTask(
Policy.bind(
- "filetransfer.monitor",
+ "filetransfer.monitor", //$NON-NLS-1$
new Object[] { title, new Long(bytesCopied / 1024), kilobytesEstimate }));
}
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java
index f99c3a5c0..5cac0628e 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java
@@ -201,7 +201,7 @@ public abstract class SynchronizedTargetProvider extends TargetProvider {
TeamPlugin.ID,
IStatus.ERROR,
statuses,
- Policy.bind("multiStatus.errorsOccurred"),
+ Policy.bind("multiStatus.errorsOccurred"), //$NON-NLS-1$
null));
// Cause all the resource changes to be broadcast to listeners.

Back to the top