Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-05 15:15:49 -0500
committerMichael Valenta2002-04-05 15:15:49 -0500
commita8c476bc2556d1c6f7ea97e4e81b50f6d7e2ec98 (patch)
tree842b69248552bb2df3cc415342f00e036f115a7c
parent147f7e8a068b3f6d17cd3610c0ddd4f34dd1017c (diff)
downloadeclipse.platform.team-a8c476bc2556d1c6f7ea97e4e81b50f6d7e2ec98.tar.gz
eclipse.platform.team-a8c476bc2556d1c6f7ea97e4e81b50f6d7e2ec98.tar.xz
eclipse.platform.team-a8c476bc2556d1c6f7ea97e4e81b50f6d7e2ec98.zip
NLS fixes
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidatorManager.java4
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java4
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/DateUtil.java164
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/Policy.java4
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java10
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Log.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java4
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties11
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java4
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java20
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/CVSDateFormatter.java20
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java18
14 files changed, 140 insertions, 129 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidatorManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidatorManager.java
index 4ea81c123..0f02a837f 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidatorManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/internal/FileModificationValidatorManager.java
@@ -79,8 +79,8 @@ public class FileModificationValidatorManager implements IFileModificationValida
(IStatus[])returnStati.toArray(new IStatus[returnStati.size()]),
Policy.bind(
allOK
- ? "FileModificationValidator.ok"
- : "FileModificationValidator.editFailed"),
+ ? "FileModificationValidator.ok" //$NON-NLS-1$
+ : "FileModificationValidator.editFailed"), //$NON-NLS-1$
null); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
index e85236e9b..2068c4283 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
@@ -142,7 +142,7 @@ public class CVSProvider implements ICVSProvider {
subMonitor.beginTask(null, children.length * 100);
try {
for (int j = 0; j < children.length; j++) {
- if ( ! children[j].getName().equals(".project")) {
+ if ( ! children[j].getName().equals(".project")) {//$NON-NLS-1$
children[j].delete(true /*force*/, Policy.subMonitorFor(subMonitor, 100));
}
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
index 73d739658..5b0b6ed5a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
@@ -448,7 +448,7 @@ public class CVSTeamProvider extends RepositoryProvider {
progress.beginTask(null, 100);
// Prepare for the replace (special handling for "cvs added" and "cvs removed" resources
- new PrepareForReplaceVisitor().visitResources(getProject(), resources, "CVSTeamProvider.scrubbingResource", depth, Policy.subMonitorFor(progress, 30));
+ new PrepareForReplaceVisitor().visitResources(getProject(), resources, "CVSTeamProvider.scrubbingResource", depth, Policy.subMonitorFor(progress, 30)); //$NON-NLS-1$
// Perform an update, ignoring any local file modifications
List options = new ArrayList();
@@ -997,7 +997,7 @@ public class CVSTeamProvider extends RepositoryProvider {
}
if (totalWork != 0) {
Session s = new Session(workspaceRoot.getRemoteLocation(), workspaceRoot.getLocalRoot());
- monitor.beginTask(Policy.bind("CVSTeamProvider.settingKSubst"), 5 + totalWork);
+ monitor.beginTask(Policy.bind("CVSTeamProvider.settingKSubst"), 5 + totalWork); //$NON-NLS-1$
try {
s.open(Policy.subMonitorFor(monitor, 5));
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/DateUtil.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/DateUtil.java
index 1aa4bb9ea..c49174fb5 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/DateUtil.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/DateUtil.java
@@ -1,82 +1,82 @@
-package org.eclipse.team.internal.ccvs.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import java.util.TimeZone;
-
-/**
- * Utilities to handle time stamps in a cvs client.
- */
-public class DateUtil {
-
- private static final String ENTRY_TIMESTAMP_FORMAT= "EEE MMM dd HH:mm:ss yyyy";
- private static final String ENTRY_TIMESTAMP_TIME_ZONE= "GMT";
- private static final Locale ENTRY_TIMESTAMP_LOCALE= Locale.US;
-
- private static final String MODTIME_TIMESTAMP_FORMAT= "dd MMM yyyy HH:mm:ss zz";
- private static final Locale MODTIME_TIMESTAMP_LOCALE= Locale.US;
-
- private static final String LOG_TIMESTAMP_FORMAT= "yyyy/MM/dd HH:mm:ss zzz";
- private static final Locale LOG_TIMESTAMP_LOCALE= Locale.US;
-
- private static final String HISTORY_TIMESTAMP_FORMAT= "yyyy-MM-dd HH:mm zzzz";
- private static final Locale HISTORY_TIMESTAMP_LOCALE= Locale.US;
-
- /**
- * Converts a time stamp as sent from a cvs server for a "log" command into a
- * <code>Date</code>.
- */
- public static Date convertFromLogTime(String modTime) {
- SimpleDateFormat format= new SimpleDateFormat(LOG_TIMESTAMP_FORMAT,
- LOG_TIMESTAMP_LOCALE);
- try {
- return format.parse(modTime);
- } catch (ParseException e) {
- // fallback is to return null
- return null;
- }
- }
- /**
- * Converts a modifcation time stamp as send from a cvs server into a
- * <code>Date</code>. The format of the modification time stamp is defined
- * in the document CVS Client/Server for CVS 1.11 section 5.6 Dates
- */
- public static Date convertFromModTime(String modTime) {
- SimpleDateFormat format= new SimpleDateFormat(MODTIME_TIMESTAMP_FORMAT,
- MODTIME_TIMESTAMP_LOCALE);
- try {
- return format.parse(modTime);
- } catch (ParseException e) {
- // fallback is to return null
- return null;
- }
- }
- /**
- * Converts a history time stamp as sent from a cvs server into a
- * <code>Date</code>.
- */
- public static Date convertFromHistoryTime(String historyTime) {
- SimpleDateFormat format= new SimpleDateFormat(HISTORY_TIMESTAMP_FORMAT,
- HISTORY_TIMESTAMP_LOCALE);
- try {
- return format.parse(historyTime);
- } catch (ParseException e) {
- // fallback is to return null
- return null;
- }
- }
- /**
- * Converts a date into an entry time format as specified in the document
- * Version Management with CVS for CVS 1.10.6 page 14. Note that the
- * time format is always in GMT also not specified in the document.
- */
- public static String toEntryFormat(Date date) {
- SimpleDateFormat format= new SimpleDateFormat(ENTRY_TIMESTAMP_FORMAT,
- ENTRY_TIMESTAMP_LOCALE);
- format.setTimeZone(TimeZone.getTimeZone(ENTRY_TIMESTAMP_TIME_ZONE));
- return format.format(date);
- }
-}
+package org.eclipse.team.internal.ccvs.core;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved.
+ */
+
+import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import java.util.TimeZone;
+
+/**
+ * Utilities to handle time stamps in a cvs client.
+ */
+public class DateUtil {
+
+ private static final String ENTRY_TIMESTAMP_FORMAT= "EEE MMM dd HH:mm:ss yyyy";//$NON-NLS-1$
+ private static final String ENTRY_TIMESTAMP_TIME_ZONE= "GMT";//$NON-NLS-1$
+ private static final Locale ENTRY_TIMESTAMP_LOCALE= Locale.US;
+
+ private static final String MODTIME_TIMESTAMP_FORMAT= "dd MMM yyyy HH:mm:ss zz";//$NON-NLS-1$
+ private static final Locale MODTIME_TIMESTAMP_LOCALE= Locale.US;
+
+ private static final String LOG_TIMESTAMP_FORMAT= "yyyy/MM/dd HH:mm:ss zzz";//$NON-NLS-1$
+ private static final Locale LOG_TIMESTAMP_LOCALE= Locale.US;
+
+ private static final String HISTORY_TIMESTAMP_FORMAT= "yyyy-MM-dd HH:mm zzzz";//$NON-NLS-1$
+ private static final Locale HISTORY_TIMESTAMP_LOCALE= Locale.US;
+
+ /**
+ * Converts a time stamp as sent from a cvs server for a "log" command into a
+ * <code>Date</code>.
+ */
+ public static Date convertFromLogTime(String modTime) {
+ SimpleDateFormat format= new SimpleDateFormat(LOG_TIMESTAMP_FORMAT,
+ LOG_TIMESTAMP_LOCALE);
+ try {
+ return format.parse(modTime);
+ } catch (ParseException e) {
+ // fallback is to return null
+ return null;
+ }
+ }
+ /**
+ * Converts a modifcation time stamp as send from a cvs server into a
+ * <code>Date</code>. The format of the modification time stamp is defined
+ * in the document CVS Client/Server for CVS 1.11 section 5.6 Dates
+ */
+ public static Date convertFromModTime(String modTime) {
+ SimpleDateFormat format= new SimpleDateFormat(MODTIME_TIMESTAMP_FORMAT,
+ MODTIME_TIMESTAMP_LOCALE);
+ try {
+ return format.parse(modTime);
+ } catch (ParseException e) {
+ // fallback is to return null
+ return null;
+ }
+ }
+ /**
+ * Converts a history time stamp as sent from a cvs server into a
+ * <code>Date</code>.
+ */
+ public static Date convertFromHistoryTime(String historyTime) {
+ SimpleDateFormat format= new SimpleDateFormat(HISTORY_TIMESTAMP_FORMAT,
+ HISTORY_TIMESTAMP_LOCALE);
+ try {
+ return format.parse(historyTime);
+ } catch (ParseException e) {
+ // fallback is to return null
+ return null;
+ }
+ }
+ /**
+ * Converts a date into an entry time format as specified in the document
+ * Version Management with CVS for CVS 1.10.6 page 14. Note that the
+ * time format is always in GMT also not specified in the document.
+ */
+ public static String toEntryFormat(Date date) {
+ SimpleDateFormat format= new SimpleDateFormat(ENTRY_TIMESTAMP_FORMAT,
+ ENTRY_TIMESTAMP_LOCALE);
+ format.setTimeZone(TimeZone.getTimeZone(ENTRY_TIMESTAMP_TIME_ZONE));
+ return format.format(date);
+ }
+}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/Policy.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/Policy.java
index 65f842127..772acf50d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/Policy.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/Policy.java
@@ -27,8 +27,8 @@ public class Policy {
static {
//init debug options
if (CVSProviderPlugin.getPlugin().isDebugging()) {
- DEBUG_METAFILE_CHANGES = "true".equalsIgnoreCase(Platform.getDebugOption(CVSProviderPlugin.ID + "/metafiles"));
- DEBUG_CVS_PROTOCOL = "true".equalsIgnoreCase(Platform.getDebugOption(CVSProviderPlugin.ID + "/cvsprotocol"));
+ DEBUG_METAFILE_CHANGES = "true".equalsIgnoreCase(Platform.getDebugOption(CVSProviderPlugin.ID + "/metafiles"));//$NON-NLS-1$ //$NON-NLS-2$
+ DEBUG_CVS_PROTOCOL = "true".equalsIgnoreCase(Platform.getDebugOption(CVSProviderPlugin.ID + "/cvsprotocol"));//$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
index 785fa015a..e3b6f948a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
@@ -309,7 +309,7 @@ public abstract class Command extends Request {
IConsoleListener consoleListener = CVSProviderPlugin.getPlugin().getConsoleListener();
if (consoleListener != null) consoleListener.commandInvoked(line);
}
- if (Policy.DEBUG_CVS_PROTOCOL) System.out.println("CMD> " + line);
+ if (Policy.DEBUG_CVS_PROTOCOL) System.out.println("CMD> " + line); //$NON-NLS-1$
}
// run the command
@@ -335,8 +335,8 @@ public abstract class Command extends Request {
if (consoleListener != null) consoleListener.commandCompleted(status, exception);
}
if (Policy.DEBUG_CVS_PROTOCOL) {
- if (status != null) System.out.println("RESULT> " + status.toString());
- else System.out.println("RESULT> " + exception.toString());
+ if (status != null) System.out.println("RESULT> " + status.toString()); //$NON-NLS-1$
+ else System.out.println("RESULT> " + exception.toString()); //$NON-NLS-1$
}
}
@@ -420,9 +420,9 @@ public abstract class Command extends Request {
}
for (int i = 0; i < arguments.length; ++i) {
if (arguments[i].length() == 0) continue;
- commandLine.append(" \"");
+ commandLine.append(" \""); //$NON-NLS-1$
commandLine.append(arguments[i]);
- commandLine.append('"');
+ commandLine.append('"'); //$NON-NLS-1$
}
return commandLine.toString();
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Log.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Log.java
index 5ec084d18..e33f34218 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Log.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Log.java
@@ -16,7 +16,7 @@ public class Log extends AbstractMessageCommand {
/*** Local options: specific to log ***/
public static LocalOption makeRevisionOption(String revision) {
- return new LocalOption("-r" + revision, null);
+ return new LocalOption("-r" + revision, null); //$NON-NLS-1$
}
protected Log() { }
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
index a18ac9880..3c7391aae 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Request.java
@@ -132,12 +132,12 @@ public abstract class Request {
// handle completion responses
if (response.equals("ok")) { //$NON-NLS-1$
break;
- } else if (response.equals("error") || (isCVSNT && response.equals(""))) { //$NON-NLS-1$
+ } else if (response.equals("error") || (isCVSNT && response.equals(""))) { //$NON-NLS-1$ //$NON-NLS-2$
if (argument.trim().length() == 0) {
argument = Policy.bind("Command.serverError", Policy.bind("Command." + getRequestId())); //$NON-NLS-1$ //$NON-NLS-2$
}
if (accumulatedStatus.isEmpty()) {
- accumulatedStatus.add(new CVSStatus(CVSStatus.ERROR, CVSStatus.SERVER_ERROR, Policy.bind("Command.noMoreInfoAvailable")));
+ accumulatedStatus.add(new CVSStatus(CVSStatus.ERROR, CVSStatus.SERVER_ERROR, Policy.bind("Command.noMoreInfoAvailable")));//$NON-NLS-1$
}
return new MultiStatus(CVSProviderPlugin.ID, CVSStatus.SERVER_ERROR,
(IStatus[]) accumulatedStatus.toArray(new IStatus[accumulatedStatus.size()]),
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
index 5f8d542b0..c8e5a130e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/messages.properties
@@ -6,6 +6,12 @@ AbstractStructureVisitor.sendingFolder=Processing {0}
AbstractStructureVisitor.sendingFile=Processing {0}
AbstractStructureVisitor.noRemote=Unable to determine remote location for resource
+AddDeleteMoveListener.deletedResource={0} has been deleted locally
+AddDeleteMoveListener.Error_creating_deletion_marker_1=Error creating deletion marker
+AddDeleteMoveListener.Local_addition_not_under_CVS_control_2=Local addition not under CVS control
+AddDeleteMoveListener.Error_creating_addition_marker_3=Error creating addition marker
+AddDeleteMoveListener.Error_updating_marker_state_4=Error updating marker state
+
CVSAuthenticationException.normal=Authentication error connecting to {0}
CVSAuthenticationException.detail=Authentication error: {0}
@@ -78,6 +84,10 @@ ProjectDescriptionManager.unableToSetDescription=An error occured setting the pr
ProjectDescriptionManager.unableToReadDescription=An error occured reading the project description
ProjectDescriptionManager.ioDescription=An IO error occured while writing the project description
ProjectDescriptionManager.coreDescription=A Core error occured while writing the project description
+ProjectDescriptionManager.vcmmetaIgnored=.vcm_meta file ignored for project {0}
+ProjectDescriptionManager.cannotUpdateDesc=Cannot update project description
+ProjectDescriptionManager.markerError=Error creating marker for .vcm_meta file.
+ProjectDescriptionManager.vcmmetaMarker={0} file exists in {1} but is no longer required and can be deleted
ResourceDeltaVisitor.visitError=Error while processing resource deltas
@@ -231,3 +241,4 @@ EclipseSynchronizer.ErrorSettingResourceSync=Cannot set resource sync info on {0
EclipseSynchronizer.ErrorSettingIgnorePattern=Cannot set ignored pattern on {0}
EclipseSynchronizer.ErrorDeletingFolderSync=Could not delete all CVS folders
SyncFileChangeListener.errorSettingTeamPrivateFlag=Error setting team-private flag on resource
+
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
index e98b101b8..fd3115988 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
@@ -50,7 +50,7 @@ public class EclipseSynchronizer {
private static final String[] NULL_IGNORES = new String[0];
private static final FolderSyncInfo NULL_FOLDER_SYNC_INFO = new FolderSyncInfo("", "", null, false); //$NON-NLS-1$ //$NON-NLS-2$
- private static final IStatus STATUS_OK = new Status(IStatus.OK, CVSProviderPlugin.ID, 0, Policy.bind("ok"), null);
+ private static final IStatus STATUS_OK = new Status(IStatus.OK, CVSProviderPlugin.ID, 0, Policy.bind("ok"), null); //$NON-NLS-1$
// the cvs eclipse synchronizer is a singleton
private static EclipseSynchronizer instance;
@@ -472,7 +472,7 @@ public class EclipseSynchronizer {
changedResources.clear();
changedFolders.clear();
if ( ! errors.isEmpty()) {
- MultiStatus status = new MultiStatus(CVSProviderPlugin.ID, CVSStatus.DELETION_FAILED, Policy.bind("EclipseSynchronizer.ErrorDeletingFolderSync"), null);
+ MultiStatus status = new MultiStatus(CVSProviderPlugin.ID, CVSStatus.DELETION_FAILED, Policy.bind("EclipseSynchronizer.ErrorDeletingFolderSync"), null);//$NON-NLS-1$
for (int i = 0; i < errors.size(); i++) {
status.merge((IStatus)errors.get(i));
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
index 386e92e2c..af207d150 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
@@ -296,7 +296,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
throw new OperationCanceledException();
}
if (! exists[0]) {
- throw new CVSException(new CVSStatus(CVSStatus.ERROR, CVSStatus.DOES_NOT_EXIST, Policy.bind("RemoteFolder.doesNotExist", getRepositoryRelativePath())));
+ throw new CVSException(new CVSStatus(CVSStatus.ERROR, CVSStatus.DOES_NOT_EXIST, Policy.bind("RemoteFolder.doesNotExist", getRepositoryRelativePath()))); //$NON-NLS-1$
}
// Convert the file and folder names to IManagedResources
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java
index f0091a01a..ef632ab22 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java
@@ -37,10 +37,10 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
*/
public class AddDeleteMoveListener implements IResourceDeltaVisitor, IResourceChangeListener, IResourceStateChangeListener {
- public static final String DELETION_MARKER = "org.eclipse.team.cvs.core.cvsremove";
- public static final String ADDITION_MARKER = "org.eclipse.team.cvs.core.cvsadd";
+ public static final String DELETION_MARKER = "org.eclipse.team.cvs.core.cvsremove";//$NON-NLS-1$
+ public static final String ADDITION_MARKER = "org.eclipse.team.cvs.core.cvsadd";//$NON-NLS-1$
- public static final String NAME_ATTRIBUTE = "name";
+ public static final String NAME_ATTRIBUTE = "name";//$NON-NLS-1$
protected IMarker createDeleteMarker(IResource resource) {
if (! CVSProviderPlugin.getPlugin().getShowTasksOnAddAndDelete()) {
@@ -52,12 +52,12 @@ public class AddDeleteMoveListener implements IResourceDeltaVisitor, IResourceCh
return marker;
}
marker = resource.getParent().createMarker(DELETION_MARKER);
- marker.setAttribute("name", resource.getName());
- marker.setAttribute(IMarker.MESSAGE, resource.getName() + " has been deleted locally");
+ marker.setAttribute("name", resource.getName());//$NON-NLS-1$
+ marker.setAttribute(IMarker.MESSAGE, Policy.bind("AddDeleteMoveListener.deletedResource", resource.getName()));//$NON-NLS-1$
marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
return marker;
} catch (CoreException e) {
- Util.logError("Error creating deletion marker", e);
+ Util.logError(Policy.bind("AddDeleteMoveListener.Error_creating_deletion_marker_1"), e); //$NON-NLS-1$
}
return null;
}
@@ -73,10 +73,10 @@ public class AddDeleteMoveListener implements IResourceDeltaVisitor, IResourceCh
}
marker = resource.createMarker(ADDITION_MARKER);
marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
- marker.setAttribute(IMarker.MESSAGE, "Local addition not under CVS control");
+ marker.setAttribute(IMarker.MESSAGE, Policy.bind("AddDeleteMoveListener.Local_addition_not_under_CVS_control_2")); //$NON-NLS-1$
return marker;
} catch (CoreException e) {
- Util.logError("Error creating addition marker", e);
+ Util.logError(Policy.bind("AddDeleteMoveListener.Error_creating_addition_marker_3"), e); //$NON-NLS-1$
}
return null;
}
@@ -320,9 +320,9 @@ public class AddDeleteMoveListener implements IResourceDeltaVisitor, IResourceCh
}
}
} catch (CVSException e) {
- Util.logError("Error updating marker state", e);
+ Util.logError(Policy.bind("AddDeleteMoveListener.Error_updating_marker_state_4"), e); //$NON-NLS-1$
} catch (CoreException e) {
- Util.logError("Error updating marker state", e);
+ Util.logError(Policy.bind("AddDeleteMoveListener.Error_updating_marker_state_4"), e); //$NON-NLS-1$
}
}
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/CVSDateFormatter.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/CVSDateFormatter.java
index 46cd78c79..1bc9c91f1 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/CVSDateFormatter.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/CVSDateFormatter.java
@@ -34,7 +34,7 @@ public class CVSDateFormatter {
}
static public String dateToServerStamp(Date date) {
- serverFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+ serverFormat.setTimeZone(TimeZone.getTimeZone("GMT"));//$NON-NLS-1$
return serverFormat.format(date) + " -0000"; //$NON-NLS-1$
}
@@ -53,22 +53,22 @@ public class CVSDateFormatter {
*/
static private TimeZone getTimeZone(String dateFromServer) {
String tz = null;
- StringBuffer resultTz = new StringBuffer("GMT");
- if (dateFromServer.indexOf("-") != -1) {
- resultTz.append("-");
- tz = dateFromServer.substring(dateFromServer.indexOf("-"));
- } else if (dateFromServer.indexOf("+") != -1) {
+ StringBuffer resultTz = new StringBuffer("GMT");//$NON-NLS-1$
+ if (dateFromServer.indexOf("-") != -1) {//$NON-NLS-1$
+ resultTz.append("-");//$NON-NLS-1$
+ tz = dateFromServer.substring(dateFromServer.indexOf("-"));//$NON-NLS-1$
+ } else if (dateFromServer.indexOf("+") != -1) {//$NON-NLS-1$
resultTz.append('+');
- tz = dateFromServer.substring(dateFromServer.indexOf("+"));
+ tz = dateFromServer.substring(dateFromServer.indexOf("+"));//$NON-NLS-1$
}
try {
if(tz!=null) {
- resultTz.append(tz.substring(1, 3) /*hours*/ + ":" + tz.substring(3, 5) /*minutes*/);
+ resultTz.append(tz.substring(1, 3) /*hours*/ + ":" + tz.substring(3, 5) /*minutes*/);//$NON-NLS-1$
return TimeZone.getTimeZone(resultTz.toString());
}
} catch(IndexOutOfBoundsException e) {
- return TimeZone.getTimeZone("GMT");
+ return TimeZone.getTimeZone("GMT");//$NON-NLS-1$
}
- return TimeZone.getTimeZone("GMT");
+ return TimeZone.getTimeZone("GMT");//$NON-NLS-1$
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java
index f74b11115..af6b970bd 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java
@@ -49,7 +49,7 @@ public class ProjectDescriptionManager implements IResourceChangeListener {
public final static IPath CORE_PROJECT_DESCRIPTION_PATH = new Path(".project"); //$NON-NLS-1$
public final static boolean UPDATE_PROJECT_DESCRIPTION_ON_LOAD = true;
- public static final String VCMMETA_MARKER = "org.eclipse.team.cvs.core.vcmmeta";
+ public static final String VCMMETA_MARKER = "org.eclipse.team.cvs.core.vcmmeta"; //$NON-NLS-1$
/*
* Read the project meta file into the provider description
@@ -140,13 +140,13 @@ public class ProjectDescriptionManager implements IResourceChangeListener {
ICVSFile coreDescResource = CVSWorkspaceRoot.getCVSFileFor(project.getFile(CORE_PROJECT_DESCRIPTION_PATH));
if (coreDescResource.exists() && coreDescResource.isManaged()) {
createVCMMetaMarker(descResource);
- Util.logError(".vcm_meta file ignored for project " + project.getName(), null);
+ Util.logError(Policy.bind("ProjectDescriptionManager.vcmmetaIgnored", project.getName()), null); //$NON-NLS-1$
return;
} else {
ICVSFolder folder = CVSWorkspaceRoot.getCVSFolderFor(project);
if (! folder.isCVSFolder()) {
createVCMMetaMarker(descResource);
- Util.logError(".vcm_meta file ignored for project " + project.getName(), null);
+ Util.logError(Policy.bind("ProjectDescriptionManager.vcmmetaIgnored", project.getName()), null); //$NON-NLS-1$
return;
}
}
@@ -232,9 +232,9 @@ public class ProjectDescriptionManager implements IResourceChangeListener {
if (resource.getType() == IResource.PROJECT) {
IProject project = (IProject)resource;
RepositoryProvider provider = RepositoryProvider.getProvider(project, CVSProviderPlugin.getTypeId());
- if (provider!=null) continue;
+ if (provider == null) continue;
// First, check if the .vcm_meta file for the project is in the delta.
- IResourceDelta[] children = delta.getAffectedChildren(IResourceDelta.REMOVED | IResourceDelta.ADDED | IResourceDelta.CHANGED);
+ IResourceDelta[] children = delta.getAffectedChildren(IResourceDelta.ADDED);
boolean inSync = false;
for (int j = 0; j < children.length; j++) {
IResourceDelta childDelta = children[j];
@@ -259,9 +259,9 @@ public class ProjectDescriptionManager implements IResourceChangeListener {
}
}
} catch (CVSException ex) {
- Util.logError("Cannot update project description", ex);
+ Util.logError(Policy.bind("ProjectDescriptionManager.cannotUpdateDesc"), ex); //$NON-NLS-1$
} catch (CoreException ex) {
- Util.logError("Cannot update project description", ex);
+ Util.logError(Policy.bind("ProjectDescriptionManager.cannotUpdateDesc"), ex); //$NON-NLS-1$
}
}
@@ -272,10 +272,10 @@ public class ProjectDescriptionManager implements IResourceChangeListener {
return markers[0];
}
IMarker marker = resource.createMarker(VCMMETA_MARKER);
- marker.setAttribute(IMarker.MESSAGE, resource.getName() + " file exists in " + resource.getProject().getName() + " but is no longer required and can be deleted");
+ marker.setAttribute(IMarker.MESSAGE, Policy.bind("ProjectDescriptionManager.vcmmetaMarker" , resource.getName(), resource.getProject().getName())); //$NON-NLS-1$
return marker;
} catch (CoreException e) {
- Util.logError("Error creating deletion marker", e);
+ Util.logError(Policy.bind("ProjectDescriptionManager.markerError"), e); //$NON-NLS-1$
}
return null;
}

Back to the top