Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-03-18 13:36:18 +0000
committerMichael Valenta2002-03-18 13:36:18 +0000
commitf743d7c794c4352a0a5b613506677cc795de8346 (patch)
tree0f042109dfa0dc4e53596e0a12a53bc27fa5a249
parent65ff54707ee6409ba7e0d3ebba384d02f8893283 (diff)
downloadeclipse.platform.team-f743d7c794c4352a0a5b613506677cc795de8346.tar.gz
eclipse.platform.team-f743d7c794c4352a0a5b613506677cc795de8346.tar.xz
eclipse.platform.team-f743d7c794c4352a0a5b613506677cc795de8346.zip
Updated NLS
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java12
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AbstractStructureVisitor.java6
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java14
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java12
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java16
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfoMap.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java4
15 files changed, 41 insertions, 41 deletions
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 4b96083e1..1cc6b3e1d 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
@@ -92,7 +92,7 @@ public class CVSTeamProvider extends RepositoryProvider {
private static final int CR_BYTE = 0x0D;
private static final int LF_BYTE = 0x0A;
private static final boolean IS_CRLF_PLATFORM = Arrays.equals(
- System.getProperty("line.separator").getBytes(),
+ System.getProperty("line.separator").getBytes(), //$NON-NLS-1$
new byte[] { CR_BYTE, LF_BYTE });
private CVSWorkspaceRoot workspaceRoot;
@@ -466,7 +466,7 @@ public class CVSTeamProvider extends RepositoryProvider {
subProgress.beginTask(null, 512);
for (int i = 0; i < resources.length; i++) {
- subProgress.subTask(Policy.bind("CVSTeamProvider.scrubbingResource", resources[i].getFullPath().toString()));
+ subProgress.subTask(Policy.bind("CVSTeamProvider.scrubbingResource", resources[i].getFullPath().toString())); //$NON-NLS-1$
IResource resource = resources[i];
workspaceRoot.getLocalRoot().getChild(resource.getProjectRelativePath().toString()).accept(visitor);
}
@@ -1005,7 +1005,7 @@ public class CVSTeamProvider extends RepositoryProvider {
final Collection /* of ICVSFile */ filesToCommitAsText = new HashSet(); // need fast lookup
final IProgressMonitor progress = Policy.monitorFor(monitor);
- progress.beginTask(Policy.bind("CVSTeamProvider.preparingToSetKSubst"), 100);
+ progress.beginTask(Policy.bind("CVSTeamProvider.preparingToSetKSubst"), 100); //$NON-NLS-1$
try {
/*** get all possibly affected files (ensure no duplicates) ***/
final Set /* of IFile */ files = new HashSet();
@@ -1080,7 +1080,7 @@ public class CVSTeamProvider extends RepositoryProvider {
Session s = new Session(workspaceRoot.getRemoteLocation(),
workspaceRoot.getLocalRoot(), false);
IProgressMonitor sessionProgress = Policy.subMonitorFor(progress, 90);
- sessionProgress.beginTask(Policy.bind("CVSTeamProvider.settingKSubst"), 5 +
+ sessionProgress.beginTask(Policy.bind("CVSTeamProvider.settingKSubst"), 5 + //$NON-NLS-1$
filesToAdmin.size() + filesToCommit.size());
try {
s.open(Policy.subMonitorFor(sessionProgress, 5));
@@ -1179,9 +1179,9 @@ public class CVSTeamProvider extends RepositoryProvider {
makeDirty(file);
}
} catch (CoreException e) {
- throw CVSException.wrapException(file, Policy.bind("CVSTeamProvider.cleanLineDelimitersException"), e);
+ throw CVSException.wrapException(file, Policy.bind("CVSTeamProvider.cleanLineDelimitersException"), e); //$NON-NLS-1$
} catch (IOException e) {
- throw CVSException.wrapException(file, Policy.bind("CVSTeamProvider.cleanLineDelimitersException"), e);
+ throw CVSException.wrapException(file, Policy.bind("CVSTeamProvider.cleanLineDelimitersException"), e); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AbstractStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AbstractStructureVisitor.java
index 9d96ab72c..680b439a9 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AbstractStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AbstractStructureVisitor.java
@@ -84,7 +84,7 @@ abstract class AbstractStructureVisitor implements ICVSResourceVisitor {
String localPath = mFolder.getRelativePath(session.getLocalRoot());
- monitor.subTask(Policy.bind("AbstractStructureVisitor.sendingFolder", localPath));
+ monitor.subTask(Policy.bind("AbstractStructureVisitor.sendingFolder", localPath)); //$NON-NLS-1$
// Deal with questionable directories
boolean isQuestionable = ! mFolder.isCVSFolder() || isOrphanedSubtree(mFolder);
@@ -100,7 +100,7 @@ abstract class AbstractStructureVisitor implements ICVSResourceVisitor {
// Send the directory to the server
String remotePath = mFolder.getRemoteLocation(session.getLocalRoot());
if (remotePath == null) {
- throw new CVSException(Policy.bind("AbstractStructureVisitor.noRemote"));
+ throw new CVSException(Policy.bind("AbstractStructureVisitor.noRemote")); //$NON-NLS-1$
}
session.sendDirectory(localPath, remotePath);
@@ -211,6 +211,6 @@ abstract class AbstractStructureVisitor implements ICVSResourceVisitor {
}
protected String getSendFileTitleKey() {
- return "AbstractStructureVisitor.sendingFile";
+ return "AbstractStructureVisitor.sendingFile"; //$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/client/Command.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
index 91490908c..4c5305012 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
@@ -577,7 +577,7 @@ public abstract class Command {
*/
public String toString() {
if (argument != null && argument.length() != 0) {
- return option + " " + argument;
+ return option + " " + argument; //$NON-NLS-1$
} else {
return option;
}
@@ -628,8 +628,8 @@ public abstract class Command {
private String longDisplayText;
private KSubstOption(String option) {
- this(option, Policy.bind("KSubstOption." + option + ".short"),
- Policy.bind("KSubstOption." + option + ".long"));
+ this(option, Policy.bind("KSubstOption." + option + ".short"), //$NON-NLS-1$ //$NON-NLS-2$
+ Policy.bind("KSubstOption." + option + ".long")); //$NON-NLS-1$ //$NON-NLS-2$
}
private KSubstOption(String option, String shortDisplayText, String longDisplayText) {
super(option);
@@ -644,12 +644,12 @@ public abstract class Command {
* @return an instance for that mode
*/
public static KSubstOption fromMode(String mode) {
- if (mode.length() == 0) mode = "-kkv"; // use default
+ if (mode.length() == 0) mode = "-kkv"; // use default //$NON-NLS-1$
KSubstOption option = (KSubstOption) ksubstOptionMap.get(mode);
if (option == null) {
option = new KSubstOption(mode,
- Policy.bind("KSubstOption.unknown.short", mode),
- Policy.bind("KSubstOption.unknown.long", mode));
+ Policy.bind("KSubstOption.unknown.short", mode), //$NON-NLS-1$
+ Policy.bind("KSubstOption.unknown.long", mode)); //$NON-NLS-1$
ksubstOptionMap.put(mode, option);
}
return option;
@@ -674,7 +674,7 @@ public abstract class Command {
* Returns the entry line mode string for this instance.
*/
public String toMode() {
- if (KSUBST_TEXT_EXPAND.equals(this)) return "";
+ if (KSUBST_TEXT_EXPAND.equals(this)) return ""; //$NON-NLS-1$
return getOption();
}
/**
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java
index e1e59dc44..4014c15b5 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Commit.java
@@ -19,7 +19,7 @@ public class Commit extends Command {
// unless it is dirty. The primary use is to resend a file that may
// or may not be changed (e.g. could depend on CR/LF translations, etc...)
// and force the server to create a new revision and reply Checked-in.
- public static final LocalOption FORCE = new LocalOption("-f");
+ public static final LocalOption FORCE = new LocalOption("-f"); //$NON-NLS-1$
protected Commit() { }
protected String getCommandId() {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
index 3aece0bdd..97279171b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
@@ -124,7 +124,7 @@ class ImportStructureVisitor implements ICVSResourceVisitor {
}
String localPath = mFolder.getRelativePath(session.getLocalRoot());
- monitor.subTask(Policy.bind("AbstractStructureVisitor.sendingFolder", localPath));
+ monitor.subTask(Policy.bind("AbstractStructureVisitor.sendingFolder", localPath)); //$NON-NLS-1$
session.sendConstructedDirectory(localPath);
mFolder.acceptChildren(this);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
index 1a0991b51..7541bd044 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
@@ -779,7 +779,7 @@ public class Session {
*/
String getSendFileTitleKey() {
if (sendFileTitleKey == null)
- return "Session.sending";
+ return "Session.sending"; //$NON-NLS-1$
return sendFileTitleKey;
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java
index e69847c80..b8a9ebbe0 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java
@@ -36,11 +36,11 @@ public class AdminKSubstListener implements ICommandOutputListener {
public IStatus messageLine(String line, ICVSFolder commandRoot,
IProgressMonitor monitor) {
- if (line.startsWith("RCS file:")) { // $NON-NLS-1$
+ if (line.startsWith("RCS file:")) { //$NON-NLS-1$
String rcsFile = line.substring(10).trim();
- if (! rcsFile.endsWith(",v")) {
+ if (! rcsFile.endsWith(",v")) { //$NON-NLS-1$
return new CVSStatus(CVSStatus.ERROR,
- Policy.bind("AdminKSubstListener.expectedRCSFile", rcsFile));
+ Policy.bind("AdminKSubstListener.expectedRCSFile", rcsFile)); //$NON-NLS-1$
}
String remoteRootLocation = null;
try {
@@ -51,13 +51,13 @@ public class AdminKSubstListener implements ICommandOutputListener {
}
if (remoteRootLocation == null) {
return new CVSStatus(CVSStatus.ERROR,
- Policy.bind("AdminKSubstListener.commandRootNotManaged"));
+ Policy.bind("AdminKSubstListener.commandRootNotManaged")); //$NON-NLS-1$
}
IPath rcsFilePath = new Path(rcsFile.substring(0, rcsFile.length() - 2));
IPath remoteRootPath = new Path(remoteRootLocation);
if (! remoteRootPath.isPrefixOf(rcsFilePath)) {
return new CVSStatus(CVSStatus.ERROR,
- Policy.bind("AdminKSubstListener.expectedChildOfCommandRoot",
+ Policy.bind("AdminKSubstListener.expectedChildOfCommandRoot", //$NON-NLS-1$
rcsFilePath.toString(), remoteRootPath.toString()));
}
rcsFilePath = rcsFilePath.removeFirstSegments(remoteRootPath.segmentCount());
@@ -73,7 +73,7 @@ public class AdminKSubstListener implements ICommandOutputListener {
}
} catch (CVSException e) {
return new CVSStatus(CVSStatus.ERROR,
- Policy.bind("AdminKSubstListener.couldNotSetResourceSyncInfo",
+ Policy.bind("AdminKSubstListener.couldNotSetResourceSyncInfo", //$NON-NLS-1$
rcsFilePath.toString(), e.toString()));
}
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
index a3abc55b0..41a460eb9 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
@@ -38,7 +38,7 @@ public class TagListener implements ICommandOutputListener {
IProgressMonitor monitor) {
// Ignore the lines: Tagging folder1/folder2
- if( line.startsWith("cvs server: Tagging") ) {
+ if( line.startsWith("cvs server: Tagging") ) { //$NON-NLS-1$
return OK;
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
index bc7205d57..6a506ade7 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
@@ -36,7 +36,7 @@ import org.eclipse.team.internal.ccvs.core.util.EntryFileDateFormat;
*/
class EclipseFile extends EclipseResource implements ICVSFile {
- private static final String TEMP_FILE_EXTENSION = ".tmp";
+ private static final String TEMP_FILE_EXTENSION = ".tmp"; //$NON-NLS-1$
/**
* Create a handle based on the given local resource.
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
index d2e020ce8..0a24a38a2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
@@ -133,7 +133,7 @@ public class RemoteFolderTreeBuilder {
progress.beginTask(null, 100);
IProgressMonitor subProgress = Policy.infiniteSubMonitorFor(progress, 100);
subProgress.beginTask(null, 512); //$NON-NLS-1$
- subProgress.subTask(Policy.bind("RemoteFolderTreeBuilder.buildingBase", root.getName()));
+ subProgress.subTask(Policy.bind("RemoteFolderTreeBuilder.buildingBase", root.getName())); //$NON-NLS-1$
return builder.buildBaseTree(null, root, subProgress);
} finally {
progress.done();
@@ -400,7 +400,7 @@ public class RemoteFolderTreeBuilder {
if (newDirectory) {
// Record new directory with parent so it can be retrieved when building the parent
recordDelta(path, FOLDER, Update.STATE_NONE);
- monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", path.toString()));
+ monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", path.toString())); //$NON-NLS-1$
// Record new directory to be used as a parameter to fetch its contents
newChildDirectories.add(path.toString());
}
@@ -411,7 +411,7 @@ public class RemoteFolderTreeBuilder {
projectDoesNotExist = true;
} else {
recordDelta(path, DELETED, Update.STATE_NONE);
- monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", path.toString()));
+ monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", path.toString())); //$NON-NLS-1$
}
}
public void fileInformation(int type, String filename) {
@@ -435,13 +435,13 @@ public class RemoteFolderTreeBuilder {
case Update.STATE_REMOTE_CHANGES : // We have an remote change to an unmodified local file
changedFiles.add(filename);
recordDelta(new Path(filename), UNKNOWN, type);
- monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", filename));
+ monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", filename)); //$NON-NLS-1$
break;
}
}
public void fileDoesNotExist(String filename) {
recordDelta(new Path(filename), DELETED, Update.STATE_NONE);
- monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", filename));
+ monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", filename)); //$NON-NLS-1$
}
};
@@ -470,7 +470,7 @@ public class RemoteFolderTreeBuilder {
// Record new directory with parent so it can be retrieved when building the parent
// NOTE: Check path prefix
recordDelta(path, FOLDER, Update.STATE_NONE);
- monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", path.toString()));
+ monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", path.toString())); //$NON-NLS-1$
}
}
public void directoryDoesNotExist(IPath path) {
@@ -479,7 +479,7 @@ public class RemoteFolderTreeBuilder {
// NOTE: Check path prefix
changedFiles.add(filename);
recordDelta(new Path(filename), ADDED, type);
- monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", filename));
+ monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingDelta", filename)); //$NON-NLS-1$
}
public void fileDoesNotExist(String filename) {
}
@@ -524,7 +524,7 @@ public class RemoteFolderTreeBuilder {
public void fileStatus(IPath path, String remoteRevision) {
try {
updateRevision(path, remoteRevision);
- monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingRevision", path.toString()));
+ monitor.subTask(Policy.bind("RemoteFolderTreeBuilder.receivingRevision", path.toString())); //$NON-NLS-1$
count[0]++;
} catch (CVSException e) {
// The count will be off which will trigger another exception
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
index efed3e615..a4dbcce73 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
@@ -211,7 +211,7 @@ public class RemoteModule extends RemoteFolder {
// referencedFolders.addAll(Arrays.asList(child.getChildren()));
} else {
// XXX not expandable if child has local directory option (-d)
- if (Command.findOption(child.getLocalOptions(), "-d") != null) {
+ if (Command.findOption(child.getLocalOptions(), "-d") != null) { //$NON-NLS-1$
expandable = false;
} else {
referencedFolders.add(child);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
index ef2f21f10..bfa0007bf 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
@@ -163,6 +163,6 @@ public class FolderSyncInfo {
* @see Object#toString()
*/
public String toString() {
- return getRoot() + "/" + getRepository() + "/" + getTag();
+ return getRoot() + "/" + getRepository() + "/" + getTag(); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
index 02a758c57..b3a431464 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
@@ -143,7 +143,7 @@ public class ResourceSyncInfo {
*/
public boolean isNeedsMerge(String fileTimestamp) {
if(timeStamp.indexOf(RESULT_OF_MERGE_CONFLICT) != -1) {
- String t = timeStamp.substring(timeStamp.indexOf("+") + 1);
+ String t = timeStamp.substring(timeStamp.indexOf("+") + 1); //$NON-NLS-1$
return t.equals(fileTimestamp);
} else {
return false;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfoMap.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfoMap.java
index e586417a5..e423801b3 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfoMap.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfoMap.java
@@ -45,7 +45,7 @@ class ResourceSyncInfoMap {
}
public ResourceSyncInfo get(IResource resource) {
- int element = Arrays.binarySearch(elements, new ResourceSyncInfo(resource.getName(), "","","",null,null));
+ int element = Arrays.binarySearch(elements, new ResourceSyncInfo(resource.getName(), "","","",null,null));//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
if (element < 0)
return null;
// found element, return it
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java
index 093824571..f7b0cdaa0 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/Util.java
@@ -42,7 +42,7 @@ public class Util {
// Remove leading slash if there is one
String result = resourceName.substring(rootName.length()).replace('\\', '/');
- if (result.startsWith("/")) {
+ if (result.startsWith("/")) { //$NON-NLS-1$
result = result.substring(1);
}
return result;
@@ -78,7 +78,7 @@ public class Util {
int segments = path.segmentCount();
if(segments>split) {
IPath last = path.removeFirstSegments(segments - split);
- return "..." + path.SEPARATOR + last.toString();
+ return "..." + path.SEPARATOR + last.toString(); //$NON-NLS-1$
}
return path.toString();
} catch(CVSException e) {

Back to the top