diff options
| author | Philipe Mulet | 2001-08-20 15:46:56 +0000 |
|---|---|---|
| committer | Philipe Mulet | 2001-08-20 15:46:56 +0000 |
| commit | 80e0d457aedef28eadfc4c98a9da01d01535bc02 (patch) | |
| tree | 92ce0887ef0a6a98bdb3d9af24810d459fdc200a /org.eclipse.jdt.core/model/org/eclipse | |
| parent | e101217c42deede2cb1f132a8954e498c37abae3 (diff) | |
| download | eclipse.jdt.core-80e0d457aedef28eadfc4c98a9da01d01535bc02.tar.gz eclipse.jdt.core-80e0d457aedef28eadfc4c98a9da01d01535bc02.tar.xz eclipse.jdt.core-80e0d457aedef28eadfc4c98a9da01d01535bc02.zip | |
official non NLS tagsv_0_129_09_(2_0_stream)v_0_129
Diffstat (limited to 'org.eclipse.jdt.core/model/org/eclipse')
159 files changed, 865 insertions, 865 deletions
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java index b2a1737ec2..2df2d84d5e 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java @@ -169,20 +169,20 @@ private Flags() {} public static String toString(int flags) {
StringBuffer sb = new StringBuffer();
- if (isPublic(flags)) sb.append("public "/*nonNLS*/);
- if (isProtected(flags)) sb.append("protected "/*nonNLS*/);
- if (isPrivate(flags)) sb.append("private "/*nonNLS*/);
- if (isStatic(flags)) sb.append("static "/*nonNLS*/);
- if (isAbstract(flags)) sb.append("abstract "/*nonNLS*/);
- if (isFinal(flags)) sb.append("final "/*nonNLS*/);
- if (isNative(flags)) sb.append("native "/*nonNLS*/);
- if (isSynchronized(flags)) sb.append("synchronized "/*nonNLS*/);
- if (isTransient(flags)) sb.append("transient "/*nonNLS*/);
- if (isVolatile(flags)) sb.append("volatile "/*nonNLS*/);
- if (isStrictfp(flags)) sb.append("strictfp "/*nonNLS*/);
+ if (isPublic(flags)) sb.append("public "); //$NON-NLS-1$
+ if (isProtected(flags)) sb.append("protected "); //$NON-NLS-1$
+ if (isPrivate(flags)) sb.append("private "); //$NON-NLS-1$
+ if (isStatic(flags)) sb.append("static "); //$NON-NLS-1$
+ if (isAbstract(flags)) sb.append("abstract "); //$NON-NLS-1$
+ if (isFinal(flags)) sb.append("final "); //$NON-NLS-1$
+ if (isNative(flags)) sb.append("native "); //$NON-NLS-1$
+ if (isSynchronized(flags)) sb.append("synchronized "); //$NON-NLS-1$
+ if (isTransient(flags)) sb.append("transient "); //$NON-NLS-1$
+ if (isVolatile(flags)) sb.append("volatile "); //$NON-NLS-1$
+ if (isStrictfp(flags)) sb.append("strictfp "); //$NON-NLS-1$
int len = sb.length();
- if (len == 0) return ""/*nonNLS*/;
+ if (len == 0) return ""; //$NON-NLS-1$
sb.setLength(len-1);
return sb.toString();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java index 30af205c32..cbe4641c86 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java @@ -19,7 +19,7 @@ public interface IJavaModelMarker { * This can be used to recognize those markers in the workspace that flag problems
* detected by the Java tooling during compilation.
*/
- public static final String JAVA_MODEL_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".problem"/*nonNLS*/;
+ public static final String JAVA_MODEL_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".problem"; //$NON-NLS-1$
/**
@@ -28,19 +28,19 @@ public interface IJavaModelMarker { * problems detected by the Java tooling (such as a cycle in the build path, a problem
* detected by the outliner, or a problem detected during a code completion)
*/
- public static final String TRANSIENT_PROBLEM = JavaCore.PLUGIN_ID + ".transient_problem"/*nonNLS*/;
+ public static final String TRANSIENT_PROBLEM = JavaCore.PLUGIN_ID + ".transient_problem"; //$NON-NLS-1$
/**
* Id marker attribute (value <code>"id"</code>).
* Reserved for future use.
*/
- public static final String ID = "id"/*nonNLS*/;
+ public static final String ID = "id"; //$NON-NLS-1$
/**
* Flags marker attribute (value <code>"flags"</code>).
* Reserved for future use.
*/
- public static final String FLAGS = "flags"/*nonNLS*/;
+ public static final String FLAGS = "flags"; //$NON-NLS-1$
/**
* Cycle detected marker attribute (value <code>"cycleDetected"</code>).
@@ -48,11 +48,11 @@ public interface IJavaModelMarker { * The value of this attribute is the name of the project that caused a
* cycle in the projects classpaths.
*/
- public static final String CYCLE_DETECTED = "cycleDetected"/*nonNLS*/;
+ public static final String CYCLE_DETECTED = "cycleDetected"; //$NON-NLS-1$
/**
* Build path problem marker type (value <code>"org.eclipse.jdt.core.buildpath_problem"</code>).
* This can be used to recognize those markers in the workspace that flag problems
* detected by the Java tooling during classpath setting.
*/
- public static final String BUILDPATH_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".buildpath_problem"/*nonNLS*/;
+ public static final String BUILDPATH_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".buildpath_problem"; //$NON-NLS-1$
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java index fde463d5a8..a63f6098ad 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java @@ -31,7 +31,7 @@ public interface IPackageFragment extends IParent, IJavaElement, IOpenable, ISou * string, <code>""</code>).
* </p>
*/
- public static final String DEFAULT_PACKAGE_NAME = ""/*nonNLS*/;
+ public static final String DEFAULT_PACKAGE_NAME = ""; //$NON-NLS-1$
/**
* Returns whether this fragment contains at least one Java resource.
*/
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragmentRoot.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragmentRoot.java index ed893af0a2..9de4421155 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragmentRoot.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragmentRoot.java @@ -40,7 +40,7 @@ public interface IPackageFragmentRoot extends IParent, IJavaElement, IOpenable { /**
* Empty root path
*/
- String DEFAULT_PACKAGEROOT_PATH = ""/*nonNLS*/;
+ String DEFAULT_PACKAGEROOT_PATH = ""; //$NON-NLS-1$
/**
* Attaches the source archive identified by the given absolute path to this
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java index 9e7fdcd235..00aaca0e36 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java @@ -29,7 +29,7 @@ import org.eclipse.core.resources.*; */
public final class JavaConventions {
private final static char fgDot= '.';
- private final static String fgJAVA= "JAVA"/*nonNLS*/;
+ private final static String fgJAVA= "JAVA"; //$NON-NLS-1$
/**
* Not instantiable.
*/
@@ -48,8 +48,8 @@ public static boolean isOverlappingRoots(IPath rootPath1, IPath rootPath2) { }
String extension1 = rootPath1.getFileExtension();
String extension2 = rootPath2.getFileExtension();
- String jarExtension = "JAR"/*nonNLS*/;
- String zipExtension = "ZIP"/*nonNLS*/;
+ String jarExtension = "JAR"; //$NON-NLS-1$
+ String zipExtension = "ZIP"; //$NON-NLS-1$
if (extension1 != null && (extension1.equalsIgnoreCase(jarExtension) || extension1.equalsIgnoreCase(zipExtension))) {
return false;
}
@@ -111,14 +111,14 @@ private static char[] scannedIdentifier(String id) { */
public static IStatus validateCompilationUnitName(String name) {
if (name == null) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.unit.nullName"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.unit.nullName"), null); //$NON-NLS-1$
}
String extension;
String identifier;
int index;
index = name.indexOf('.');
if (index == -1) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.unit.notJavaName"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.unit.notJavaName"), null); //$NON-NLS-1$
}
identifier = name.substring(0, index);
extension = name.substring(index + 1);
@@ -127,9 +127,9 @@ public static IStatus validateCompilationUnitName(String name) { return status;
}
if (!Util.isJavaFileName(name)) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.unit.notJavaName"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.unit.notJavaName"), null); //$NON-NLS-1$
}
- return new Status(IStatus.OK, JavaCore.PLUGIN_ID, -1, "OK"/*nonNLS*/, null);
+ return new Status(IStatus.OK, JavaCore.PLUGIN_ID, -1, "OK", null); //$NON-NLS-1$
}
/**
* Validate the given field name.
@@ -159,9 +159,9 @@ public static IStatus validateFieldName(String name) { */
public static IStatus validateIdentifier(String id) {
if (scannedIdentifier(id) != null) {
- return new Status(IStatus.OK, JavaCore.PLUGIN_ID, -1, "OK"/*nonNLS*/, null);
+ return new Status(IStatus.OK, JavaCore.PLUGIN_ID, -1, "OK", null); //$NON-NLS-1$
} else {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.illegalIdentifier"/*nonNLS*/, id), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.illegalIdentifier", id), null); //$NON-NLS-1$
}
}
/**
@@ -178,13 +178,13 @@ public static IStatus validateIdentifier(String id) { */
public static IStatus validateImportDeclaration(String name) {
if (name == null || name.length() == 0) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.import.nullImport"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.import.nullImport"), null); //$NON-NLS-1$
}
if (name.charAt(name.length() - 1) == '*') {
if (name.charAt(name.length() - 2) == '.') {
return validatePackageName(name.substring(0, name.length() - 2));
} else {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.import.unqualifiedImport"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.import.unqualifiedImport"), null); //$NON-NLS-1$
}
}
return validatePackageName(name);
@@ -204,11 +204,11 @@ public static IStatus validateImportDeclaration(String name) { */
public static IStatus validateJavaTypeName(String name) {
if (name == null) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.nullName"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.nullName"), null); //$NON-NLS-1$
}
String trimmed = name.trim();
if (!name.equals(trimmed)) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.nameWithBlanks"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.nameWithBlanks"), null); //$NON-NLS-1$
}
int index = name.lastIndexOf('.');
char[] scannedID;
@@ -228,14 +228,14 @@ public static IStatus validateJavaTypeName(String name) { if (scannedID != null) {
if (CharOperation.contains('$', scannedID)) {
- return new Status(IStatus.WARNING, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.dollarName"/*nonNLS*/), null);
+ return new Status(IStatus.WARNING, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.dollarName"), null); //$NON-NLS-1$
}
if ((scannedID.length > 0 && Character.isLowerCase(scannedID[0]))) {
- return new Status(IStatus.WARNING, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.lowercaseName"/*nonNLS*/), null);
+ return new Status(IStatus.WARNING, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.lowercaseName"), null); //$NON-NLS-1$
}
- return new Status(IStatus.OK, JavaCore.PLUGIN_ID, -1, "OK"/*nonNLS*/, null);
+ return new Status(IStatus.OK, JavaCore.PLUGIN_ID, -1, "OK", null); //$NON-NLS-1$
} else {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.invalidName"/*nonNLS*/, name), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.type.invalidName", name), null); //$NON-NLS-1$
}
}
/**
@@ -266,22 +266,22 @@ public static IStatus validateMethodName(String name) { */
public static IStatus validatePackageName(String name) {
if (name == null) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.nullName"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.nullName"), null); //$NON-NLS-1$
}
int length;
if ((length = name.length()) == 0) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.emptyName"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.emptyName"), null); //$NON-NLS-1$
}
if (name.charAt(0) == fgDot || name.charAt(length-1) == fgDot) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.dotName"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.dotName"), null); //$NON-NLS-1$
}
if (Character.isWhitespace(name.charAt(0)) || Character.isWhitespace(name.charAt(name.length() - 1))) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.nameWithBlanks"/*nonNLS*/), null);;
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.nameWithBlanks"), null);; //$NON-NLS-1$
}
int dot = 0;
while (dot != -1 && dot < length-1) {
if ((dot = name.indexOf(fgDot, dot+1)) != -1 && dot < length-1 && name.charAt(dot+1) == fgDot) {
- return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.consecutiveDotsName"/*nonNLS*/), null);
+ return new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("convention.package.consecutiveDotsName"), null); //$NON-NLS-1$
}
}
StringTokenizer st = new StringTokenizer(name, new String(new char[] {fgDot}));
@@ -293,7 +293,7 @@ public static IStatus validatePackageName(String name) { return status;
}
}
- return new Status(IStatus.OK, JavaCore.PLUGIN_ID, -1, "OK"/*nonNLS*/, null);
+ return new Status(IStatus.OK, JavaCore.PLUGIN_ID, -1, "OK", null); //$NON-NLS-1$
}
/**
@@ -354,19 +354,19 @@ public static IJavaModelStatus validateClasspath(IJavaProject javaProject, IClas IClasspathEntry otherEntry = classpath[j];
if (entry != otherEntry && otherEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE){
if (entryPath.isPrefixOf(otherEntry.getPath())){
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.cannotNestSourceFolderInSource"/*nonNLS*/,entryPath.toString(), otherEntry.getPath().toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.cannotNestSourceFolderInSource",entryPath.toString(), otherEntry.getPath().toString())); //$NON-NLS-1$
}
}
}
}
// prevent nesting output location inside entry
if (entryPath.isPrefixOf(outputLocation)) {
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.cannotNestSourceFolderInOutput"/*nonNLS*/,entryPath.toString(), outputLocation.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.cannotNestSourceFolderInOutput",entryPath.toString(), outputLocation.toString())); //$NON-NLS-1$
}
// prevent nesting entry inside output location - when distinct from project or a source folder
if (!allowNestingInOutput && outputLocation.isPrefixOf(entryPath)) {
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.cannotNestOuputInSourceFolder"/*nonNLS*/, outputLocation.toString(), entryPath.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.cannotNestOuputInSourceFolder", outputLocation.toString(), entryPath.toString())); //$NON-NLS-1$
}
}
return JavaModelStatus.VERIFIED_OK;
@@ -388,11 +388,11 @@ public static IJavaModelStatus validateClasspath(IJavaProject javaProject, IClas if (path != null && path.segmentCount() >= 1){
entry = JavaCore.getResolvedClasspathEntry(entry);
if (entry == null){
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundVariablePath"/*nonNLS*/, path.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundVariablePath", path.toString())); //$NON-NLS-1$
}
return validateClasspathEntry(javaProject, entry, checkSourceAttachment);
} else {
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.illegalVariablePath"/*nonNLS*/, path.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.illegalVariablePath", path.toString())); //$NON-NLS-1$
}
// library entry check
@@ -405,12 +405,12 @@ public static IJavaModelStatus validateClasspath(IJavaProject javaProject, IClas switch(resolvedResource.getType()){
case IResource.FILE :
String extension = resolvedResource.getFileExtension();
- if ("jar"/*nonNLS*/.equalsIgnoreCase(extension) || "zip"/*nonNLS*/.equalsIgnoreCase(extension)){ // internal binary archive
+ if ("jar".equalsIgnoreCase(extension) || "zip".equalsIgnoreCase(extension)){ // internal binary archive //$NON-NLS-2$ //$NON-NLS-1$
if (checkSourceAttachment
&& sourceAttachment != null
&& !sourceAttachment.isEmpty()
&& JavaModel.getTarget(workspaceRoot, sourceAttachment, true) == null){
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundSourceAttachment"/*nonNLS*/, sourceAttachment.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundSourceAttachment", sourceAttachment.toString())); //$NON-NLS-1$
}
}
break;
@@ -419,7 +419,7 @@ public static IJavaModelStatus validateClasspath(IJavaProject javaProject, IClas && sourceAttachment != null
&& !sourceAttachment.isEmpty()
&& JavaModel.getTarget(workspaceRoot, sourceAttachment, true) == null){
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundSourceAttachment"/*nonNLS*/, sourceAttachment.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundSourceAttachment", sourceAttachment.toString())); //$NON-NLS-1$
}
}
} else if (target instanceof File){
@@ -427,13 +427,13 @@ public static IJavaModelStatus validateClasspath(IJavaProject javaProject, IClas && sourceAttachment != null
&& !sourceAttachment.isEmpty()
&& JavaModel.getTarget(workspaceRoot, sourceAttachment, true) == null){
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundSourceAttachment"/*nonNLS*/, sourceAttachment.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundSourceAttachment", sourceAttachment.toString())); //$NON-NLS-1$
}
} else {
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundLibrary"/*nonNLS*/, path.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundLibrary", path.toString())); //$NON-NLS-1$
}
} else {
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.illegalLibraryPath"/*nonNLS*/, path.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.illegalLibraryPath", path.toString())); //$NON-NLS-1$
}
break;
@@ -443,13 +443,13 @@ public static IJavaModelStatus validateClasspath(IJavaProject javaProject, IClas IProject project = workspaceRoot.getProject(path.segment(0));
try {
if (!project.exists() || !project.hasNature(JavaCore.NATURE_ID)){
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundProject"/*nonNLS*/, path.segment(0).toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundProject", path.segment(0).toString())); //$NON-NLS-1$
}
} catch (CoreException e){
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundProject"/*nonNLS*/, path.segment(0).toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundProject", path.segment(0).toString())); //$NON-NLS-1$
}
} else {
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.illegalProjectPath"/*nonNLS*/, path.segment(0).toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.illegalProjectPath", path.segment(0).toString())); //$NON-NLS-1$
}
break;
@@ -458,10 +458,10 @@ public static IJavaModelStatus validateClasspath(IJavaProject javaProject, IClas if (path != null && path.isAbsolute() && !path.isEmpty()) {
IPath projectPath= javaProject.getProject().getFullPath();
if (!projectPath.isPrefixOf(path) || JavaModel.getTarget(workspaceRoot, path, true) == null){
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundSourceFolder"/*nonNLS*/, path.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.unboundSourceFolder", path.toString())); //$NON-NLS-1$
}
} else {
- return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.illegalSourceFolderPath"/*nonNLS*/, path.toString()));
+ return new JavaModelStatus(IJavaModelStatusConstants.INVALID_CLASSPATH, Util.bind("classpath.illegalSourceFolderPath", path.toString())); //$NON-NLS-1$
}
break;
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java index c287a577d9..c146e33b88 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java @@ -49,20 +49,20 @@ public final class JavaCore extends Plugin implements IExecutableExtension { * The plug-in identifier of the Java core support
* (value <code>"org.eclipse.jdt.core"</code>).
*/
- public static final String PLUGIN_ID = "org.eclipse.jdt.core" /*nonNLS*/;
+ public static final String PLUGIN_ID = "org.eclipse.jdt.core" ; //$NON-NLS-1$
// getPlugin().getDescriptor().getUniqueIdentifier();
/**
* The identifier for the Java builder
* (value <code>"org.eclipse.jdt.core.javabuilder"</code>).
*/
- public static final String BUILDER_ID = PLUGIN_ID + ".javabuilder" /*nonNLS*/;
+ public static final String BUILDER_ID = PLUGIN_ID + ".javabuilder" ; //$NON-NLS-1$
/**
* The identifier for the Java model
* (value <code>"org.eclipse.jdt.core.javamodel"</code>).
*/
- public static final String MODEL_ID = PLUGIN_ID + ".javamodel" /*nonNLS*/;
+ public static final String MODEL_ID = PLUGIN_ID + ".javamodel" ; //$NON-NLS-1$
/**
* The identifier for the Java nature
@@ -72,13 +72,13 @@ public final class JavaCore extends Plugin implements IExecutableExtension { *
* @see org.eclipse.core.resources.IProject#hasNature
*/
- public static final String NATURE_ID = PLUGIN_ID + ".javanature" /*nonNLS*/;
+ public static final String NATURE_ID = PLUGIN_ID + ".javanature" ; //$NON-NLS-1$
/**
* Name of the handle id attribute in a Java marker
*/
private static final String ATT_HANDLE_ID =
- "org.eclipse.jdt.internal.core.JavaModelManager.handleId" /*nonNLS*/;
+ "org.eclipse.jdt.internal.core.JavaModelManager.handleId" ; //$NON-NLS-1$
private static Hashtable Variables = new Hashtable(5);
@@ -87,7 +87,7 @@ public final class JavaCore extends Plugin implements IExecutableExtension { */
// File containing default settings for configurable options
- private static final String JAVA_CORE_INIT = "JavaCore.ini"/*nonNLS*/;
+ private static final String JAVA_CORE_INIT = "JavaCore.ini"; //$NON-NLS-1$
/**
* Compiler options
@@ -132,7 +132,7 @@ public final class JavaCore extends Plugin implements IExecutableExtension { /**
* JavaCore options
*/
- public static final String OPTION_ComputeBuildOrder = "org.eclipse.jdt.core.JavaCore.computeJavaBuildOrder"/*nonNLS*/;
+ public static final String OPTION_ComputeBuildOrder = "org.eclipse.jdt.core.JavaCore.computeJavaBuildOrder"; //$NON-NLS-1$
/**
* Code Assist options
@@ -224,14 +224,14 @@ public final class JavaCore extends Plugin implements IExecutableExtension { String extension = file.getProjectRelativePath().getFileExtension();
if (extension != null) {
extension = extension.toLowerCase();
- if (extension.equals("java" /*nonNLS*/
+ if (extension.equals("java" //$NON-NLS-1$
)) {
return createCompilationUnitFrom(file);
- } else if (extension.equals("class" /*nonNLS*/
+ } else if (extension.equals("class" //$NON-NLS-1$
)) {
return createClassFileFrom(file);
- } else if (extension.equals("jar" /*nonNLS*/
- ) || extension.equals("zip" /*nonNLS*/
+ } else if (extension.equals("jar" //$NON-NLS-1$
+ ) || extension.equals("zip" //$NON-NLS-1$
)) {
return createJarPackageFragmentRootFrom(file);
}
@@ -428,7 +428,7 @@ public final class JavaCore extends Plugin implements IExecutableExtension { }
pkgName.append(segment);
if (j < pkgPath.segmentCount() - 1) {
- pkgName.append("." /*nonNLS*/);
+ pkgName.append("." ); //$NON-NLS-1$
}
}
return root.getPackageFragment(pkgName.toString());
@@ -551,8 +551,8 @@ public final class JavaCore extends Plugin implements IExecutableExtension { return JavaCore.newProjectEntry(resolvedPath); // internal project
case IResource.FILE :
String extension = resolvedResource.getFileExtension();
- if ("jar" /*nonNLS*/
- .equalsIgnoreCase(extension) || "zip" /*nonNLS*/
+ if ("jar" //$NON-NLS-1$
+ .equalsIgnoreCase(extension) || "zip" //$NON-NLS-1$
.equalsIgnoreCase(extension)) { // internal binary archive
return JavaCore.newLibraryEntry(
resolvedPath,
@@ -573,8 +573,8 @@ public final class JavaCore extends Plugin implements IExecutableExtension { File externalFile = (File) target;
if (externalFile.isFile()) {
String fileName = externalFile.getName().toLowerCase();
- if (fileName.endsWith(".jar" /*nonNLS*/
- ) || fileName.endsWith(".zip" /*nonNLS*/
+ if (fileName.endsWith(".jar" //$NON-NLS-1$
+ ) || fileName.endsWith(".zip" //$NON-NLS-1$
)) { // external binary archive
return JavaCore.newLibraryEntry(
resolvedPath,
@@ -683,7 +683,7 @@ public final class JavaCore extends Plugin implements IExecutableExtension { IPath sourceAttachmentRootPath) {
Assert.isTrue(
path.isAbsolute(),
- Util.bind("classpath.needAbsolutePath" /*nonNLS*/));
+ Util.bind("classpath.needAbsolutePath" )); //$NON-NLS-1$
return new ClasspathEntry(
IPackageFragmentRoot.K_BINARY,
IClasspathEntry.CPE_LIBRARY,
@@ -708,7 +708,7 @@ public final class JavaCore extends Plugin implements IExecutableExtension { public static IClasspathEntry newProjectEntry(IPath path) {
Assert.isTrue(
path.isAbsolute(),
- Util.bind("classpath.needAbsolutePath" /*nonNLS*/));
+ Util.bind("classpath.needAbsolutePath" )); //$NON-NLS-1$
return new ClasspathEntry(
IPackageFragmentRoot.K_SOURCE,
IClasspathEntry.CPE_PROJECT,
@@ -737,7 +737,7 @@ public final class JavaCore extends Plugin implements IExecutableExtension { public static IClasspathEntry newSourceEntry(IPath path) {
Assert.isTrue(
path.isAbsolute(),
- Util.bind("classpath.needAbsolutePath" /*nonNLS*/));
+ Util.bind("classpath.needAbsolutePath" )); //$NON-NLS-1$
return new ClasspathEntry(
IPackageFragmentRoot.K_SOURCE,
IClasspathEntry.CPE_SOURCE,
@@ -781,7 +781,7 @@ public final class JavaCore extends Plugin implements IExecutableExtension { IPath sourceAttachmentRootPath) {
Assert.isTrue(
variablePath != null && variablePath.segmentCount() >= 1,
- Util.bind("classpath.illegalVariablePath" /*nonNLS*/));
+ Util.bind("classpath.illegalVariablePath" )); //$NON-NLS-1$
return new ClasspathEntry(
IPackageFragmentRoot.K_SOURCE,
IClasspathEntry.CPE_VARIABLE,
@@ -886,7 +886,7 @@ public final class JavaCore extends Plugin implements IExecutableExtension { IProgressMonitor monitor)
throws JavaModelException {
- Assert.isTrue(path != null, Util.bind("classpath.nullVariablePath" /*nonNLS*/));
+ Assert.isTrue(path != null, Util.bind("classpath.nullVariablePath" )); //$NON-NLS-1$
updateVariableValue(variableName, path, monitor);
}
@@ -1306,8 +1306,8 @@ public final class JavaCore extends Plugin implements IExecutableExtension { new InputStreamReader(JavaCore.class.getResourceAsStream(JAVA_CORE_INIT)));
String line = reader.readLine();
while (line != null) {
- int equalIndex = line.indexOf("=" /*nonNLS*/);
- if (!line.startsWith("#" /*nonNLS*/) && equalIndex != -1) {
+ int equalIndex = line.indexOf("=" ); //$NON-NLS-1$
+ if (!line.startsWith("#" ) && equalIndex != -1) { //$NON-NLS-1$
String id = line.substring(0, equalIndex).trim();
ConfigurableOption option = new ConfigurableOption(id, locale);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaModelException.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaModelException.java index e7017e5071..0a6ba96945 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaModelException.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaModelException.java @@ -98,13 +98,13 @@ public boolean isDoesNotExist() { */
public String toString() {
StringBuffer buffer= new StringBuffer();
- buffer.append("Java Model Exception: "/*nonNLS*/);
+ buffer.append("Java Model Exception: "); //$NON-NLS-1$
if (getException() != null) {
if (getException() instanceof CoreException) {
CoreException c= (CoreException)getException();
- buffer.append("Core Exception [code "/*nonNLS*/);
+ buffer.append("Core Exception [code "); //$NON-NLS-1$
buffer.append(c.getStatus().getCode());
- buffer.append("] "/*nonNLS*/);
+ buffer.append("] "); //$NON-NLS-1$
buffer.append(c.getStatus().getMessage());
} else {
buffer.append(getException().toString());
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java index 7a870dd705..0afa1ac33c 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java @@ -173,54 +173,54 @@ public final class Signature { * String constant for the signature of the primitive type boolean.
* Value is <code>"Z"</code>.
*/
- public static final String SIG_BOOLEAN = "Z"/*nonNLS*/;
+ public static final String SIG_BOOLEAN = "Z"; //$NON-NLS-1$
/**
* String constant for the signature of the primitive type byte.
* Value is <code>"B"</code>.
*/
- public static final String SIG_BYTE = "B"/*nonNLS*/;
+ public static final String SIG_BYTE = "B"; //$NON-NLS-1$
/**
* String constant for the signature of the primitive type char.
* Value is <code>"C"</code>.
*/
- public static final String SIG_CHAR = "C"/*nonNLS*/;
+ public static final String SIG_CHAR = "C"; //$NON-NLS-1$
/**
* String constant for the signature of the primitive type double.
* Value is <code>"D"</code>.
*/
- public static final String SIG_DOUBLE = "D"/*nonNLS*/;
+ public static final String SIG_DOUBLE = "D"; //$NON-NLS-1$
/**
* String constant for the signature of the primitive type float.
* Value is <code>"F"</code>.
*/
- public static final String SIG_FLOAT = "F"/*nonNLS*/;
+ public static final String SIG_FLOAT = "F"; //$NON-NLS-1$
/**
* String constant for the signature of the primitive type int.
* Value is <code>"I"</code>.
*/
- public static final String SIG_INT = "I"/*nonNLS*/;
+ public static final String SIG_INT = "I"; //$NON-NLS-1$
/**
* String constant for the signature of the primitive type long.
* Value is <code>"J"</code>.
*/
- public static final String SIG_LONG = "J"/*nonNLS*/;
+ public static final String SIG_LONG = "J"; //$NON-NLS-1$
/**
* String constant for the signature of the primitive type short.
* Value is <code>"S"</code>.
*/
- public static final String SIG_SHORT = "S"/*nonNLS*/;
+ public static final String SIG_SHORT = "S"; //$NON-NLS-1$
/** String constant for the signature of result type void.
* Value is <code>"V"</code>.
*/
- public static final String SIG_VOID = "V"/*nonNLS*/;
+ public static final String SIG_VOID = "V"; //$NON-NLS-1$
/**
* Not instantiable.
@@ -236,7 +236,7 @@ private static String arrayIfy(String typeName, int arrayCount) { StringBuffer sb = new StringBuffer(typeName.length() + arrayCount * 2);
sb.append(typeName);
for (int i = 0; i < arrayCount; ++i) {
- sb.append("[]"/*nonNLS*/);
+ sb.append("[]"); //$NON-NLS-1$
}
return sb.toString();
}
@@ -302,7 +302,7 @@ public static String createTypeSignature(char[] typeName, boolean isResolved) { return SIG_VOID;
case 6 :
if (typeName[0] == 'S' && typeName[1] == 't' && typeName[2] == 'r' && typeName[3] == 'i' && typeName[4] == 'n' && typeName[5] == 'g')
- if (!isResolved) return "QString;"/*nonNLS*/;
+ if (!isResolved) return "QString;"; //$NON-NLS-1$
break;
case 7 :
if (typeName[0] == 'b' && typeName[1] == 'o' && typeName[2] == 'o' && typeName[3] == 'l' && typeName[4] == 'e' && typeName[5] == 'a' && typeName[6] == 'n')
@@ -617,7 +617,7 @@ public static String[] getParameterTypes(String methodSignature) throws IllegalA public static String getQualifier(String name) {
int lastDot = name.lastIndexOf(C_DOT);
if (lastDot == -1) {
- return ""/*nonNLS*/;
+ return ""; //$NON-NLS-1$
}
return name.substring(0, lastDot);
}
@@ -715,7 +715,7 @@ public static String[] getSimpleNames(String name) { */
public static String toQualifiedName(String[] segments) {
if (segments.length == 0) {
- return ""/*nonNLS*/;
+ return ""; //$NON-NLS-1$
}
if (segments.length == 1) {
return segments[0];
@@ -755,28 +755,28 @@ public static String toQualifiedName(String[] segments) { public static String toString(String signature) throws IllegalArgumentException {
try {
if (signature.charAt(0) == C_PARAM_START) {
- return toString(signature, ""/*nonNLS*/, null, true, true);
+ return toString(signature, "", null, true, true); //$NON-NLS-1$
}
int arrayCount = getArrayCount(signature);
switch (signature.charAt(arrayCount)) {
case C_BOOLEAN :
- return arrayIfy("boolean"/*nonNLS*/, arrayCount);
+ return arrayIfy("boolean", arrayCount); //$NON-NLS-1$
case C_BYTE :
- return arrayIfy("byte"/*nonNLS*/, arrayCount);
+ return arrayIfy("byte", arrayCount); //$NON-NLS-1$
case C_CHAR :
- return arrayIfy("char"/*nonNLS*/, arrayCount);
+ return arrayIfy("char", arrayCount); //$NON-NLS-1$
case C_DOUBLE :
- return arrayIfy("double"/*nonNLS*/, arrayCount);
+ return arrayIfy("double", arrayCount); //$NON-NLS-1$
case C_FLOAT :
- return arrayIfy("float"/*nonNLS*/, arrayCount);
+ return arrayIfy("float", arrayCount); //$NON-NLS-1$
case C_INT :
- return arrayIfy("int"/*nonNLS*/, arrayCount);
+ return arrayIfy("int", arrayCount); //$NON-NLS-1$
case C_LONG :
- return arrayIfy("long"/*nonNLS*/, arrayCount);
+ return arrayIfy("long", arrayCount); //$NON-NLS-1$
case C_SHORT :
- return arrayIfy("short"/*nonNLS*/, arrayCount);
+ return arrayIfy("short", arrayCount); //$NON-NLS-1$
case C_VOID :
- return arrayIfy("void"/*nonNLS*/, arrayCount);
+ return arrayIfy("void", arrayCount); //$NON-NLS-1$
case C_RESOLVED :
case C_UNRESOLVED :
int semi = signature.indexOf(C_SEMICOLON, arrayCount + 1);
@@ -838,7 +838,7 @@ public static String toString(String methodSignature, String methodName, String[ sb.append(C_PARAM_START);
for (int i = 0; i < paramTypes.length; ++i) {
if (i != 0)
- sb.append(", "/*nonNLS*/);
+ sb.append(", "); //$NON-NLS-1$
String readableParamType = toString(paramTypes[i]);
if (!fullyQualifyTypeNames) {
int lastDot = readableParamType.lastIndexOf(C_DOT);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/DOMFactory.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/DOMFactory.java index bb561115f9..83758ed1b8 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/DOMFactory.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/DOMFactory.java @@ -47,7 +47,7 @@ public IDOMCompilationUnit createCompilationUnit(String sourceCode, String name) * Method declared on IDOMFactory.
*/
public IDOMField createField() {
- return createField("Object aField;"/*nonNLS*/+ JavaModelManager.LINE_SEPARATOR);
+ return createField("Object aField;"+ JavaModelManager.LINE_SEPARATOR); //$NON-NLS-1$
}
/* (non-Javadoc)
* Method declared on IDOMFactory.
@@ -77,7 +77,7 @@ public IDOMImport createImport(String sourceCode) { * Method declared on IDOMFactory.
*/
public IDOMInitializer createInitializer() {
- return createInitializer("static {}"/*nonNLS*/+ JavaModelManager.LINE_SEPARATOR);
+ return createInitializer("static {}"+ JavaModelManager.LINE_SEPARATOR); //$NON-NLS-1$
}
/* (non-Javadoc)
* Method declared on IDOMFactory.
@@ -92,7 +92,7 @@ public IDOMInitializer createInitializer(String sourceCode) { * Method declared on IDOMFactory.
*/
public IDOMMethod createMethod() {
- return createMethod("public void newMethod() {"/*nonNLS*/+ JavaModelManager.LINE_SEPARATOR+"}"/*nonNLS*/+ JavaModelManager.LINE_SEPARATOR);
+ return createMethod("public void newMethod() {"+ JavaModelManager.LINE_SEPARATOR+"}"+ JavaModelManager.LINE_SEPARATOR); //$NON-NLS-2$ //$NON-NLS-1$
}
/* (non-Javadoc)
* Method declared on IDOMFactory.
@@ -122,7 +122,7 @@ public IDOMPackage createPackage(String sourceCode) { * Method declared on IDOMFactory.
*/
public IDOMType createType() {
- return createType("public class AClass {"/*nonNLS*/+ JavaModelManager.LINE_SEPARATOR +"}"/*nonNLS*/+ JavaModelManager.LINE_SEPARATOR);
+ return createType("public class AClass {"+ JavaModelManager.LINE_SEPARATOR +"}"+ JavaModelManager.LINE_SEPARATOR); //$NON-NLS-2$ //$NON-NLS-1$
}
/* (non-Javadoc)
* Method declared on IDOMFactory.
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Assert.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Assert.java index 707494cf7b..8ad8792f2f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Assert.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Assert.java @@ -19,7 +19,7 @@ private Assert() { * @exception IllegalArgumentException if the legality test failed
*/
public static boolean isLegal(boolean expression) {
- return isLegal(expression, ""/*nonNLS*/);
+ return isLegal(expression, ""); //$NON-NLS-1$
}
/** Asserts that an argument is legal. If the given boolean is
* not <code>true</code>, an <code>IllegalArgumentException</code>
@@ -44,7 +44,7 @@ public static boolean isLegal(boolean expression, String message) { * @exception IllegalArgumentException if the object is <code>null</code>
*/
public static void isNotNull(Object object) {
- isNotNull(object, ""/*nonNLS*/);
+ isNotNull(object, ""); //$NON-NLS-1$
}
/** Asserts that the given object is not <code>null</code>. If this
* is not the case, some kind of unchecked exception is thrown.
@@ -56,7 +56,7 @@ public static void isNotNull(Object object) { */
public static void isNotNull(Object object, String message) {
if (object == null)
- throw new AssertionFailedException(Util.bind("assert.nullArgument"/*nonNLS*/,message));
+ throw new AssertionFailedException(Util.bind("assert.nullArgument",message)); //$NON-NLS-1$
}
/** Asserts that the given boolean is <code>true</code>. If this
* is not the case, some kind of unchecked exception is thrown.
@@ -66,7 +66,7 @@ public static void isNotNull(Object object, String message) { * if the check fails)
*/
public static boolean isTrue(boolean expression) {
- return isTrue(expression, ""/*nonNLS*/);
+ return isTrue(expression, ""); //$NON-NLS-1$
}
/** Asserts that the given boolean is <code>true</code>. If this
* is not the case, some kind of unchecked exception is thrown.
@@ -79,7 +79,7 @@ public static boolean isTrue(boolean expression) { */
public static boolean isTrue(boolean expression, String message) {
if (!expression)
- throw new AssertionFailedException(Util.bind("assert.failed"/*nonNLS*/, message));
+ throw new AssertionFailedException(Util.bind("assert.failed", message)); //$NON-NLS-1$
return expression;
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java index 7f9ec6723d..c1972e9062 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java @@ -21,11 +21,11 @@ public BasicCompilationUnit(char[] contents, String fileName) { this.contents = contents;
this.fileName = fileName.toCharArray();
- int start = fileName.lastIndexOf("/"/*nonNLS*/) + 1;
- if (start == 0 || start < fileName.lastIndexOf("\\"/*nonNLS*/))
- start = fileName.lastIndexOf("\\"/*nonNLS*/) + 1;
+ int start = fileName.lastIndexOf("/") + 1; //$NON-NLS-1$
+ if (start == 0 || start < fileName.lastIndexOf("\\")) //$NON-NLS-1$
+ start = fileName.lastIndexOf("\\") + 1; //$NON-NLS-1$
- int end = fileName.lastIndexOf("."/*nonNLS*/);
+ int end = fileName.lastIndexOf("."); //$NON-NLS-1$
if (end == -1)
end = fileName.length();
@@ -75,6 +75,6 @@ public char[] getMainTypeName() { return mainTypeName;
}
public String toString(){
- return "CompilationUnit: "/*nonNLS*/+new String(fileName);
+ return "CompilationUnit: "+new String(fileName); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java index 0616e24f54..2bf473bf2a 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java @@ -110,7 +110,7 @@ public String[] getParameterNames() throws JavaModelException { int paramCount = Signature.getParameterCount(new String(info.getMethodDescriptor()));
fParameterNames = new String[paramCount];
for (int i = 0; i < paramCount; i++) {
- fParameterNames[i] = "arg"/*nonNLS*/ + i;
+ fParameterNames[i] = "arg" + i; //$NON-NLS-1$
}
}
return fParameterNames;
@@ -151,18 +151,18 @@ public boolean isConstructor() throws JavaModelException { public String readableName() {
StringBuffer buffer = new StringBuffer(super.readableName());
- buffer.append("("/*nonNLS*/);
+ buffer.append("("); //$NON-NLS-1$
String[] parameterTypes = this.getParameterTypes();
int length;
if (parameterTypes != null && (length = parameterTypes.length) > 0) {
for (int i = 0; i < length; i++) {
buffer.append(Signature.toString(parameterTypes[i]));
if (i < length - 1) {
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", "); //$NON-NLS-1$
}
}
}
- buffer.append(")"/*nonNLS*/);
+ buffer.append(")"); //$NON-NLS-1$
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryType.java index 49dbcaf257..d71ce8ed06 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryType.java @@ -109,7 +109,7 @@ public IType getDeclaringType() { return null;
}
enclosingTypeName = ClassFile.unqualifiedName(enclosingTypeName);
- return getPackageFragment().getClassFile(new String(enclosingTypeName) + ".class"/*nonNLS*/).getType();
+ return getPackageFragment().getClassFile(new String(enclosingTypeName) + ".class").getType(); //$NON-NLS-1$
} catch (JavaModelException npe) {
return null;
}
@@ -231,7 +231,7 @@ public String[] getSuperInterfaceNames() throws JavaModelException { * @see IType#getType
*/
public IType getType(String name) {
- IClassFile classFile= getPackageFragment().getClassFile(getTypeQualifiedName() + "$"/*nonNLS*/ + name + ".class"/*nonNLS*/);
+ IClassFile classFile= getPackageFragment().getClassFile(getTypeQualifiedName() + "$" + name + ".class"); //$NON-NLS-2$ //$NON-NLS-1$
return new BinaryType(classFile, name);
}
/**
@@ -302,7 +302,7 @@ public ITypeHierarchy newTypeHierarchy(IProgressMonitor monitor) throws JavaMode */
public ITypeHierarchy newTypeHierarchy(IJavaProject project, IProgressMonitor monitor) throws JavaModelException {
if (project == null) {
- throw new IllegalArgumentException(Util.bind("hierarchy.nullProject"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("hierarchy.nullProject")); //$NON-NLS-1$
}
CreateTypeHierarchyOperation op= new CreateTypeHierarchyOperation(
this,
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Buffer.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Buffer.java index 150909f0e4..85b4c44149 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Buffer.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Buffer.java @@ -166,8 +166,8 @@ private String findLineSeparator(char[] text) { char currentChar = nextChar;
nextChar = i < length-1 ? text[i+1] : ' ';
switch (currentChar) {
- case '\n': return "\n"/*nonNLS*/;
- case '\r': return nextChar == '\n' ? "\r\n"/*nonNLS*/ : "\r"/*nonNLS*/;
+ case '\n': return "\n"; //$NON-NLS-1$
+ case '\r': return nextChar == '\n' ? "\r\n" : "\r"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
@@ -208,7 +208,7 @@ public char[] getCharacters() { */
public String getContents() {
if (fContents == null)
- return ""/*nonNLS*/;
+ return ""; //$NON-NLS-1$
synchronized (fLock) {
if (fGapStart < 0) {
return new String(fContents);
@@ -261,7 +261,7 @@ public IOpenable getOwner() { */
public String getText(int offset, int length) {
if (fContents == null)
- return ""/*nonNLS*/;
+ return ""; //$NON-NLS-1$
synchronized (fLock) {
if (offset + length < fGapStart)
return new String(fContents, offset, length);
@@ -616,19 +616,19 @@ public String toString() { char[] contents = this.getCharacters();
int length = contents.length;
StringBuffer buffer = new StringBuffer(length);
- buffer.append("Buffer:\n"/*nonNLS*/);
+ buffer.append("Buffer:\n"); //$NON-NLS-1$
for (int i = 0; i < length; i++) {
char car = contents[i];
switch (car) {
case '\n':
- buffer.append("\\n\n"/*nonNLS*/);
+ buffer.append("\\n\n"); //$NON-NLS-1$
break;
case '\r':
if (i < length-1 && contents[i+1] == '\n') {
- buffer.append("\\r\\n\n"/*nonNLS*/);
+ buffer.append("\\r\\n\n"); //$NON-NLS-1$
i++;
} else {
- buffer.append("\\r\n"/*nonNLS*/);
+ buffer.append("\\r\n"); //$NON-NLS-1$
}
break;
default:
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFile.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFile.java index a956b0d46b..d4c5da52e2 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFile.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFile.java @@ -33,7 +33,7 @@ public class ClassFile extends Openable implements IClassFile { protected ClassFile(IPackageFragment parent, String name) {
super(CLASS_FILE, parent, name);
if (!Util.isClassFileName(name)) {
- throw new IllegalArgumentException(Util.bind("element.invalidClassFileName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.invalidClassFileName")); //$NON-NLS-1$
}
}
/**
@@ -42,7 +42,7 @@ protected ClassFile(IPackageFragment parent, String name) { public void codeComplete(int offset, ICodeCompletionRequestor requestor) throws JavaModelException {
String source = getSource();
if (source != null) {
- BasicCompilationUnit cu = new BasicCompilationUnit(getSource().toCharArray(), getElementName() + ".java"/*nonNLS*/);
+ BasicCompilationUnit cu = new BasicCompilationUnit(getSource().toCharArray(), getElementName() + ".java"); //$NON-NLS-1$
codeComplete(cu, cu, offset, requestor);
}
}
@@ -56,7 +56,7 @@ public IJavaElement[] codeSelect(int offset, int length) throws JavaModelExcepti contents = buffer.getCharacters();
String name = getElementName();
name = name.substring(0, name.length() - 6); // remove ".class"
- name = name + ".java"/*nonNLS*/;
+ name = name + ".java"; //$NON-NLS-1$
BasicCompilationUnit cu = new BasicCompilationUnit(contents, name);
return super.codeSelect(cu, offset, length);
} else {
@@ -141,7 +141,7 @@ private IBinaryType getBinaryTypeInfo(IFile file) throws JavaModelException { zip = root.getJar();
String entryName = getParent().getElementName();
entryName = entryName.replace('.', '/');
- if (entryName.equals(""/*nonNLS*/)) {
+ if (entryName.equals("")) { //$NON-NLS-1$
entryName += getElementName();
} else {
entryName += '/' + getElementName();
@@ -278,7 +278,7 @@ public IType getType() throws JavaModelException { public WorkingCopy getWorkingCopy() {
String name = getElementName();
name = name.substring(0, name.length() - 6); // remove ".class"
- name = name + ".java"/*nonNLS*/;
+ name = name + ".java"; //$NON-NLS-1$
return new WorkingCopy((IPackageFragment) getParent(), name);
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java index 2db5ba76dd..35ca099896 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java @@ -73,7 +73,7 @@ private void generateInnerClassInfos(IType type, IBinaryType typeInfo, Hashtable for (int i = 0, typeCount = innerTypes.length; i < typeCount; i++) {
IBinaryNestedType binaryType = innerTypes[i];
String innerQualifiedName = new String(binaryType.getName());
- IClassFile classFile= ((IPackageFragment)fClassFile.getParent()).getClassFile(new String(ClassFile.unqualifiedName(binaryType.getName())) + ".class"/*nonNLS*/);
+ IClassFile classFile= ((IPackageFragment)fClassFile.getParent()).getClassFile(new String(ClassFile.unqualifiedName(binaryType.getName())) + ".class"); //$NON-NLS-1$
IType innerType = new BinaryType(classFile, new String(ClassFile.simpleName(binaryType.getName())));
children.addElement(innerType);
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java index 8ec95adbbd..d0a65fd757 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java @@ -170,38 +170,38 @@ public String toString() { buffer.append('[');
switch (getEntryKind()) {
case IClasspathEntry.CPE_LIBRARY:
- buffer.append("CPE_LIBRARY"/*nonNLS*/);
+ buffer.append("CPE_LIBRARY"); //$NON-NLS-1$
break;
case IClasspathEntry.CPE_PROJECT:
- buffer.append("CPE_PROJECT"/*nonNLS*/);
+ buffer.append("CPE_PROJECT"); //$NON-NLS-1$
break;
case IClasspathEntry.CPE_SOURCE:
- buffer.append("CPE_SOURCE"/*nonNLS*/);
+ buffer.append("CPE_SOURCE"); //$NON-NLS-1$
break;
case IClasspathEntry.CPE_VARIABLE:
- buffer.append("CPE_VARIABLE"/*nonNLS*/);
+ buffer.append("CPE_VARIABLE"); //$NON-NLS-1$
break;
}
- buffer.append("]["/*nonNLS*/);
+ buffer.append("]["); //$NON-NLS-1$
switch (getContentKind()) {
case IPackageFragmentRoot.K_BINARY:
- buffer.append("K_BINARY"/*nonNLS*/);
+ buffer.append("K_BINARY"); //$NON-NLS-1$
break;
case IPackageFragmentRoot.K_SOURCE:
- buffer.append("K_SOURCE"/*nonNLS*/);
+ buffer.append("K_SOURCE"); //$NON-NLS-1$
break;
case ClasspathEntry.K_OUTPUT:
- buffer.append("K_OUTPUT"/*nonNLS*/);
+ buffer.append("K_OUTPUT"); //$NON-NLS-1$
break;
}
buffer.append(']');
if (getSourceAttachmentPath() != null){
- buffer.append("[sourcePath:"/*nonNLS*/);
+ buffer.append("[sourcePath:"); //$NON-NLS-1$
buffer.append(getSourceAttachmentPath());
buffer.append(']');
}
if (getSourceAttachmentRootPath() != null){
- buffer.append("[rootPath:"/*nonNLS*/);
+ buffer.append("[rootPath:"); //$NON-NLS-1$
buffer.append(getSourceAttachmentRootPath());
buffer.append(']');
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CommitWorkingCopyOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CommitWorkingCopyOperation.java index 28d5127d25..b42b95fc1d 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CommitWorkingCopyOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CommitWorkingCopyOperation.java @@ -86,7 +86,7 @@ private void checkPackageDeclaration(ICompilationUnit cu) * of the original compilation unit fails
*/
protected void executeOperation() throws JavaModelException {
- beginTask(Util.bind("workingCopy.commit"/*nonNLS*/), 2);
+ beginTask(Util.bind("workingCopy.commit"), 2); //$NON-NLS-1$
ICompilationUnit copy = getCompilationUnit();
ICompilationUnit original = (ICompilationUnit) copy.getOriginalElement();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java index 8372504636..266d4a93c5 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java @@ -34,7 +34,7 @@ public class CompilationUnit extends Openable implements ICompilationUnit, org.e protected CompilationUnit(IPackageFragment parent, String name) {
super(COMPILATION_UNIT, parent, name);
if (!Util.isJavaFileName(name)) {
- throw new IllegalArgumentException(Util.bind("convention.unit.notJavaName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("convention.unit.notJavaName")); //$NON-NLS-1$
}
}
/**
@@ -77,7 +77,7 @@ public void commit(boolean force, IProgressMonitor monitor) throws JavaModelExce */
public void copy(IJavaElement container, IJavaElement sibling, String rename, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (container == null) {
- throw new IllegalArgumentException(Util.bind("operation.nullContainer"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("operation.nullContainer")); //$NON-NLS-1$
}
IJavaElement[] elements = new IJavaElement[] {this};
IJavaElement[] containers = new IJavaElement[] {container};
@@ -120,10 +120,10 @@ public IType createType(String content, IJavaElement sibling, boolean force, IPr if (!exists()) {
//autogenerate this compilation unit
IPackageFragment pkg = (IPackageFragment) getParent();
- String source = ""/*nonNLS*/;
+ String source = ""; //$NON-NLS-1$
if (pkg.getElementName().length() > 0) {
//not the default package...add the package declaration
- source = "package "/*nonNLS*/ + pkg.getElementName() + ";"/*nonNLS*/ + JavaModelManager.LINE_SEPARATOR;
+ source = "package " + pkg.getElementName() + ";" + JavaModelManager.LINE_SEPARATOR; //$NON-NLS-1$ //$NON-NLS-2$
}
CreateCompilationUnitOperation op = new CreateCompilationUnitOperation(pkg, fName, source, force);
runOperation(op, monitor);
@@ -173,7 +173,7 @@ protected boolean equalsDOMNode(IDOMNode node) throws JavaModelException { } else {
// iterate through all the types inside the receiver and see if one of them can fit
IType[] types = getTypes();
- String typeNodeName = nodeName.substring(0, nodeName.indexOf(".java"/*nonNLS*/));
+ String typeNodeName = nodeName.substring(0, nodeName.indexOf(".java")); //$NON-NLS-1$
for (int i = 0, max = types.length; i < max; i++) {
if (types[i].getElementName().equals(typeNodeName)) {
return true;
@@ -378,7 +378,7 @@ public ReferenceInfo getReferenceInfo() throws JavaModelException { */
public String getSource() throws JavaModelException {
IBuffer buffer = getBuffer();
- if (buffer == null) return ""/*nonNLS*/;
+ if (buffer == null) return ""; //$NON-NLS-1$
return buffer.getContents();
}
/**
@@ -470,7 +470,7 @@ public void makeConsistent(IProgressMonitor pm) throws JavaModelException { */
public void move(IJavaElement container, IJavaElement sibling, String rename, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (container == null) {
- throw new IllegalArgumentException(Util.bind("operation.nullContainer"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("operation.nullContainer")); //$NON-NLS-1$
}
IJavaElement[] elements= new IJavaElement[] {this};
IJavaElement[] containers= new IJavaElement[] {container};
@@ -540,7 +540,7 @@ public IMarker[] reconcile() throws JavaModelException { */
public void rename(String name, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("operation.nullName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("operation.nullName")); //$NON-NLS-1$
}
IJavaElement[] elements= new IJavaElement[] {this};
IJavaElement[] dests= new IJavaElement[] {this.getParent()};
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java index acecc72b22..db6f62978d 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java @@ -148,7 +148,7 @@ public void acceptConstructorReference(char[] typeName, int argCount, int source addReference(ReferenceInfo.REFTYPE_call, name);
}
else {
- String name = "<"/*nonNLS*/ + new String(typeName) + ">/"/*nonNLS*/ + argCount;
+ String name = "<" + new String(typeName) + ">/" + argCount; //$NON-NLS-2$ //$NON-NLS-1$
addReference(ReferenceInfo.REFTYPE_call, name.toCharArray());
}
}
@@ -178,7 +178,7 @@ public void acceptImport(int declarationStart, int declarationEnd, char[] name, // tack on the '.*' if it is onDemand
String importName;
if (onDemand) {
- importName= new String(name) + ".*"/*nonNLS*/;
+ importName= new String(name) + ".*"; //$NON-NLS-1$
} else {
importName= new String(name);
}
@@ -239,7 +239,7 @@ public void acceptMethodReference(char[] methodName, int argCount, int sourcePos addReference(ReferenceInfo.REFTYPE_call, name);
}
else {
- String name = new String(methodName) + "/"/*nonNLS*/ + argCount;
+ String name = new String(methodName) + "/" + argCount; //$NON-NLS-1$
addReference(ReferenceInfo.REFTYPE_call, name.toCharArray());
}
}
@@ -559,13 +559,13 @@ protected void enterType( if (fPackageName == null) {
qualifiedName= nameString.toCharArray();
} else {
- qualifiedName= (new String(fPackageName) + "."/*nonNLS*/ + nameString).toCharArray();
+ qualifiedName= (new String(fPackageName) + "." + nameString).toCharArray(); //$NON-NLS-1$
}
}
else if (parentHandle.getElementType() == IJavaElement.TYPE) {
handle = ((IType) parentHandle).getType(nameString);
enclosingTypeName= ((SourceTypeElementInfo)parentInfo).getName();
- qualifiedName= (new String(((SourceTypeElementInfo)parentInfo).getQualifiedName()) + "."/*nonNLS*/ + nameString).toCharArray();
+ qualifiedName= (new String(((SourceTypeElementInfo)parentInfo).getQualifiedName()) + "." + nameString).toCharArray(); //$NON-NLS-1$
}
else {
Assert.isTrue(false); // Should not happen
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyElementsOperation.java index 4858baf980..724206ef5b 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyElementsOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyElementsOperation.java @@ -68,7 +68,7 @@ public CopyElementsOperation(IJavaElement[] elementsToCopy, IJavaElement destCon * for progress monitoring.
*/
protected String getMainTaskName() {
- return Util.bind("operation.copyElementProgress"/*nonNLS*/);
+ return Util.bind("operation.copyElementProgress"); //$NON-NLS-1$
}
/**
* Returns the nested operation to use for processing this element
@@ -83,7 +83,7 @@ protected JavaModelOperation getNestedOperation(IJavaElement element) { return new CreateImportOperation(element.getElementName(), (ICompilationUnit) dest);
case IJavaElement.TYPE :
if (isRenamingMainType(element, dest)) {
- return new RenameResourceElementsOperation(new IJavaElement[] {dest}, new IJavaElement[] {dest.getParent()}, new String[]{getNewNameFor(element) + ".java"/*nonNLS*/}, fForce);
+ return new RenameResourceElementsOperation(new IJavaElement[] {dest}, new IJavaElement[] {dest.getParent()}, new String[]{getNewNameFor(element) + ".java"}, fForce); //$NON-NLS-1$
} else {
return new CreateTypeOperation(dest, getSourceFor(element) + JavaModelManager.LINE_SEPARATOR, fForce);
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java index 3fe95cd814..4c4ae12c1c 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java @@ -159,7 +159,7 @@ private JavaElementDelta getDeltaFor(IJavaProject javaProject) { * @see MultiOperation
*/
protected String getMainTaskName() {
- return Util.bind("operation.copyResourceProgress"/*nonNLS*/);
+ return Util.bind("operation.copyResourceProgress"); //$NON-NLS-1$
}
/**
* Sets the deltas to register the changes resulting from this operation
@@ -342,7 +342,7 @@ private void processPackageFragmentResource(IPackageFragment source, IPackageFra }
if (!newFrag.getElementName().equals(source.getElementName())) { // if package has been renamed, update the compilation units
for (int i = 0; i < resources.length; i++) {
- if (resources[i].getName().endsWith(".java"/*nonNLS*/)) {
+ if (resources[i].getName().endsWith(".java")) { //$NON-NLS-1$
// we only consider potential compilation units
ICompilationUnit cu = newFrag.getCompilationUnit(resources[i].getName());
IDOMCompilationUnit domCU = fFactory.createCompilationUnit(cu.getSource(), cu.getElementName());
@@ -428,7 +428,7 @@ private void updatePackageStatement(IDOMCompilationUnit domCU, String pkgName) t if (!seenPackageNode && !defaultPackage) {
//the cu was in a default package...no package declaration
//create the new package declaration as the first child of the cu
- IDOMPackage pkg = fFactory.createPackage("package "/*nonNLS*/ + pkgName + ";"/*nonNLS*/ + JavaModelManager.LINE_SEPARATOR);
+ IDOMPackage pkg = fFactory.createPackage("package " + pkgName + ";" + JavaModelManager.LINE_SEPARATOR); //$NON-NLS-1$ //$NON-NLS-2$
domCU.getFirstChild().insertSibling(pkg);
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateCompilationUnitOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateCompilationUnitOperation.java index 2a8ce5ffbe..8cf623a0e1 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateCompilationUnitOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateCompilationUnitOperation.java @@ -54,7 +54,7 @@ public CreateCompilationUnitOperation(IPackageFragment parentElement, String nam * @exception JavaModelException if unable to create the compilation unit.
*/
protected void executeOperation() throws JavaModelException {
- beginTask(Util.bind("operation.createUnitProgress"/*nonNLS*/), 2);
+ beginTask(Util.bind("operation.createUnitProgress"), 2); //$NON-NLS-1$
JavaElementDelta delta = newJavaElementDelta();
ICompilationUnit unit = getCompilationUnit();
IPackageFragment pkg = (IPackageFragment) getParentElement();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateFieldOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateFieldOperation.java index 79ab766ce7..ff09cc85a8 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateFieldOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateFieldOperation.java @@ -55,7 +55,7 @@ protected IJavaElement generateResultHandle() { * @see CreateElementInCUOperation#getMainTaskName
*/
public String getMainTaskName(){
- return Util.bind("operation.createFieldProgress"/*nonNLS*/);
+ return Util.bind("operation.createFieldProgress"); //$NON-NLS-1$
}
/**
* By default the new field is positioned after the last existing field
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateImportOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateImportOperation.java index f40b1fb73a..9111d8d0a8 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateImportOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateImportOperation.java @@ -72,7 +72,7 @@ protected IJavaElement generateResultHandle() { * @see CreateElementInCUOperation#getMainTaskName
*/
public String getMainTaskName(){
- return Util.bind("operation.createImportsProgress"/*nonNLS*/);
+ return Util.bind("operation.createImportsProgress"); //$NON-NLS-1$
}
/**
* Sets the correct position for the new import:<ul>
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java index 436ee5ad48..b16e479082 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java @@ -78,7 +78,7 @@ protected IJavaElement generateResultHandle() { * @see CreateElementInCUOperation#getMainTaskName
*/
public String getMainTaskName(){
- return Util.bind("operation.createInitializerProgress"/*nonNLS*/);
+ return Util.bind("operation.createInitializerProgress"); //$NON-NLS-1$
}
/**
* By default the new initializer is positioned after the last existing initializer
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateMethodOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateMethodOperation.java index d99a852b86..9ce66ac772 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateMethodOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateMethodOperation.java @@ -79,7 +79,7 @@ protected IJavaElement generateResultHandle() { * @see CreateElementInCUOperation#getMainTaskName
*/
public String getMainTaskName(){
- return Util.bind("operation.createMethodProgress"/*nonNLS*/);
+ return Util.bind("operation.createMethodProgress"); //$NON-NLS-1$
}
/**
* @see CreateTypeMemberOperation#verifyNameCollision
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java index 14fd9662ab..4d90298755 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java @@ -72,7 +72,7 @@ protected IJavaElement generateResultHandle() { * @see CreateElementInCUOperation#getMainTaskName
*/
public String getMainTaskName(){
- return Util.bind("operation.createPackageProgress"/*nonNLS*/);
+ return Util.bind("operation.createPackageProgress"); //$NON-NLS-1$
}
/**
* Sets the correct position for new package declaration:<ul>
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java index 8e9c69ec77..3be9920f1f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java @@ -54,9 +54,9 @@ protected void executeOperation() throws JavaModelException { JavaElementDelta delta = newJavaElementDelta();
IPackageFragmentRoot root = (IPackageFragmentRoot) getParentElement();
String[] names = Signature.getSimpleNames(fName);
- beginTask(Util.bind("operation.createPackageFragmentProgress"/*nonNLS*/), names.length);
+ beginTask(Util.bind("operation.createPackageFragmentProgress"), names.length); //$NON-NLS-1$
IContainer parentFolder = (IContainer) root.getUnderlyingResource();
- String sideEffectPackageName = ""/*nonNLS*/;
+ String sideEffectPackageName = ""; //$NON-NLS-1$
Vector resultElements = new Vector(names.length);
int i;
for (i = 0; i < names.length; i++) {
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java index 58e4d3c878..a0b02ced12 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java @@ -64,11 +64,11 @@ protected void generateNewCompilationUnitDOM(ICompilationUnit cu) throws JavaMod protected IDOMNode generateSyntaxIncorrectDOM() throws JavaModelException {
//create some dummy source to generate a dom node
StringBuffer buff = new StringBuffer();
- buff.append(JavaModelManager.LINE_SEPARATOR + " public class A {"/*nonNLS*/ + JavaModelManager.LINE_SEPARATOR);
+ buff.append(JavaModelManager.LINE_SEPARATOR + " public class A {" + JavaModelManager.LINE_SEPARATOR); //$NON-NLS-1$
buff.append(fSource);
buff.append(JavaModelManager.LINE_SEPARATOR).append('}');
- IDOMCompilationUnit domCU = (new DOMFactory()).createCompilationUnit(buff.toString(), "A.java"/*nonNLS*/);
- IDOMNode node = (IDOMNode) domCU.getChild("A"/*nonNLS*/).getChildren().nextElement();
+ IDOMCompilationUnit domCU = (new DOMFactory()).createCompilationUnit(buff.toString(), "A.java"); //$NON-NLS-1$
+ IDOMNode node = (IDOMNode) domCU.getChild("A").getChildren().nextElement(); //$NON-NLS-1$
if (node != null) {
node.remove();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeOperation.java index 9a1a08d0bc..d3ac4f5a9f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeOperation.java @@ -58,7 +58,7 @@ protected IJavaElement generateResultHandle() { * @see CreateElementInCUOperation#getMainTaskName
*/
public String getMainTaskName(){
- return Util.bind("operation.createTypeProgress"/*nonNLS*/);
+ return Util.bind("operation.createTypeProgress"); //$NON-NLS-1$
}
/**
* Returns the <code>IType</code> the member is to be created in.
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java index 1f1a2e7b71..9b8474e228 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java @@ -60,7 +60,7 @@ protected void commitChanges(IDOMCompilationUnit cuDOM, ICompilationUnit cu) thr * @see MultiOperation
*/
protected String getMainTaskName() {
- return Util.bind("operation.deleteElementProgress"/*nonNLS*/);
+ return Util.bind("operation.deleteElementProgress"); //$NON-NLS-1$
}
/**
* Groups the elements to be processed by their compilation unit.
@@ -112,7 +112,7 @@ protected void processElement(IJavaElement element) throws JavaModelException { if (e.exists()) {
IDOMNode node = ((JavaElement) e).findNode(cuDOM);
// TBD
- Assert.isTrue(node != null, Util.bind("element.cannotLocate"/*nonNLS*/, e.getElementName(), cuDOM.getName()));
+ Assert.isTrue(node != null, Util.bind("element.cannotLocate", e.getElementName(), cuDOM.getName())); //$NON-NLS-1$
node.remove();
delta.removed(e);
if (e.getElementType() == IJavaElement.IMPORT_DECLARATION) {
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteResourceElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteResourceElementsOperation.java index 01cf6dbaf0..3bff201047 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteResourceElementsOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteResourceElementsOperation.java @@ -87,7 +87,7 @@ private void deletePackageFragment(IPackageFragment frag) * @see MultiOperation
*/
protected String getMainTaskName() {
- return Util.bind("operation.deleteResourceProgress"/*nonNLS*/);
+ return Util.bind("operation.deleteResourceProgress"); //$NON-NLS-1$
}
/**
* @see MultiOperation. This method delegate to <code>deleteResource</code> or
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java index 5b36f6f281..1e25eb503c 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java @@ -314,7 +314,7 @@ protected Openable[] createElements(IResource resource) { if (resource == null) return null;
String extension = resource.getFileExtension();
extension = extension == null ? null : extension.toLowerCase();
- if ("jar"/*nonNLS*/.equals(extension) || "zip"/*nonNLS*/.equals(extension)) {
+ if ("jar".equals(extension) || "zip".equals(extension)) { //$NON-NLS-2$ //$NON-NLS-1$
IJavaProject[] projects = null;
try {
projects = JavaModelManager.getJavaModel(resource.getWorkspace()).getJavaProjects();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportContainer.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportContainer.java index 99db352704..c78edf90dd 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportContainer.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportContainer.java @@ -13,7 +13,7 @@ import org.eclipse.jdt.core.*; */
public class ImportContainer extends SourceRefElement implements IImportContainer {
protected ImportContainer(ICompilationUnit parent) {
- super(IMPORT_CONTAINER, parent, ""/*nonNLS*/);
+ super(IMPORT_CONTAINER, parent, ""); //$NON-NLS-1$
}
/**
* @see JavaElement#getHandleMemento()
@@ -25,7 +25,7 @@ public String getHandleMemento(){ * @see JavaElement#getHandleMemento()
*/
protected char getHandleMementoDelimiter() {
- Assert.isTrue(false, Util.bind("assert.shouldNotImplement"/*nonNLS*/));
+ Assert.isTrue(false, Util.bind("assert.shouldNotImplement")); //$NON-NLS-1$
return 0;
}
/**
@@ -65,7 +65,7 @@ protected void toString(int tab, StringBuffer buffer) { if (info == null || !(info instanceof JavaElementInfo)) return;
IJavaElement[] children = ((JavaElementInfo)info).getChildren();
for (int i = 0; i < children.length; i++) {
- if (i > 0) buffer.append("\n"/*nonNLS*/);
+ if (i > 0) buffer.append("\n"); //$NON-NLS-1$
((JavaElement)children[i]).toString(tab, buffer);
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportDeclaration.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportDeclaration.java index bd6f12069c..bf4d453f20 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportDeclaration.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportDeclaration.java @@ -39,7 +39,7 @@ protected char getHandleMementoDelimiter() { * Returns true if the import is on-demand (ends with ".*")
*/
public boolean isOnDemand() {
- return fName.endsWith(".*"/*nonNLS*/);
+ return fName.endsWith(".*"); //$NON-NLS-1$
}
/**
*/
@@ -51,10 +51,10 @@ public String readableName() { * @private Debugging purposes
*/
protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
- buffer.append("import "/*nonNLS*/);
+ buffer.append("import "); //$NON-NLS-1$
buffer.append(getElementName());
if (info == null) {
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Initializer.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Initializer.java index 9bcbca58d5..9ac3a7dbc3 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Initializer.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Initializer.java @@ -18,7 +18,7 @@ import org.eclipse.jdt.core.jdom.IDOMNode; /* package */ class Initializer extends Member implements IInitializer {
protected Initializer(IType parent, int occurrenceCount) {
- super(INITIALIZER, parent, ""/*nonNLS*/);
+ super(INITIALIZER, parent, ""); //$NON-NLS-1$
// 0 is not valid: this first occurrence is occurrence 1.
if (occurrenceCount <= 0)
throw new IllegalArgumentException();
@@ -70,16 +70,16 @@ public void rename(String name, boolean force, IProgressMonitor monitor) throws */
protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
if (info == null) {
- buffer.append("<initializer>"/*nonNLS*/);
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append("<initializer>"); //$NON-NLS-1$
+ buffer.append(" (not open)"); //$NON-NLS-1$
} else {
try {
if (Flags.isStatic(this.getFlags())) {
- buffer.append("static "/*nonNLS*/);
+ buffer.append("static "); //$NON-NLS-1$
}
- buffer.append("initializer"/*nonNLS*/);
+ buffer.append("initializer"); //$NON-NLS-1$
} catch (JavaModelException e) {
- buffer.append("<JavaModelException in toString of "/*nonNLS*/ + getElementName());
+ buffer.append("<JavaModelException in toString of " + getElementName()); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarEntryFile.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarEntryFile.java index 72d09145f5..147314e3ed 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarEntryFile.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarEntryFile.java @@ -62,6 +62,6 @@ public boolean isReadOnly() { * @see IStorage#isReadOnly()
*/
public String toString() {
- return "JarEntryFile["/*nonNLS*/+this.zipName+"::"/*nonNLS*/+this.entryName+"]"/*nonNLS*/;
+ return "JarEntryFile["+this.zipName+"::"+this.entryName+"]"; //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java index 945ac02508..00a545db43 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java @@ -65,7 +65,7 @@ public class JarPackageFragmentRoot extends PackageFragmentRoot { try {
verifyAttachSource(zipPath);
if (monitor != null) {
- monitor.beginTask(Util.bind("element.attachingSource"/*nonNLS*/), 2);
+ monitor.beginTask(Util.bind("element.attachingSource"), 2); //$NON-NLS-1$
}
SourceMapper mapper= null;
SourceMapper oldMapper= getSourceMapper();
@@ -377,14 +377,14 @@ public IClasspathEntry findSourceAttachmentRecommendation() { Object target = JavaModel.getTarget(workspaceRoot, entry.getSourceAttachmentPath(), true);
if (target instanceof IFile){
IFile file = (IFile) target;
- if ("jar"/*nonNLS*/.equalsIgnoreCase(file.getFileExtension()) || "zip"/*nonNLS*/.equalsIgnoreCase(file.getFileExtension())){
+ if ("jar".equalsIgnoreCase(file.getFileExtension()) || "zip".equalsIgnoreCase(file.getFileExtension())){ //$NON-NLS-2$ //$NON-NLS-1$
return entry;
}
}
if (target instanceof java.io.File){
java.io.File file = (java.io.File) target;
String name = file.getName();
- if (Util.endsWithIgnoreCase(name, ".jar"/*nonNLS*/) || Util.endsWithIgnoreCase(name, ".zip"/*nonNLS*/)){
+ if (Util.endsWithIgnoreCase(name, ".jar") || Util.endsWithIgnoreCase(name, ".zip")){ //$NON-NLS-2$ //$NON-NLS-1$
return entry;
}
}
@@ -405,14 +405,14 @@ public IClasspathEntry findSourceAttachmentRecommendation() { if (target instanceof IFile){
IFile file = (IFile) target;
String name = file.getName();
- if (Util.endsWithIgnoreCase(name, ".jar"/*nonNLS*/) || Util.endsWithIgnoreCase(name, ".zip"/*nonNLS*/)){
+ if (Util.endsWithIgnoreCase(name, ".jar") || Util.endsWithIgnoreCase(name, ".zip")){ //$NON-NLS-2$ //$NON-NLS-1$
return entry;
}
}
if (target instanceof java.io.File){
java.io.File file = (java.io.File) target;
String name = file.getName();
- if (Util.endsWithIgnoreCase(name, ".jar"/*nonNLS*/) || Util.endsWithIgnoreCase(name, ".zip"/*nonNLS*/)){
+ if (Util.endsWithIgnoreCase(name, ".jar") || Util.endsWithIgnoreCase(name, ".zip")){ //$NON-NLS-2$ //$NON-NLS-1$
return entry;
}
}
@@ -503,7 +503,7 @@ public IClasspathEntry findSourceAttachmentRecommendation() { if (recommendation != null){
propertyString = recommendation.getSourceAttachmentPath().toString()
+ ATTACHMENT_PROPERTY_DELIMITER
- + (recommendation.getSourceAttachmentRootPath() == null ? ""/*nonNLS*/ : recommendation.getSourceAttachmentRootPath().toString());
+ + (recommendation.getSourceAttachmentRootPath() == null ? "" : recommendation.getSourceAttachmentRootPath().toString()); //$NON-NLS-1$
getWorkspace().getRoot().setPersistentProperty(qName, propertyString);
}
}
@@ -520,7 +520,7 @@ public IClasspathEntry findSourceAttachmentRecommendation() { ZipFile jarFile = null;
try {
jarFile = getJar();
- return new QualifiedName(JavaCore.PLUGIN_ID, "sourceattachment: "/*nonNLS*/ + jarFile.getName());
+ return new QualifiedName(JavaCore.PLUGIN_ID, "sourceattachment: " + jarFile.getName()); //$NON-NLS-1$
} catch (CoreException e) {
throw new JavaModelException(e);
} finally {
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElement.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElement.java index 88b1181f69..bc883d4625 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElement.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElement.java @@ -77,7 +77,7 @@ public abstract class JavaElement extends PlatformObject implements IJavaElement */
protected JavaElement(int type, IJavaElement parent, String name) throws IllegalArgumentException {
if (type < JAVA_MODEL || type > IMPORT_DECLARATION) {
- throw new IllegalArgumentException(Util.bind("element.invalidType"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.invalidType")); //$NON-NLS-1$
}
fLEType= type;
fParent= parent;
@@ -516,7 +516,7 @@ protected void setOccurrenceCount(int count) { protected String tabString(int tab) {
StringBuffer buffer = new StringBuffer();
for (int i = tab; i > 0; i--)
- buffer.append(" "/*nonNLS*/);
+ buffer.append(" "); //$NON-NLS-1$
return buffer.toString();
}
/**
@@ -554,11 +554,11 @@ protected void toString(int tab, StringBuffer buffer) { protected void toStringAncestors(StringBuffer buffer) {
JavaElement parent = (JavaElement)this.getParent();
if (parent != null) {
- buffer.append(" [in "/*nonNLS*/);
+ buffer.append(" [in "); //$NON-NLS-1$
Object parentInfo = fgJavaModelManager.getInfo(parent);
parent.toStringInfo(0, buffer, parentInfo);
parent.toStringAncestors(buffer);
- buffer.append("]"/*nonNLS*/);
+ buffer.append("]"); //$NON-NLS-1$
}
}
/**
@@ -568,7 +568,7 @@ protected void toStringChildren(int tab, StringBuffer buffer, Object info) { if (info == null || !(info instanceof JavaElementInfo)) return;
IJavaElement[] children = ((JavaElementInfo)info).getChildren();
for (int i = 0; i < children.length; i++) {
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n"); //$NON-NLS-1$
((JavaElement)children[i]).toString(tab + 1, buffer);
}
}
@@ -578,7 +578,7 @@ protected void toStringChildren(int tab, StringBuffer buffer, Object info) { protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
buffer.append(getElementName());
if (info == null) {
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
}
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDelta.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDelta.java index 35fd0e08dc..4722567ab2 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDelta.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDelta.java @@ -477,7 +477,7 @@ public String toDebugString(int depth) { buffer.append('\t');
}
buffer.append(((JavaElement)getElement()).toDebugString());
- buffer.append("["/*nonNLS*/);
+ buffer.append("["); //$NON-NLS-1$
switch (getKind()) {
case IJavaElementDelta.ADDED :
buffer.append('+');
@@ -492,68 +492,68 @@ public String toDebugString(int depth) { buffer.append('?');
break;
}
- buffer.append("]: {"/*nonNLS*/);
+ buffer.append("]: {"); //$NON-NLS-1$
int changeFlags = getFlags();
boolean prev = false;
if ((changeFlags & IJavaElementDelta.F_CHILDREN) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("CHILDREN"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("CHILDREN"); //$NON-NLS-1$
prev = true;
}
if ((changeFlags & IJavaElementDelta.F_CONTENT) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("CONTENT"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("CONTENT"); //$NON-NLS-1$
prev = true;
}
if ((changeFlags & IJavaElementDelta.F_MOVED_FROM) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("MOVED_FROM("/*nonNLS*/ + ((JavaElement)getMovedFromElement()).toDebugString() + ")"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("MOVED_FROM(" + ((JavaElement)getMovedFromElement()).toDebugString() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
prev = true;
}
if ((changeFlags & IJavaElementDelta.F_MOVED_TO) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("MOVED_TO("/*nonNLS*/ + ((JavaElement)getMovedToElement()).toDebugString() + ")"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("MOVED_TO(" + ((JavaElement)getMovedToElement()).toDebugString() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
prev = true;
}
if ((changeFlags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("ADDED TO CLASSPATH"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("ADDED TO CLASSPATH"); //$NON-NLS-1$
prev = true;
}
if ((changeFlags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("REMOVED FROM CLASSPATH"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("REMOVED FROM CLASSPATH"); //$NON-NLS-1$
prev = true;
}
if ((changeFlags & IJavaElementDelta.F_CLASSPATH_REORDER) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("REORDERED IN CLASSPATH"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("REORDERED IN CLASSPATH"); //$NON-NLS-1$
prev = true;
}
if ((changeFlags & IJavaElementDelta.F_MODIFIERS) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("MODIFIERS CHANGED"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("MODIFIERS CHANGED"); //$NON-NLS-1$
prev = true;
}
if ((changeFlags & IJavaElementDelta.F_SUPER_TYPES) != 0) {
if (prev)
- buffer.append(" | "/*nonNLS*/);
- buffer.append("SUPER TYPES CHANGED"/*nonNLS*/);
+ buffer.append(" | "); //$NON-NLS-1$
+ buffer.append("SUPER TYPES CHANGED"); //$NON-NLS-1$
prev = true;
}
- buffer.append("}"/*nonNLS*/);
+ buffer.append("}"); //$NON-NLS-1$
IJavaElementDelta[] children = getAffectedChildren();
if (children != null) {
for (int i = 0; i < children.length; ++i) {
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n"); //$NON-NLS-1$
buffer.append(((JavaElementDelta) children[i]).toDebugString(depth + 1));
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDeltaBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDeltaBuilder.java index 3a9be1d0d8..d9621d5d84 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDeltaBuilder.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDeltaBuilder.java @@ -422,7 +422,7 @@ private void removeElementInfo(IJavaElement element) { }
public String toString() {
StringBuffer buffer = new StringBuffer();
- buffer.append("Built delta:\n"/*nonNLS*/);
+ buffer.append("Built delta:\n"); //$NON-NLS-1$
buffer.append(this.delta.toString());
return buffer.toString();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModel.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModel.java index f981477e49..37685b6849 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModel.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModel.java @@ -35,7 +35,7 @@ public class JavaModel extends Openable implements IJavaModel { * @exception Error if called more than once
*/
protected JavaModel(IWorkspace workspace) throws Error {
- super(JAVA_MODEL, null, ""/*nonNLS*/ /*workspace has empty name*/);
+ super(JAVA_MODEL, null, "" /*workspace has empty name*/); //$NON-NLS-1$
this.workspace = workspace;
}
private void cleanupCycleMarkers() {
@@ -104,7 +104,7 @@ protected int computeDepth(String projectName, StringHashtableOfInt depthTable, IMarker marker = this.workspace.getRoot().getProject(dependentProjectName).createMarker(IJavaModelMarker.TRANSIENT_PROBLEM);
marker.setAttributes(
new String[]{ IMarker.MESSAGE, IMarker.PRIORITY, IMarker.LOCATION, IJavaModelMarker.CYCLE_DETECTED},
- new Object[]{ Util.bind("classpath.cycle"/*nonNLS*/), new Integer(IMarker.PRIORITY_HIGH), dependentProjectName, dependentProjectName});
+ new Object[]{ Util.bind("classpath.cycle"), new Integer(IMarker.PRIORITY_HIGH), dependentProjectName, dependentProjectName}); //$NON-NLS-1$
} catch (CoreException e) {
e.printStackTrace();
}
@@ -373,7 +373,7 @@ public String getHandleMemento(){ * contribution to a memento.
*/
protected char getHandleMementoDelimiter(){
- Assert.isTrue(false, Util.bind("assert.shouldNotImplement"/*nonNLS*/));
+ Assert.isTrue(false, Util.bind("assert.shouldNotImplement")); //$NON-NLS-1$
return 0;
}
/**
@@ -410,7 +410,7 @@ public IJavaProject getJavaProject(IResource resource) { } else if (resource.getType() == IResource.PROJECT) {
return new JavaProject((IProject)resource, this);
} else {
- throw new IllegalArgumentException(Util.bind("element.invalidResourceForProject"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.invalidResourceForProject")); //$NON-NLS-1$
}
}
/**
@@ -480,9 +480,9 @@ protected void runOperation(MultiOperation op, IJavaElement[] elements, IJavaEle * @private Debugging purposes
*/
protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
- buffer.append("Java Model"/*nonNLS*/);
+ buffer.append("Java Model"); //$NON-NLS-1$
if (info == null) {
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java index 924726ebd9..480efcba7f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java @@ -102,12 +102,12 @@ public class JavaModelManager implements IResourceChangeListener, ISaveParticipa /**
* Local Java workspace properties file name (generated inside JavaCore plugin state location)
*/
- private static final String WKS_PROP_FILENAME= "workspace.properties"/*nonNLS*/;
+ private static final String WKS_PROP_FILENAME= "workspace.properties"; //$NON-NLS-1$
/**
* Name of the handle id attribute in a Java marker
*/
- private static final String ATT_HANDLE_ID= "org.eclipse.jdt.internal.core.JavaModelManager.handleId"/*nonNLS*/;
+ private static final String ATT_HANDLE_ID= "org.eclipse.jdt.internal.core.JavaModelManager.handleId"; //$NON-NLS-1$
/**
* Table from IProject to PerProjectInfo.
@@ -138,7 +138,7 @@ public class JavaModelManager implements IResourceChangeListener, ISaveParticipa /**
* Line separator to use throughout the JavaModel for any source edit operation
*/
- public static String LINE_SEPARATOR = System.getProperty("line.separator"/*nonNLS*/);
+ public static String LINE_SEPARATOR = System.getProperty("line.separator"); //$NON-NLS-1$
/**
* Constructs a new JavaModelManager
*/
@@ -287,7 +287,7 @@ public void doneSaving(ISaveContext context){ return null;
}
JavaModel model= (JavaModel) getJavaModel(workspace);
- if (memento.equals(""/*nonNLS*/)){ // workspace memento
+ if (memento.equals("")){ // workspace memento //$NON-NLS-1$
return model;
}
int modelEnd= memento.indexOf(JavaElement.JEM_JAVAPROJECT);
@@ -388,7 +388,7 @@ public void doneSaving(ISaveContext context){ try {
modelInfo.fJavaModel.close();
} catch (JavaModelException e) {
- Assert.isTrue(false, Util.bind("element.onlyOneJavaModel"/*nonNLS*/));
+ Assert.isTrue(false, Util.bind("element.onlyOneJavaModel")); //$NON-NLS-1$
return null;
}
}
@@ -396,7 +396,7 @@ public void doneSaving(ISaveContext context){ if (modelInfo == null || modelInfo.workspace.equals(workspace)) {
return new JavaModel(workspace);
} else {
- Assert.isTrue(false, Util.bind("element.onlyOneJavaModel"/*nonNLS*/));
+ Assert.isTrue(false, Util.bind("element.onlyOneJavaModel")); //$NON-NLS-1$
return null;
}
@@ -422,7 +422,7 @@ public void doneSaving(ISaveContext context){ if (state == null && JavaBuilder.SAVE_ENABLED && !info.triedRead) {
info.triedRead= true;
try {
- if (monitor != null) monitor.subTask(Util.bind("build.readStateProgress"/*nonNLS*/, project.getName()));
+ if (monitor != null) monitor.subTask(Util.bind("build.readStateProgress", project.getName())); //$NON-NLS-1$
state= readState(info);
info.setLastBuiltState(state);
} catch (CoreException e) {
@@ -467,12 +467,12 @@ public void doneSaving(ISaveContext context){ if (!project.exists()) return null;
IPluginDescriptor descr= JavaCore.getJavaCore().getDescriptor();
IPath workingLocation= project.getPluginWorkingLocation(descr);
- return workingLocation.append("state.dat"/*nonNLS*/).toFile();
+ return workingLocation.append("state.dat").toFile(); //$NON-NLS-1$
}
public String getVariablesAsXMLString() throws CoreException {
Document document = new DocumentImpl();
- Element rootElement = document.createElement("variables"/*nonNLS*/);
+ Element rootElement = document.createElement("variables"); //$NON-NLS-1$
document.appendChild(rootElement);
String[] variables = JavaCore.getClasspathVariableNames();
@@ -480,9 +480,9 @@ public void doneSaving(ISaveContext context){ for (int i= 0; i < variables.length; ++i) {
String var = variables[i];
IPath varPath = JavaCore.getClasspathVariable(var);
- Element varElement= document.createElement("variable"/*nonNLS*/);
- varElement.setAttribute("name"/*nonNLS*/, var);
- varElement.setAttribute("path"/*nonNLS*/, varPath.toString());
+ Element varElement= document.createElement("variable"); //$NON-NLS-1$
+ varElement.setAttribute("name", var); //$NON-NLS-1$
+ varElement.setAttribute("path", varPath.toString()); //$NON-NLS-1$
rootElement.appendChild(varElement);
}
@@ -503,7 +503,7 @@ public void doneSaving(ISaveContext context){ public String getOptionsAsXMLString() throws CoreException {
Document document = new DocumentImpl();
- Element rootElement = document.createElement("options"/*nonNLS*/);
+ Element rootElement = document.createElement("options"); //$NON-NLS-1$
document.appendChild(rootElement);
String[] ids = JavaCore.getOptionIDs();
@@ -511,13 +511,13 @@ public void doneSaving(ISaveContext context){ for (int i= 0; i < ids.length; ++i) {
ConfigurableOption option = (ConfigurableOption)fOptions.get(ids[i]);
- Element optionElement= document.createElement("option"/*nonNLS*/);
- optionElement.setAttribute("id"/*nonNLS*/, ids[i]);
+ Element optionElement= document.createElement("option"); //$NON-NLS-1$
+ optionElement.setAttribute("id", ids[i]); //$NON-NLS-1$
if(option.getPossibleValues() == ConfigurableOption.NoDiscreteValue){
- optionElement.setAttribute("value"/*nonNLS*/, option.getValue());
+ optionElement.setAttribute("value", option.getValue()); //$NON-NLS-1$
}
else{
- optionElement.setAttribute("index"/*nonNLS*/, String.valueOf(option.getValueIndex()));
+ optionElement.setAttribute("index", String.valueOf(option.getValueIndex())); //$NON-NLS-1$
}
rootElement.appendChild(optionElement);
}
@@ -560,7 +560,7 @@ public void doneSaving(ISaveContext context){ } else if (!path.isAbsolute()) {
file= root.getFile(path);
if (file == null || file.getType() != IResource.FILE) {
- throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("file.notFound"/*nonNLS*/), null));
+ throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("file.notFound"), null)); //$NON-NLS-1$
}
ensureLocal(file);
fileSystemPath= file.getLocation().toOSString();
@@ -571,7 +571,7 @@ public void doneSaving(ISaveContext context){ try {
return new ZipFile(fileSystemPath);
} catch (IOException e) {
- throw new CoreException(new Status(Status.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("status.IOException"/*nonNLS*/), e));
+ throw new CoreException(new Status(Status.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("status.IOException"), e)); //$NON-NLS-1$
}
}
/**
@@ -591,7 +591,7 @@ public void doneSaving(ISaveContext context){ public void loadVariables() throws CoreException {
String xmlString = ResourcesPlugin.getWorkspace().getRoot().getPersistentProperty(
- new QualifiedName(JavaCore.PLUGIN_ID, "variables"/*nonNLS*/));
+ new QualifiedName(JavaCore.PLUGIN_ID, "variables")); //$NON-NLS-1$
try {
if (xmlString != null) readVariables(xmlString);
} catch(IOException e){
@@ -601,7 +601,7 @@ public void doneSaving(ISaveContext context){ public void loadOptions() throws CoreException {
String xmlString = ResourcesPlugin.getWorkspace().getRoot().getPersistentProperty(
- new QualifiedName(JavaCore.PLUGIN_ID, "options"/*nonNLS*/));
+ new QualifiedName(JavaCore.PLUGIN_ID, "options")); //$NON-NLS-1$
try {
if (xmlString != null) readOptions(xmlString);
} catch(IOException e){
@@ -696,13 +696,13 @@ public void prepareToSave(ISaveContext context) throws CoreException { try {
String pluginID= in.readUTF();
if (!pluginID.equals(JavaCore.PLUGIN_ID))
- throw new IOException(Util.bind("build.wrongFileFormat"/*nonNLS*/));
+ throw new IOException(Util.bind("build.wrongFileFormat")); //$NON-NLS-1$
String kind= in.readUTF();
- if (!kind.equals("STATE"/*nonNLS*/))
- throw new IOException(Util.bind("build.wrongFileFormat"/*nonNLS*/));
+ if (!kind.equals("STATE")) //$NON-NLS-1$
+ throw new IOException(Util.bind("build.wrongFileFormat")); //$NON-NLS-1$
int version= in.readInt();
if (version != 0x0001)
- throw new IOException(Util.bind("build.unhandledVersionFormat"/*nonNLS*/));
+ throw new IOException(Util.bind("build.unhandledVersionFormat")); //$NON-NLS-1$
boolean hasState= in.readBoolean();
IState state= null;
if (hasState) {
@@ -733,7 +733,7 @@ public void prepareToSave(ISaveContext context) throws CoreException { reader.close();
}
if (cpElement == null) return;
- if (!cpElement.getNodeName().equalsIgnoreCase("variables"/*nonNLS*/)) {
+ if (!cpElement.getNodeName().equalsIgnoreCase("variables")) { //$NON-NLS-1$
return;
}
NodeList list= cpElement.getChildNodes();
@@ -744,9 +744,9 @@ public void prepareToSave(ISaveContext context) throws CoreException { short type= node.getNodeType();
if (type == Node.ELEMENT_NODE) {
Element element= (Element) node;
- if (element.getNodeName().equalsIgnoreCase("variable"/*nonNLS*/)) {
- String varName = element.getAttribute("name"/*nonNLS*/);
- String varPath = element.getAttribute("path"/*nonNLS*/);
+ if (element.getNodeName().equalsIgnoreCase("variable")) { //$NON-NLS-1$
+ String varName = element.getAttribute("name"); //$NON-NLS-1$
+ String varPath = element.getAttribute("path"); //$NON-NLS-1$
try {
JavaCore.setClasspathVariable(varName, new Path(varPath), null);
} catch(JavaModelException e){
@@ -775,7 +775,7 @@ public void prepareToSave(ISaveContext context) throws CoreException { reader.close();
}
if (cpElement == null) return;
- if (!cpElement.getNodeName().equalsIgnoreCase("options"/*nonNLS*/)) {
+ if (!cpElement.getNodeName().equalsIgnoreCase("options")) { //$NON-NLS-1$
return;
}
NodeList list= cpElement.getChildNodes();
@@ -785,18 +785,18 @@ public void prepareToSave(ISaveContext context) throws CoreException { short type= node.getNodeType();
if (type == Node.ELEMENT_NODE) {
Element element= (Element) node;
- if (element.getNodeName().equalsIgnoreCase("option"/*nonNLS*/)) {
- String id = element.getAttribute("id"/*nonNLS*/);
+ if (element.getNodeName().equalsIgnoreCase("option")) { //$NON-NLS-1$
+ String id = element.getAttribute("id"); //$NON-NLS-1$
ConfigurableOption option = (ConfigurableOption) fOptions.get(id);
String[] possible = option.getPossibleValues();
if(possible == ConfigurableOption.NoDiscreteValue){
- String value = element.getAttribute("value"/*nonNLS*/);
+ String value = element.getAttribute("value"); //$NON-NLS-1$
option.setValue(value);
}
else {
try {
- int valueIndex = Integer.parseInt(element.getAttribute("index"/*nonNLS*/));
+ int valueIndex = Integer.parseInt(element.getAttribute("index")); //$NON-NLS-1$
option.setValueIndex(valueIndex);
} catch(NumberFormatException e){
}
@@ -957,7 +957,7 @@ public void rollback(ISaveContext context){ if (vStats != null) {
IStatus[] stats= new IStatus[vStats.size()];
vStats.copyInto(stats);
- throw new CoreException(new MultiStatus(JavaCore.PLUGIN_ID, IStatus.ERROR, stats, Util.bind("build.cannotSaveStates"/*nonNLS*/), null));
+ throw new CoreException(new MultiStatus(JavaCore.PLUGIN_ID, IStatus.ERROR, stats, Util.bind("build.cannotSaveStates"), null)); //$NON-NLS-1$
}
}
/**
@@ -965,7 +965,7 @@ public void rollback(ISaveContext context){ */
private void saveState(PerProjectInfo info) throws CoreException {
- if (VERBOSE) System.out.println(Util.bind("build.saveStateProgress"/*nonNLS*/, info.project.getName()));
+ if (VERBOSE) System.out.println(Util.bind("build.saveStateProgress", info.project.getName())); //$NON-NLS-1$
long t= System.currentTimeMillis();
File file= getSerializationFile(info.project);
if (file == null) return;
@@ -973,7 +973,7 @@ public void rollback(ISaveContext context){ DataOutputStream out= new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
try {
out.writeUTF(JavaCore.PLUGIN_ID);
- out.writeUTF("STATE"/*nonNLS*/);
+ out.writeUTF("STATE"); //$NON-NLS-1$
out.writeInt(0x0001);
IState state= info.getLastBuiltState();
if (state == null) {
@@ -990,16 +990,16 @@ public void rollback(ISaveContext context){ file.delete();
} catch(SecurityException se){
}
- throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, Util.bind("build.cannotSaveState"/*nonNLS*/, info.project.getName()), e));
+ throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, Util.bind("build.cannotSaveState", info.project.getName()), e)); //$NON-NLS-1$
} catch (IOException e) {
try {
file.delete();
} catch(SecurityException se){
}
- throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, Util.bind("build.cannotSaveState"/*nonNLS*/, info.project.getName()), e));
+ throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, Util.bind("build.cannotSaveState", info.project.getName()), e)); //$NON-NLS-1$
}
t= System.currentTimeMillis() - t;
- if (VERBOSE) System.out.println(Util.bind("build.saveStateComplete"/*nonNLS*/, String.valueOf(t)));
+ if (VERBOSE) System.out.println(Util.bind("build.saveStateComplete", String.valueOf(t))); //$NON-NLS-1$
}
/**
* Saves the built state for the project if it has been changed since last save.
@@ -1019,13 +1019,13 @@ public void rollback(ISaveContext context){ }
public void saveVariables() throws CoreException {
ResourcesPlugin.getWorkspace().getRoot().setPersistentProperty(
- new QualifiedName(JavaCore.PLUGIN_ID, "variables"/*nonNLS*/),
+ new QualifiedName(JavaCore.PLUGIN_ID, "variables"), //$NON-NLS-1$
getVariablesAsXMLString());
}
public void saveOptions() throws CoreException {
ResourcesPlugin.getWorkspace().getRoot().setPersistentProperty(
- new QualifiedName(JavaCore.PLUGIN_ID, "options"/*nonNLS*/),
+ new QualifiedName(JavaCore.PLUGIN_ID, "options"), //$NON-NLS-1$
getOptionsAsXMLString());
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java index 822686bbcd..ea18ad69d2 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java @@ -135,7 +135,7 @@ public void beginTask(String name, int totalWork) { */
protected void checkCanceled() {
if (isCanceled()) {
- throw new OperationCanceledException(Util.bind("operation.cancelled"/*nonNLS*/));
+ throw new OperationCanceledException(Util.bind("operation.cancelled")); //$NON-NLS-1$
}
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelStatus.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelStatus.java index c868e21682..b63aa41778 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelStatus.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelStatus.java @@ -52,13 +52,13 @@ public class JavaModelStatus extends Status implements IJavaModelStatus, IJavaMo */
public JavaModelStatus() {
// no code for an multi-status
- super(ERROR, JavaCore.PLUGIN_ID, 0, "JavaModelStatus"/*nonNLS*/, null);
+ super(ERROR, JavaCore.PLUGIN_ID, 0, "JavaModelStatus", null); //$NON-NLS-1$
}
/**
* Constructs an Java model status with no corresponding elements.
*/
public JavaModelStatus(int code) {
- super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus"/*nonNLS*/, null);
+ super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
fElements= JavaElementInfo.fgEmptyChildren;
}
/**
@@ -66,7 +66,7 @@ public JavaModelStatus(int code) { * elements.
*/
public JavaModelStatus(int code, IJavaElement[] elements) {
- super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus"/*nonNLS*/, null);
+ super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
fElements= elements;
fPath= null;
}
@@ -74,7 +74,7 @@ public JavaModelStatus(int code, IJavaElement[] elements) { * Constructs an Java model status with no corresponding elements.
*/
public JavaModelStatus(int code, String string) {
- super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus"/*nonNLS*/, null);
+ super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
fElements= JavaElementInfo.fgEmptyChildren;
fPath= null;
fString = string;
@@ -83,14 +83,14 @@ public JavaModelStatus(int code, String string) { * Constructs an Java model status with no corresponding elements.
*/
public JavaModelStatus(int code, Throwable throwable) {
- super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus"/*nonNLS*/, throwable);
+ super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", throwable); //$NON-NLS-1$
fElements= JavaElementInfo.fgEmptyChildren;
}
/**
* Constructs an Java model status with no corresponding elements.
*/
public JavaModelStatus(int code, IPath path) {
- super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus"/*nonNLS*/, null);
+ super(ERROR, JavaCore.PLUGIN_ID, code, "JavaModelStatus", null); //$NON-NLS-1$
fElements= JavaElementInfo.fgEmptyChildren;
fPath= path;
}
@@ -113,7 +113,7 @@ public JavaModelStatus(int code, IJavaElement element, String string) { * Constructs an Java model status with no corresponding elements.
*/
public JavaModelStatus(CoreException coreException) {
- super(ERROR, JavaCore.PLUGIN_ID, CORE_EXCEPTION, "JavaModelStatus"/*nonNLS*/, coreException);
+ super(ERROR, JavaCore.PLUGIN_ID, CORE_EXCEPTION, "JavaModelStatus", coreException); //$NON-NLS-1$
fElements= JavaElementInfo.fgEmptyChildren;
}
protected int getBits() {
@@ -140,89 +140,89 @@ public String getMessage() { if (getException() == null) {
switch (getCode()) {
case CORE_EXCEPTION :
- return Util.bind("status.coreException"/*nonNLS*/);
+ return Util.bind("status.coreException"); //$NON-NLS-1$
case BUILDER_INITIALIZATION_ERROR:
- return Util.bind("build.initializationError"/*nonNLS*/);
+ return Util.bind("build.initializationError"); //$NON-NLS-1$
case BUILDER_SERIALIZATION_ERROR:
- return Util.bind("build.serializationError"/*nonNLS*/);
+ return Util.bind("build.serializationError"); //$NON-NLS-1$
case DEVICE_PATH:
- return Util.bind("status.cannotUseDeviceOnPath"/*nonNLS*/, getPath().toString());
+ return Util.bind("status.cannotUseDeviceOnPath", getPath().toString()); //$NON-NLS-1$
case DOM_EXCEPTION:
- return Util.bind("status.JDOMError"/*nonNLS*/);
+ return Util.bind("status.JDOMError"); //$NON-NLS-1$
case ELEMENT_DOES_NOT_EXIST:
- return Util.bind("element.doesNotExist"/*nonNLS*/,fElements[0].getElementName());
+ return Util.bind("element.doesNotExist",fElements[0].getElementName()); //$NON-NLS-1$
case EVALUATION_ERROR:
- return Util.bind("status.evaluationError"/*nonNLS*/, getString());
+ return Util.bind("status.evaluationError", getString()); //$NON-NLS-1$
case INDEX_OUT_OF_BOUNDS:
- return Util.bind("status.indexOutOfBounds"/*nonNLS*/);
+ return Util.bind("status.indexOutOfBounds"); //$NON-NLS-1$
case INVALID_CONTENTS:
- return Util.bind("status.invalidContents"/*nonNLS*/);
+ return Util.bind("status.invalidContents"); //$NON-NLS-1$
case INVALID_DESTINATION:
- return Util.bind("status.invalidDestination"/*nonNLS*/, fElements[0].getElementName());
+ return Util.bind("status.invalidDestination", fElements[0].getElementName()); //$NON-NLS-1$
case INVALID_ELEMENT_TYPES:
- StringBuffer buff= new StringBuffer(Util.bind("operation.notSupported"/*nonNLS*/));
+ StringBuffer buff= new StringBuffer(Util.bind("operation.notSupported")); //$NON-NLS-1$
for (int i= 0; i < fElements.length; i++) {
if (i > 0) {
- buff.append(", "/*nonNLS*/);
+ buff.append(", "); //$NON-NLS-1$
}
buff.append(fElements[0].getElementName());
}
return buff.toString();
case INVALID_NAME:
- return Util.bind("status.invalidName"/*nonNLS*/, getString());
+ return Util.bind("status.invalidName", getString()); //$NON-NLS-1$
case INVALID_PACKAGE:
- return Util.bind("status.invalidPackage"/*nonNLS*/, getString());
+ return Util.bind("status.invalidPackage", getString()); //$NON-NLS-1$
case INVALID_PATH:
- return Util.bind("status.invalidPath"/*nonNLS*/, getPath() == null ? "null"/*nonNLS*/ : getPath().toString());
+ return Util.bind("status.invalidPath", getPath() == null ? "null" : getPath().toString()); //$NON-NLS-1$ //$NON-NLS-2$
case INVALID_PROJECT:
- return Util.bind("status.invalidProject"/*nonNLS*/, getString());
+ return Util.bind("status.invalidProject", getString()); //$NON-NLS-1$
case INVALID_RESOURCE:
- return Util.bind("status.invalidResource"/*nonNLS*/, getString());
+ return Util.bind("status.invalidResource", getString()); //$NON-NLS-1$
case INVALID_RESOURCE_TYPE:
- return Util.bind("status.invalidResourceType"/*nonNLS*/, getString());
+ return Util.bind("status.invalidResourceType", getString()); //$NON-NLS-1$
case INVALID_SIBLING:
- return Util.bind("status.invalidSibling"/*nonNLS*/, fElements[0].getElementName());
+ return Util.bind("status.invalidSibling", fElements[0].getElementName()); //$NON-NLS-1$
case IO_EXCEPTION:
- return Util.bind("status.IOException"/*nonNLS*/);
+ return Util.bind("status.IOException"); //$NON-NLS-1$
case NAME_COLLISION:
if (fElements != null && fElements.length > 0) {
IJavaElement element = fElements[0];
String name = element.getElementName();
if (element instanceof IPackageFragment && name.equals(IPackageFragment.DEFAULT_PACKAGE_NAME)) {
- return Util.bind("operation.cannotRenameDefaultPackage"/*nonNLS*/);
+ return Util.bind("operation.cannotRenameDefaultPackage"); //$NON-NLS-1$
}
}
- return Util.bind("status.nameCollision"/*nonNLS*/);
+ return Util.bind("status.nameCollision"); //$NON-NLS-1$
case NO_ELEMENTS_TO_PROCESS:
- return Util.bind("operation.needElements"/*nonNLS*/);
+ return Util.bind("operation.needElements"); //$NON-NLS-1$
case NULL_NAME:
- return Util.bind("operation.needName"/*nonNLS*/);
+ return Util.bind("operation.needName"); //$NON-NLS-1$
case NULL_PATH:
- return Util.bind("operation.needPath"/*nonNLS*/);
+ return Util.bind("operation.needPath"); //$NON-NLS-1$
case NULL_STRING:
- return Util.bind("operation.needString"/*nonNLS*/);
+ return Util.bind("operation.needString"); //$NON-NLS-1$
case PATH_OUTSIDE_PROJECT:
- return Util.bind("operation.pathOutsideProject"/*nonNLS*/, getString(), fElements[0].getElementName());
+ return Util.bind("operation.pathOutsideProject", getString(), fElements[0].getElementName()); //$NON-NLS-1$
case READ_ONLY:
IJavaElement element = fElements[0];
String name = element.getElementName();
if (element instanceof IPackageFragment && name.equals(IPackageFragment.DEFAULT_PACKAGE_NAME)) {
- return Util.bind("status.defaultPackageReadOnly"/*nonNLS*/);
+ return Util.bind("status.defaultPackageReadOnly"); //$NON-NLS-1$
}
- return Util.bind("status.readOnly"/*nonNLS*/, name);
+ return Util.bind("status.readOnly", name); //$NON-NLS-1$
case RELATIVE_PATH:
- return Util.bind("operation.needAbsolutePath"/*nonNLS*/, getPath().toString());
+ return Util.bind("operation.needAbsolutePath", getPath().toString()); //$NON-NLS-1$
case TARGET_EXCEPTION:
- return Util.bind("status.targetException"/*nonNLS*/);
+ return Util.bind("status.targetException"); //$NON-NLS-1$
case UPDATE_CONFLICT:
- return Util.bind("status.updateConflict"/*nonNLS*/);
+ return Util.bind("status.updateConflict"); //$NON-NLS-1$
case NO_LOCAL_CONTENTS :
- return Util.bind("status.noLocalContents"/*nonNLS*/, getPath().toString());
+ return Util.bind("status.noLocalContents", getPath().toString()); //$NON-NLS-1$
}
return getString();
} else {
if (getCode() == CORE_EXCEPTION){
- return Util.bind("status.coreExceptionWithArg"/*nonNLS*/, getException().getMessage());
+ return Util.bind("status.coreExceptionWithArg", getException().getMessage()); //$NON-NLS-1$
}
return getException().getMessage();
}
@@ -311,9 +311,9 @@ public static IJavaModelStatus newMultiStatus(IJavaModelStatus[] children) { */
public String toString() {
StringBuffer buffer = new StringBuffer();
- buffer.append("Java Model Status ["/*nonNLS*/);
+ buffer.append("Java Model Status ["); //$NON-NLS-1$
buffer.append(getMessage());
- buffer.append("]"/*nonNLS*/);
+ buffer.append("]"); //$NON-NLS-1$
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java index 1e3ad59d51..c3b890234a 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java @@ -202,7 +202,7 @@ public static IPath canonicalizedPath(IPath externalPath) { * This is the project bin folder
*/
protected IPath defaultOutputLocation() throws JavaModelException {
- return getProject().getFullPath().append("bin"/*nonNLS*/);
+ return getProject().getFullPath().append("bin"); //$NON-NLS-1$
}
/**
* Returns true if this handle represents the same Java project
@@ -245,14 +245,14 @@ public static IPath canonicalizedPath(IPath externalPath) { // default to the first one
return pkgFragments[0];
}
- } else if (extension.equalsIgnoreCase("java"/*nonNLS*/) || extension.equalsIgnoreCase("class"/*nonNLS*/)) {
+ } else if (extension.equalsIgnoreCase("java") || extension.equalsIgnoreCase("class")) { //$NON-NLS-1$ //$NON-NLS-2$
IPath packagePath= path.removeLastSegments(1);
String packageName= packagePath.toString().replace(IPath.SEPARATOR, '.');
String typeName= path.lastSegment();
typeName= typeName.substring(0, typeName.length() - extension.length() - 1);
String qualifiedName= null;
if (packageName.length() > 0) {
- qualifiedName= packageName + "."/*nonNLS*/ + typeName;
+ qualifiedName= packageName + "." + typeName; //$NON-NLS-1$
} else {
qualifiedName= typeName;
}
@@ -441,7 +441,7 @@ public static IPath canonicalizedPath(IPath externalPath) { */
protected String getClasspathAsXMLString(IClasspathEntry[] classpath, IPath outputLocation) throws JavaModelException {
Document doc= new DocumentImpl();
- Element cpElement= doc.createElement("classpath"/*nonNLS*/);
+ Element cpElement= doc.createElement("classpath"); //$NON-NLS-1$
doc.appendChild(cpElement);
for (int i= 0; i < classpath.length; ++i) {
@@ -452,9 +452,9 @@ public static IPath canonicalizedPath(IPath externalPath) { if (outputLocation != null) {
outputLocation= outputLocation.removeFirstSegments(1);
outputLocation= outputLocation.makeRelative();
- Element oElement= doc.createElement("classpathentry"/*nonNLS*/);
- oElement.setAttribute("kind"/*nonNLS*/, kindToString(ClasspathEntry.K_OUTPUT));
- oElement.setAttribute("path"/*nonNLS*/, outputLocation.toOSString());
+ Element oElement= doc.createElement("classpathentry"); //$NON-NLS-1$
+ oElement.setAttribute("kind", kindToString(ClasspathEntry.K_OUTPUT)); //$NON-NLS-1$
+ oElement.setAttribute("path", outputLocation.toOSString()); //$NON-NLS-1$
cpElement.appendChild(oElement);
}
@@ -488,15 +488,15 @@ public static IPath canonicalizedPath(IPath externalPath) { * of this project
*/
public QualifiedName getClasspathPropertyName() {
- return new QualifiedName(JavaCore.PLUGIN_ID, "classpath"/*nonNLS*/);
+ return new QualifiedName(JavaCore.PLUGIN_ID, "classpath"); //$NON-NLS-1$
}
/**
* Returns the XML String encoding of the class path.
*/
protected static Element getEntryAsXMLElement(Document document, IClasspathEntry entry, IPath prefixPath) throws JavaModelException {
- Element element= document.createElement("classpathentry"/*nonNLS*/);
- element.setAttribute("kind"/*nonNLS*/, kindToString(entry.getEntryKind()));
+ Element element= document.createElement("classpathentry"); //$NON-NLS-1$
+ element.setAttribute("kind", kindToString(entry.getEntryKind())); //$NON-NLS-1$
IPath path= entry.getPath();
if (entry.getEntryKind() != IClasspathEntry.CPE_VARIABLE){
// translate to project relative from absolute (unless a device path)
@@ -511,12 +511,12 @@ public static IPath canonicalizedPath(IPath externalPath) { }
}
}
- element.setAttribute("path"/*nonNLS*/, path.toString());
+ element.setAttribute("path", path.toString()); //$NON-NLS-1$
if (entry.getSourceAttachmentPath() != null){
- element.setAttribute("sourcepath"/*nonNLS*/, entry.getSourceAttachmentPath().toString());
+ element.setAttribute("sourcepath", entry.getSourceAttachmentPath().toString()); //$NON-NLS-1$
}
if (entry.getSourceAttachmentRootPath() != null){
- element.setAttribute("rootpath"/*nonNLS*/, entry.getSourceAttachmentRootPath().toString());
+ element.setAttribute("rootpath", entry.getSourceAttachmentRootPath().toString()); //$NON-NLS-1$
}
return element;
}
@@ -590,7 +590,7 @@ public static IPath canonicalizedPath(IPath externalPath) { */
public IPackageFragmentRoot getPackageFragmentRoot(IResource resource) {
String name= resource.getName();
- if (Util.endsWithIgnoreCase(name,".jar"/*nonNLS*/) || Util.endsWithIgnoreCase(name,".zip"/*nonNLS*/)) {
+ if (Util.endsWithIgnoreCase(name,".jar") || Util.endsWithIgnoreCase(name,".zip")) { //$NON-NLS-2$ //$NON-NLS-1$
return new JarPackageFragmentRoot(resource, this);
} else {
return new PackageFragmentRoot(resource, this);
@@ -676,7 +676,7 @@ public static IPath canonicalizedPath(IPath externalPath) { if (entry.getContentKind() == IPackageFragmentRoot.K_BINARY) {
String ext= path.getFileExtension();
IPackageFragmentRoot root= null;
- if (ext != null && (ext.equalsIgnoreCase("zip"/*nonNLS*/) || ext.equalsIgnoreCase("jar"/*nonNLS*/))) {
+ if (ext != null && (ext.equalsIgnoreCase("zip") || ext.equalsIgnoreCase("jar"))) { //$NON-NLS-1$ //$NON-NLS-2$
// jar
// removeFirstSegment removes the part relative to the project which is retrieve
// through workspace.getDefaultContentLocation
@@ -931,15 +931,15 @@ public String[] getRequiredProjectNames() throws JavaModelException { * Returns the kind of a <code>PackageFragmentRoot</code> from its <code>String</code> form.
*/
static int kindFromString(String kindStr) {
- if (kindStr.equalsIgnoreCase("prj"/*nonNLS*/))
+ if (kindStr.equalsIgnoreCase("prj")) //$NON-NLS-1$
return IClasspathEntry.CPE_PROJECT;
- if (kindStr.equalsIgnoreCase("var"/*nonNLS*/))
+ if (kindStr.equalsIgnoreCase("var")) //$NON-NLS-1$
return IClasspathEntry.CPE_VARIABLE;
- if (kindStr.equalsIgnoreCase("src"/*nonNLS*/))
+ if (kindStr.equalsIgnoreCase("src")) //$NON-NLS-1$
return IClasspathEntry.CPE_SOURCE;
- if (kindStr.equalsIgnoreCase("lib"/*nonNLS*/))
+ if (kindStr.equalsIgnoreCase("lib")) //$NON-NLS-1$
return IClasspathEntry.CPE_LIBRARY;
- if (kindStr.equalsIgnoreCase("output"/*nonNLS*/))
+ if (kindStr.equalsIgnoreCase("output")) //$NON-NLS-1$
return ClasspathEntry.K_OUTPUT;
return -1;
}
@@ -951,17 +951,17 @@ public String[] getRequiredProjectNames() throws JavaModelException { static String kindToString(int kind) {
switch (kind) {
case IClasspathEntry.CPE_PROJECT :
- return "src"/*nonNLS*/; // backward compatibility
+ return "src"; // backward compatibility //$NON-NLS-1$
case IClasspathEntry.CPE_SOURCE :
- return "src"/*nonNLS*/;
+ return "src"; //$NON-NLS-1$
case IClasspathEntry.CPE_LIBRARY :
- return "lib"/*nonNLS*/;
+ return "lib"; //$NON-NLS-1$
case IClasspathEntry.CPE_VARIABLE :
- return "var"/*nonNLS*/;
+ return "var"; //$NON-NLS-1$
case ClasspathEntry.K_OUTPUT :
- return "output"/*nonNLS*/;
+ return "output"; //$NON-NLS-1$
default :
- return "unknown"/*nonNLS*/;
+ return "unknown"; //$NON-NLS-1$
}
}
/**
@@ -986,7 +986,7 @@ public String[] getRequiredProjectNames() throws JavaModelException { */
public ITypeHierarchy newTypeHierarchy(IRegion region, IProgressMonitor monitor) throws JavaModelException {
if (region == null) {
- throw new IllegalArgumentException(Util.bind("hierarchy.nullRegion"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("hierarchy.nullRegion")); //$NON-NLS-1$
}
CreateTypeHierarchyOperation op= new CreateTypeHierarchyOperation(null, region, this, true);
runOperation(op, monitor);
@@ -997,10 +997,10 @@ public String[] getRequiredProjectNames() throws JavaModelException { */
public ITypeHierarchy newTypeHierarchy(IType type, IRegion region, IProgressMonitor monitor) throws JavaModelException {
if (type == null) {
- throw new IllegalArgumentException(Util.bind("hierarchy.nullFocusType"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("hierarchy.nullFocusType")); //$NON-NLS-1$
}
if (region == null) {
- throw new IllegalArgumentException(Util.bind("hierarchy.nullRegion"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("hierarchy.nullRegion")); //$NON-NLS-1$
}
CreateTypeHierarchyOperation op= new CreateTypeHierarchyOperation(type, region, this, true);
runOperation(op, monitor);
@@ -1067,15 +1067,15 @@ public String[] getRequiredProjectNames() throws JavaModelException { DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
cpElement = parser.parse(new InputSource(reader)).getDocumentElement();
} catch(SAXException e) {
- throw new IOException(Util.bind("file.badFormat"/*nonNLS*/));
+ throw new IOException(Util.bind("file.badFormat")); //$NON-NLS-1$
} catch(ParserConfigurationException e){
reader.close();
- throw new IOException(Util.bind("file.badFormat"/*nonNLS*/));
+ throw new IOException(Util.bind("file.badFormat")); //$NON-NLS-1$
} finally {
reader.close();
}
- if (!cpElement.getNodeName().equalsIgnoreCase("classpath"/*nonNLS*/)) {
- throw new IOException(Util.bind("file.badFormat"/*nonNLS*/));
+ if (!cpElement.getNodeName().equalsIgnoreCase("classpath")) { //$NON-NLS-1$
+ throw new IOException(Util.bind("file.badFormat")); //$NON-NLS-1$
}
NodeList list= cpElement.getChildNodes();
Vector paths= new Vector();
@@ -1085,9 +1085,9 @@ public String[] getRequiredProjectNames() throws JavaModelException { short type= node.getNodeType();
if (type == Node.ELEMENT_NODE) {
Element cpeElement= (Element) node;
- if (cpeElement.getNodeName().equalsIgnoreCase("classpathentry"/*nonNLS*/)) {
- String cpeElementKind = cpeElement.getAttribute("kind"/*nonNLS*/);
- String pathStr = cpeElement.getAttribute("path"/*nonNLS*/);
+ if (cpeElement.getNodeName().equalsIgnoreCase("classpathentry")) { //$NON-NLS-1$
+ String cpeElementKind = cpeElement.getAttribute("kind"); //$NON-NLS-1$
+ String pathStr = cpeElement.getAttribute("path"); //$NON-NLS-1$
// ensure path is absolute
IPath path= new Path(pathStr);
int kind= kindFromString(cpeElementKind);
@@ -1095,10 +1095,10 @@ public String[] getRequiredProjectNames() throws JavaModelException { path= projectPath.append(path);
}
// source attachment info (optional)
- String sourceAttachmentPathStr = cpeElement.getAttribute("sourcepath"/*nonNLS*/);
- IPath sourceAttachmentPath = sourceAttachmentPathStr.equals(""/*nonNLS*/) ? null : new Path(sourceAttachmentPathStr);
- String sourceAttachmentRootPathStr = cpeElement.getAttribute("rootpath"/*nonNLS*/);
- IPath sourceAttachmentRootPath = sourceAttachmentRootPathStr.equals(""/*nonNLS*/) ? null : new Path(sourceAttachmentRootPathStr);
+ String sourceAttachmentPathStr = cpeElement.getAttribute("sourcepath"); //$NON-NLS-1$
+ IPath sourceAttachmentPath = sourceAttachmentPathStr.equals("") ? null : new Path(sourceAttachmentPathStr); //$NON-NLS-1$
+ String sourceAttachmentRootPathStr = cpeElement.getAttribute("rootpath"); //$NON-NLS-1$
+ IPath sourceAttachmentRootPath = sourceAttachmentRootPathStr.equals("") ? null : new Path(sourceAttachmentRootPathStr); //$NON-NLS-1$
IClasspathEntry entry= createClasspathEntry(path, kind, sourceAttachmentPath, sourceAttachmentRootPath);
if (entry == null) return null;
@@ -1257,7 +1257,7 @@ protected void resetNonJavaResourcesForPackageFragmentRoots() throws JavaModelEx */
public void setOutputLocation(IPath outputLocation, IProgressMonitor monitor) throws JavaModelException {
if (outputLocation == null) {
- throw new IllegalArgumentException(Util.bind("path.nullpath"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("path.nullpath")); //$NON-NLS-1$
}
if (outputLocation.equals(getOutputLocation())) {
return;
@@ -1428,7 +1428,7 @@ protected void resetNonJavaResourcesForPackageFragmentRoots() throws JavaModelEx IMarker marker = getProject().createMarker(IJavaModelMarker.BUILDPATH_PROBLEM_MARKER);
marker.setAttributes(
new String[]{ IMarker.MESSAGE, IMarker.SEVERITY, IMarker.LOCATION},
- new Object[]{message, new Integer(IMarker.SEVERITY_WARNING), Util.bind("classpath.buildPath"/*nonNLS*/)});
+ new Object[]{message, new Integer(IMarker.SEVERITY_WARNING), Util.bind("classpath.buildPath")}); //$NON-NLS-1$
} catch (CoreException e) {
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveElementsOperation.java index e9cbfbf3f1..c405379d48 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveElementsOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveElementsOperation.java @@ -28,7 +28,7 @@ public MoveElementsOperation(IJavaElement[] elementsToMove, IJavaElement[] destC * for progress monitoring.
*/
protected String getMainTaskName() {
- return Util.bind("operation.moveElementProgress"/*nonNLS*/);
+ return Util.bind("operation.moveElementProgress"); //$NON-NLS-1$
}
/**
* @see CopyElementsOperation#isMove()
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveResourceElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveResourceElementsOperation.java index 895def8ebd..cfbf9ae9ea 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveResourceElementsOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveResourceElementsOperation.java @@ -27,7 +27,7 @@ public MoveResourceElementsOperation(IJavaElement[] elementsToMove, IJavaElement * @see MultiOperation
*/
protected String getMainTaskName() {
- return Util.bind("operation.moveResourceProgress"/*nonNLS*/);
+ return Util.bind("operation.moveResourceProgress"); //$NON-NLS-1$
}
/**
* @see CopyResourceElementsOperation#isMove()
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java index 8ebdbe1ca6..9b0c5b6359 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java @@ -152,7 +152,7 @@ public class NameLookup implements INameLookup { if (index != -1) {
cuName= cuName.substring(0, index);
}
- cuName += ".java"/*nonNLS*/;
+ cuName += ".java"; //$NON-NLS-1$
IPackageFragment[] frags= (IPackageFragment[]) fPackageFragments.get(pkgName);
if (frags != null) {
@@ -173,7 +173,7 @@ public class NameLookup implements INameLookup { */
public IPackageFragment findPackageFragment(IPath path) {
if (!path.isAbsolute()) {
- throw new IllegalArgumentException(Util.bind("path.mustBeAbsolute"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("path.mustBeAbsolute")); //$NON-NLS-1$
}
IResource possibleFragment = workspace.getRoot().findMember(path);
if (possibleFragment == null) {
@@ -244,7 +244,7 @@ public IPackageFragment findPackageFragment(IPath path) { */
public IPackageFragmentRoot findPackageFragmentRoot(IPath path) {
if (!path.isAbsolute()) {
- throw new IllegalArgumentException(Util.bind("path.mustBeAbsolute"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("path.mustBeAbsolute")); //$NON-NLS-1$
}
for (int i= 0; i < fPackageFragmentRoots.length; i++) {
IPackageFragmentRoot classpathRoot= fPackageFragmentRoots[i];
@@ -532,7 +532,7 @@ public IPackageFragment findPackageFragment(IPath path) { * the compilationUnits always will. So add it if we're looking for
* an exact match.
*/
- String unitName= partialMatch ? matchName.toLowerCase() : matchName + ".java"/*nonNLS*/;
+ String unitName= partialMatch ? matchName.toLowerCase() : matchName + ".java"; //$NON-NLS-1$
for (int i= 0; i < length; i++) {
if (requestor.isCanceled())
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NonVoidMethodRequestor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NonVoidMethodRequestor.java index e79947fcca..ea97f45c28 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NonVoidMethodRequestor.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NonVoidMethodRequestor.java @@ -25,7 +25,7 @@ public NonVoidMethodRequestor(ISearchRequestor requestor) { }
public void acceptMethod(IMethod method) {
try {
- if (!Signature.getReturnType(method.getSignature()).equals("V"/*nonNLS*/)) {
+ if (!Signature.getReturnType(method.getSignature()).equals("V")) { //$NON-NLS-1$
super.acceptMethod(method);
}
} catch (JavaModelException npe) {
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Openable.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Openable.java index 2dc4c805fd..a36fb8c1fd 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Openable.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Openable.java @@ -96,7 +96,7 @@ protected void closing(Object info) throws JavaModelException { */
protected void codeComplete(org.eclipse.jdt.internal.compiler.env.ICompilationUnit cu, org.eclipse.jdt.internal.compiler.env.ICompilationUnit unitToSkip, int position, ICodeCompletionRequestor requestor) throws JavaModelException {
if (requestor == null) {
- throw new IllegalArgumentException(Util.bind("codeAssist.nullRequestor"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("codeAssist.nullRequestor")); //$NON-NLS-1$
}
if (position < -1 || position > getBuffer().getLength()) {
throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.INDEX_OUT_OF_BOUNDS));
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/OverflowingLRUCache.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/OverflowingLRUCache.java index 2d49198720..6f1cd7884f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/OverflowingLRUCache.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/OverflowingLRUCache.java @@ -212,7 +212,7 @@ public void printStats() { forwardListLength++;
entry = entry._fNext;
}
- System.out.println("Forward length: "/*nonNLS*/ + forwardListLength);
+ System.out.println("Forward length: " + forwardListLength); //$NON-NLS-1$
int backwardListLength = 0;
entry = fEntryQueueTail;
@@ -220,7 +220,7 @@ public void printStats() { backwardListLength++;
entry = entry._fPrevious;
}
- System.out.println("Backward length: "/*nonNLS*/ + backwardListLength);
+ System.out.println("Backward length: " + backwardListLength); //$NON-NLS-1$
Enumeration keys = fEntryTable.keys();
java.util.Vector v = new java.util.Vector();
@@ -232,7 +232,7 @@ public void printStats() { fCount = 1;
}
public String toString() {
- return "Class: "/*nonNLS*/ + fClass + " has "/*nonNLS*/ + fCount + " entries."/*nonNLS*/;
+ return "Class: " + fClass + " has " + fCount + " entries."; //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
}
}
java.util.Hashtable h = new java.util.Hashtable();
@@ -369,7 +369,7 @@ public void setLoadFactor(double newLoadFactor) throws IllegalArgumentException if(newLoadFactor <= 1.0 && newLoadFactor > 0.0)
fLoadFactor = newLoadFactor;
else
- throw new IllegalArgumentException(Util.bind("cache.invalidLoadFactor"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("cache.invalidLoadFactor")); //$NON-NLS-1$
}
/**
* Sets the maximum amount of space that the cache can store
@@ -397,7 +397,7 @@ public void setLoadFactor(double newLoadFactor) throws IllegalArgumentException */
public String toString() {
return
- "OverflowingLRUCache "/*nonNLS*/ + ((fCurrentSpace + fOverflow) * 100.0 / fSpaceLimit) + "% full\n"/*nonNLS*/ +
+ "OverflowingLRUCache " + ((fCurrentSpace + fOverflow) * 100.0 / fSpaceLimit) + "% full\n" + //$NON-NLS-1$ //$NON-NLS-2$
this.toStringContents();
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageDeclaration.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageDeclaration.java index c774187aab..c046e5180f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageDeclaration.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageDeclaration.java @@ -33,10 +33,10 @@ protected char getHandleMementoDelimiter() { * @private Debugging purposes
*/
protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
- buffer.append("package "/*nonNLS*/);
+ buffer.append("package "); //$NON-NLS-1$
buffer.append(getElementName());
if (info == null) {
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java index 9ab3bb1c45..9cec2b6735 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java @@ -45,9 +45,9 @@ protected boolean computeChildren(OpenableElementInfo info, IResource resource) int kind = getKind();
String extType;
if (kind == IPackageFragmentRoot.K_SOURCE) {
- extType = "java"/*nonNLS*/;
+ extType = "java"; //$NON-NLS-1$
} else {
- extType = "class"/*nonNLS*/;
+ extType = "class"; //$NON-NLS-1$
}
try {
IResource[] members = ((IContainer) resource).members();
@@ -89,7 +89,7 @@ public boolean containsJavaResources() throws JavaModelException { */
public void copy(IJavaElement container, IJavaElement sibling, String rename, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (container == null) {
- throw new IllegalArgumentException(Util.bind("operation.nullContainer"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("operation.nullContainer")); //$NON-NLS-1$
}
IJavaElement[] elements= new IJavaElement[] {this};
IJavaElement[] containers= new IJavaElement[] {container};
@@ -229,7 +229,7 @@ public boolean hasSubpackages() throws JavaModelException { IJavaElement[] packages= ((IPackageFragmentRoot)getParent()).getChildren();
String name = getElementName();
int nameLength = name.length();
- String packageName = isDefaultPackage() ? name : name+"."/*nonNLS*/;
+ String packageName = isDefaultPackage() ? name : name+"."; //$NON-NLS-1$
for (int i= 0; i < packages.length; i++) {
String otherName = packages[i].getElementName();
if (otherName.length() > nameLength && otherName.startsWith(packageName)) {
@@ -249,7 +249,7 @@ public boolean isDefaultPackage() { */
public void move(IJavaElement container, IJavaElement sibling, String rename, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (container == null) {
- throw new IllegalArgumentException(Util.bind("operation.nullContainer"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("operation.nullContainer")); //$NON-NLS-1$
}
IJavaElement[] elements= new IJavaElement[] {this};
IJavaElement[] containers= new IJavaElement[] {container};
@@ -280,7 +280,7 @@ public void refreshChildren() { */
public void rename(String name, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("element.nullName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.nullName")); //$NON-NLS-1$
}
IJavaElement[] elements= new IJavaElement[] {this};
IJavaElement[] dests= new IJavaElement[] {this.getParent()};
@@ -300,15 +300,15 @@ protected void toStringChildren(int tab, StringBuffer buffer, Object info) { */
protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
if (getElementName().length() == 0) {
- buffer.append("[default]"/*nonNLS*/);
+ buffer.append("[default]"); //$NON-NLS-1$
} else {
buffer.append(getElementName());
}
if (info == null) {
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
} else {
if (tab > 0) {
- buffer.append(" (...)"/*nonNLS*/);
+ buffer.append(" (...)"); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentInfo.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentInfo.java index 6dc504d686..d34c2cc0f5 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentInfo.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentInfo.java @@ -43,7 +43,7 @@ private Object[] computeNonJavaResources(IResource resource) { IResource child = members[i];
if (child.getType() != IResource.FOLDER) {
String extension = child.getProjectRelativePath().getFileExtension();
- if (!"java"/*nonNLS*/.equalsIgnoreCase(extension) && !"class"/*nonNLS*/.equalsIgnoreCase(extension)) {
+ if (!"java".equalsIgnoreCase(extension) && !"class".equalsIgnoreCase(extension)) { //$NON-NLS-1$ //$NON-NLS-2$
if (nonJavaResources.length == nonJavaResourcesCounter) {
// resize
System.arraycopy(
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java index 5de8071e79..4fd6366a53 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java @@ -55,7 +55,7 @@ protected boolean computeChildren(OpenableElementInfo info) throws JavaModelExce // is actually the package fragment root)
if (fResource.getType() == IResource.FOLDER || fResource.getType() == IResource.PROJECT) {
Vector vChildren = new Vector(5);
- computeFolderChildren((IContainer) fResource, ""/*nonNLS*/, vChildren);
+ computeFolderChildren((IContainer) fResource, "", vChildren); //$NON-NLS-1$
IJavaElement[] children = new IJavaElement[vChildren.size()];
vChildren.copyInto(children);
info.setChildren(children);
@@ -86,7 +86,7 @@ protected void computeFolderChildren(IContainer folder, String prefix, Vector vC if (prefix.length() == 0) {
newPrefix = member.getName();
} else {
- newPrefix = prefix + "."/*nonNLS*/ + member.getName();
+ newPrefix = prefix + "." + member.getName(); //$NON-NLS-1$
}
// eliminate binary output only if nested inside direct subfolders
if (!member.getFullPath().equals(outputLocationPath)) {
@@ -296,12 +296,12 @@ public void refreshChildren() { */
protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
if (getElementName().length() == 0) {
- buffer.append("[project root]"/*nonNLS*/);
+ buffer.append("[project root]"); //$NON-NLS-1$
} else {
buffer.append(getElementName());
}
if (info == null) {
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java index ff1c197991..083ce1d6e8 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java @@ -52,7 +52,7 @@ private Object[] computeFolderNonJavaResources(IJavaProject project, IContainer IResource member = members[i];
if (member.getType() == IResource.FILE) {
String extension = member.getProjectRelativePath().getFileExtension();
- if (!"java"/*nonNLS*/.equalsIgnoreCase(extension) && !"class"/*nonNLS*/.equalsIgnoreCase(extension)) {
+ if (!"java".equalsIgnoreCase(extension) && !"class".equalsIgnoreCase(extension)) { //$NON-NLS-1$ //$NON-NLS-2$
if (project.findPackageFragmentRoot(member.getFullPath()) == null) {
if (nonJavaResources.length == nonJavaResourcesCounter) {
// resize
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Problem.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Problem.java index cbcafc5f4f..e7fed9615d 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Problem.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Problem.java @@ -137,13 +137,13 @@ public void setSourceStart(int sourceStart) { public String toString() {
- String s = "Pb("/*nonNLS*/ + (id & IgnoreCategoriesMask) + ") "/*nonNLS*/;
+ String s = "Pb(" + (id & IgnoreCategoriesMask) + ") "; //$NON-NLS-1$ //$NON-NLS-2$
if (message != null) {
s += message;
} else {
if (arguments != null)
for (int i = 0; i < arguments.length; i++)
- s += " "/*nonNLS*/ + arguments[i];
+ s += " " + arguments[i]; //$NON-NLS-1$
}
return s;
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Region.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Region.java index 15b66de75b..848fd31990 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Region.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Region.java @@ -137,7 +137,7 @@ public String toString() { for (int i= 0; i < roots.length; i++) {
buffer.append(roots[i].getElementName());
if (i < (roots.length - 1)) {
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", "); //$NON-NLS-1$
}
}
buffer.append(']');
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameElementsOperation.java index 50a35bf09e..b2f6e7d91e 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameElementsOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameElementsOperation.java @@ -38,7 +38,7 @@ public RenameElementsOperation(IJavaElement[] elements, IJavaElement[] destinati * @see MultiOperation
*/
protected String getMainTaskName() {
- return Util.bind("operation.renameElementProgress"/*nonNLS*/);
+ return Util.bind("operation.renameElementProgress"); //$NON-NLS-1$
}
/**
* @see CopyElementsOperation#isRename()
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameResourceElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameResourceElementsOperation.java index f26666bfec..d1dea29ed4 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameResourceElementsOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameResourceElementsOperation.java @@ -34,7 +34,7 @@ public RenameResourceElementsOperation(IJavaElement[] elements, IJavaElement[] d * @see MultiOperation
*/
protected String getMainTaskName() {
- return Util.bind("operation.renameResourceProgress"/*nonNLS*/);
+ return Util.bind("operation.renameResourceProgress"); //$NON-NLS-1$
}
/**
* @see CopyResourceElementsOperation#isRename()
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java index 39202cf34a..d69cbf5e26 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java @@ -361,8 +361,8 @@ public class SearchableEnvironment * Returns a printable string for the array.
*/
protected String toStringChar(char[] name) {
- return "[" /*nonNLS*/
- + new String(name) + "]" /*nonNLS*/;
+ return "[" //$NON-NLS-1$
+ + new String(name) + "]" ; //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java index bc94fbc0b3..cbbe9420fc 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java @@ -60,7 +60,7 @@ protected void acceptBinaryMethod(IType type, char[] selector, char[][] paramete for (int i= 0, max = parameterTypeNames.length; i < max; i++) {
String pkg = IPackageFragment.DEFAULT_PACKAGE_NAME;
if (parameterPackageNames[i] != null && parameterPackageNames[i].length > 0) {
- pkg = new String(parameterPackageNames[i]) + "."/*nonNLS*/;
+ pkg = new String(parameterPackageNames[i]) + "."; //$NON-NLS-1$
}
parameterTypes[i]= Signature.createTypeSignature(
pkg + new String(parameterTypeNames[i]), true);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java index 8e622e34dd..2cd405cff7 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java @@ -57,7 +57,7 @@ public SetClasspathOperation(IJavaProject project, IClasspathEntry[] oldResolved * Sets the classpath of the pre-specified project.
*/
protected void executeOperation() throws JavaModelException {
- beginTask(Util.bind("classpath.settingProgress"/*nonNLS*/), 2);
+ beginTask(Util.bind("classpath.settingProgress"), 2); //$NON-NLS-1$
JavaProject project= ((JavaProject) getElementsToProcess()[0]);
project.setRawClasspath0(this.newRawPath);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetOutputLocationOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetOutputLocationOperation.java index a21411e8ef..591a6cf085 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetOutputLocationOperation.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetOutputLocationOperation.java @@ -85,7 +85,7 @@ protected Vector determineAffectedPackageFragments(IPath location) throws JavaMo IPath relativePath = f.getFullPath().removeFirstSegments(segments);
String name = relativePath.toOSString();
name = name.replace(File.pathSeparatorChar, '.');
- if (name.endsWith("."/*nonNLS*/)) {
+ if (name.endsWith(".")) { //$NON-NLS-1$
name = name.substring(0, name.length() - 1);
}
IPackageFragment pkg = root.getPackageFragment(name);
@@ -104,7 +104,7 @@ protected Vector determineAffectedPackageFragments(IPath location) throws JavaMo * a package fragment.
*/
protected void executeOperation() throws JavaModelException {
- beginTask(Util.bind("classpath.settingOutputLocationProgress"/*nonNLS*/), 2);
+ beginTask(Util.bind("classpath.settingOutputLocationProgress"), 2); //$NON-NLS-1$
JavaProject project= ((JavaProject) getElementsToProcess()[0]);
IPath oldLocation= project.getOutputLocation();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceField.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceField.java index 00d5b06bd1..388b019eb2 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceField.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceField.java @@ -53,14 +53,14 @@ public String getTypeSignature() throws JavaModelException { protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
if (info == null) {
buffer.append(getElementName());
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
} else {
try {
buffer.append(Signature.toString(this.getTypeSignature()));
- buffer.append(" "/*nonNLS*/);
+ buffer.append(" "); //$NON-NLS-1$
buffer.append(this.getElementName());
} catch (JavaModelException e) {
- buffer.append("<JavaModelException in toString of "/*nonNLS*/ + getElementName());
+ buffer.append("<JavaModelException in toString of " + getElementName()); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java index f31cfdb128..5272368335 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java @@ -117,7 +117,7 @@ public class SourceMapper public SourceMapper(IPath zipPath, String rootPath, JavaModel model) {
fZipPath = zipPath;
fRootPath = rootPath.replace('\\', '/');
- if (fRootPath.endsWith("/" /*nonNLS*/)) {
+ if (fRootPath.endsWith("/" )) { //$NON-NLS-1$
fRootPath = fRootPath.substring(0, fRootPath.lastIndexOf('/'));
}
fJavaModel = model;
@@ -611,7 +611,7 @@ public class SourceMapper IProblemFactory factory = new DefaultProblemFactory();
SourceElementParser parser = new SourceElementParser(this, factory);
parser.parseCompilationUnit(
- new BasicCompilationUnit(contents, type.getElementName() + ".java" /*nonNLS*/),
+ new BasicCompilationUnit(contents, type.getElementName() + ".java" ), //$NON-NLS-1$
false);
if (searchedElement != null) {
ISourceRange range = this.getNameRange(searchedElement);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMethod.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMethod.java index e522c94da0..d8cad208ed 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMethod.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMethod.java @@ -145,7 +145,7 @@ public String readableName() { for (int i = 0; i < length; i++) {
buffer.append(Signature.toString(parameterTypes[i]));
if (i < length - 1) {
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", "); //$NON-NLS-1$
}
}
}
@@ -192,11 +192,11 @@ protected boolean signatureEquals(IDOMMethod method) throws JavaModelException { protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
if (info == null) {
buffer.append(getElementName());
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
} else {
try {
if (Flags.isStatic(this.getFlags())) {
- buffer.append("static "/*nonNLS*/);
+ buffer.append("static "); //$NON-NLS-1$
}
if (!this.isConstructor()) {
buffer.append(Signature.toString(this.getReturnType()));
@@ -210,13 +210,13 @@ protected void toStringInfo(int tab, StringBuffer buffer, Object info) { for (int i = 0; i < length; i++) {
buffer.append(Signature.toString(parameterTypes[i]));
if (i < length - 1) {
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", "); //$NON-NLS-1$
}
}
}
buffer.append(')');
} catch (JavaModelException e) {
- buffer.append("<JavaModelException in toString of "/*nonNLS*/ + getElementName());
+ buffer.append("<JavaModelException in toString of " + getElementName()); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRange.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRange.java index e0aa4054a3..22ad270995 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRange.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRange.java @@ -33,11 +33,11 @@ public int getOffset() { }
public String toString() {
StringBuffer buffer = new StringBuffer();
- buffer.append("[offset="/*nonNLS*/);
+ buffer.append("[offset="); //$NON-NLS-1$
buffer.append(this.offset);
- buffer.append(", length="/*nonNLS*/);
+ buffer.append(", length="); //$NON-NLS-1$
buffer.append(this.length);
- buffer.append("]"/*nonNLS*/);
+ buffer.append("]"); //$NON-NLS-1$
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRefElement.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRefElement.java index c0f0f428ab..c1ee0d573b 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRefElement.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRefElement.java @@ -23,7 +23,7 @@ protected SourceRefElement(int type, IJavaElement parent, String name) { */
public void copy(IJavaElement container, IJavaElement sibling, String rename, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (container == null) {
- throw new IllegalArgumentException(Util.bind("operation.nullContainer"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("operation.nullContainer")); //$NON-NLS-1$
}
IJavaElement[] elements= new IJavaElement[] {this};
IJavaElement[] containers= new IJavaElement[] {container};
@@ -104,7 +104,7 @@ public IResource getUnderlyingResource() throws JavaModelException { */
public void move(IJavaElement container, IJavaElement sibling, String rename, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (container == null) {
- throw new IllegalArgumentException(Util.bind("operation.nullContainer"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("operation.nullContainer")); //$NON-NLS-1$
}
IJavaElement[] elements= new IJavaElement[] {this};
IJavaElement[] containers= new IJavaElement[] {container};
@@ -163,7 +163,7 @@ public void offsetSourceRange(int amount) { */
public void rename(String name, boolean force, IProgressMonitor monitor) throws JavaModelException {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("element.nullName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.nullName")); //$NON-NLS-1$
}
IJavaElement[] elements= new IJavaElement[] {this};
IJavaElement[] dests= new IJavaElement[] {this.getParent()};
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java index 3f4489070a..e94abc998c 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java @@ -263,7 +263,7 @@ public ITypeHierarchy newTypeHierarchy(IProgressMonitor monitor) throws JavaMode */
public ITypeHierarchy newTypeHierarchy(IJavaProject project, IProgressMonitor monitor) throws JavaModelException {
if (project == null) {
- throw new IllegalArgumentException(Util.bind("hierarchy.nullProject"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("hierarchy.nullProject")); //$NON-NLS-1$
}
CreateTypeHierarchyOperation op= new CreateTypeHierarchyOperation(
@@ -317,17 +317,17 @@ public ITypeHierarchy newTypeHierarchy(IJavaProject project, IProgressMonitor mo protected void toStringInfo(int tab, StringBuffer buffer, Object info) {
if (info == null) {
buffer.append(this.getElementName());
- buffer.append(" (not open)"/*nonNLS*/);
+ buffer.append(" (not open)"); //$NON-NLS-1$
} else {
try {
if (this.isInterface()) {
- buffer.append("interface "/*nonNLS*/);
+ buffer.append("interface "); //$NON-NLS-1$
} else {
- buffer.append("class "/*nonNLS*/);
+ buffer.append("class "); //$NON-NLS-1$
}
buffer.append(this.getElementName());
} catch (JavaModelException e) {
- buffer.append("<JavaModelException in toString of "/*nonNLS*/ + getElementName());
+ buffer.append("<JavaModelException in toString of " + getElementName()); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/TypeVector.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/TypeVector.java index 11c365754f..bc8facf788 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/TypeVector.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/TypeVector.java @@ -89,12 +89,12 @@ public void removeAll() { size = 0;
}
public String toString() {
- StringBuffer buffer = new StringBuffer("["/*nonNLS*/);
+ StringBuffer buffer = new StringBuffer("["); //$NON-NLS-1$
for (int i = 0; i < size; i++) {
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n"); //$NON-NLS-1$
buffer.append(elements[i]);
}
- buffer.append("\n]"/*nonNLS*/);
+ buffer.append("\n]"); //$NON-NLS-1$
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Util.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Util.java index 4c39fff104..179bd21717 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Util.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Util.java @@ -42,16 +42,16 @@ public class Util { /* Bundle containing messages */
protected static ResourceBundle bundle;
- private final static String bundleName = "org.eclipse.jdt.internal.core.Messages"/*nonNLS*/;
+ private final static String bundleName = "org.eclipse.jdt.internal.core.Messages"; //$NON-NLS-1$
- public final static char[] SUFFIX_class = ".class"/*nonNLS*/.toCharArray();
- public final static char[] SUFFIX_CLASS = ".CLASS"/*nonNLS*/.toCharArray();
- public final static char[] SUFFIX_java = ".java"/*nonNLS*/.toCharArray();
- public final static char[] SUFFIX_JAVA = ".JAVA"/*nonNLS*/.toCharArray();
+ public final static char[] SUFFIX_class = ".class".toCharArray(); //$NON-NLS-1$
+ public final static char[] SUFFIX_CLASS = ".CLASS".toCharArray(); //$NON-NLS-1$
+ public final static char[] SUFFIX_java = ".java".toCharArray(); //$NON-NLS-1$
+ public final static char[] SUFFIX_JAVA = ".JAVA".toCharArray(); //$NON-NLS-1$
static {
- String ver = System.getProperty("java.version"/*nonNLS*/);
- JDK1_1 = ((ver != null) && ver.startsWith("1.1"/*nonNLS*/));
+ String ver = System.getProperty("java.version"); //$NON-NLS-1$
+ JDK1_1 = ((ver != null) && ver.startsWith("1.1")); //$NON-NLS-1$
relocalize();
}
/**
@@ -155,8 +155,8 @@ public static int compare(char[] v1, char[] v2) { * @see concat(String, String)
*/
public static String concat(String s1, char c, String s2) {
- if (s1 == null) s1 = "null"/*nonNLS*/;
- if (s2 == null) s2 = "null"/*nonNLS*/;
+ if (s1 == null) s1 = "null"; //$NON-NLS-1$
+ if (s2 == null) s2 = "null"; //$NON-NLS-1$
int l1 = s1.length();
int l2 = s2.length();
char[] buf = new char[l1 + 1 + l2];
@@ -176,8 +176,8 @@ public static int compare(char[] v1, char[] v2) { * String constructor copies its argument, but there's no way around this.
*/
public static String concat(String s1, String s2) {
- if (s1 == null) s1 = "null"/*nonNLS*/;
- if (s2 == null) s2 = "null"/*nonNLS*/;
+ if (s1 == null) s1 = "null"; //$NON-NLS-1$
+ if (s2 == null) s2 = "null"; //$NON-NLS-1$
int l1 = s1.length();
int l2 = s2.length();
char[] buf = new char[l1 + l2];
@@ -190,9 +190,9 @@ public static int compare(char[] v1, char[] v2) { * @see concat(String, String)
*/
public static String concat(String s1, String s2, String s3) {
- if (s1 == null) s1 = "null"/*nonNLS*/;
- if (s2 == null) s2 = "null"/*nonNLS*/;
- if (s3 == null) s3 = "null"/*nonNLS*/;
+ if (s1 == null) s1 = "null"; //$NON-NLS-1$
+ if (s2 == null) s2 = "null"; //$NON-NLS-1$
+ if (s3 == null) s3 = "null"; //$NON-NLS-1$
int l1 = s1.length();
int l2 = s2.length();
int l3 = s3.length();
@@ -772,14 +772,14 @@ public static String bind(String id) { */
public static String bind(String id, String[] bindings) {
if (id == null)
- return "No message available"/*nonNLS*/;
+ return "No message available"; //$NON-NLS-1$
String message = null;
try {
message = bundle.getString(id);
} catch (MissingResourceException e) {
// If we got an exception looking for the message, fail gracefully by just returning
// the id we were looking for. In most cases this is semi-informative so is not too bad.
- return "Missing message: "/*nonNLS*/ + id + " in: "/*nonNLS*/ + bundleName;
+ return "Missing message: " + id + " in: " + bundleName; //$NON-NLS-2$ //$NON-NLS-1$
}
if (bindings == null)
return message;
@@ -798,7 +798,7 @@ public static String bind(String id, String[] bindings) { } catch (NumberFormatException nfe) {
output.append(message.substring(end + 1, start + 1));
} catch (ArrayIndexOutOfBoundsException e) {
- output.append("{missing "/*nonNLS*/ + Integer.toString(index) + "}"/*nonNLS*/);
+ output.append("{missing " + Integer.toString(index) + "}"); //$NON-NLS-2$ //$NON-NLS-1$
}
} else {
output.append(message.substring(end, length));
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/WorkingCopy.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/WorkingCopy.java index d2dde904a8..a3e0388669 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/WorkingCopy.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/WorkingCopy.java @@ -306,7 +306,7 @@ public void restore() throws JavaModelException { */
protected void toString(int tab, StringBuffer buffer) {
buffer.append(this.tabString(tab));
- buffer.append("(working copy)\n"/*nonNLS*/);
+ buffer.append("(working copy)\n"); //$NON-NLS-1$
super.toString(tab, buffer);
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/DeltaKey.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/DeltaKey.java index 4810cf9d22..e2d57f388b 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/DeltaKey.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/DeltaKey.java @@ -340,15 +340,15 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE public String toString () {
StringBuffer buffer = new StringBuffer();
- buffer.append("DeltaKey("/*nonNLS*/);
+ buffer.append("DeltaKey("); //$NON-NLS-1$
for (int i = 0; i < this.fLocalNames.length; i++) {
buffer.append(this.fLocalNames[i]);
if (i < this.fLocalNames.length - 1) {
- buffer.append("/"/*nonNLS*/);
+ buffer.append("/"); //$NON-NLS-1$
}
}
- buffer.append(")"/*nonNLS*/);
+ buffer.append(")"); //$NON-NLS-1$
return buffer.toString();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMemberHandle.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMemberHandle.java index 3440f6455c..657031b40b 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMemberHandle.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMemberHandle.java @@ -24,7 +24,7 @@ public abstract class AbstractMemberHandle extends NonStateSpecificHandleImpl im String computeSignature(String name, IType[] parameterTypes) {
if (parameterTypes.length == 0) {
- return name + "()"/*nonNLS*/;
+ return name + "()"; //$NON-NLS-1$
}
StringBuffer sb = new StringBuffer(name);
@@ -33,7 +33,7 @@ public abstract class AbstractMemberHandle extends NonStateSpecificHandleImpl im try {
((TypeImpl)parameterTypes[i]).appendSignature(sb, true);
} catch (ClassCastException e) {
- throw new StateSpecificException("Incompatible parameter types"/*nonNLS*/);
+ throw new StateSpecificException("Incompatible parameter types"); //$NON-NLS-1$
}
}
sb.append(')');
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMethodCollaboratorIndictment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMethodCollaboratorIndictment.java index b6c4016445..59418a235e 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMethodCollaboratorIndictment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMethodCollaboratorIndictment.java @@ -41,6 +41,6 @@ protected AbstractMethodCollaboratorIndictment(IType type) { */
public String toString() {
// don't use + with char[]
- return new StringBuffer("AbstractMethodCollaboratorIndictment("/*nonNLS*/).append(fName).append(")"/*nonNLS*/).toString();
+ return new StringBuffer("AbstractMethodCollaboratorIndictment(").append(fName).append(")").toString(); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractNode.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractNode.java index bb54ba75d5..4d61463b45 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractNode.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractNode.java @@ -119,7 +119,7 @@ try { /* add the dependent */
fDependents[min] = nodeThatDependsOnMe;
} catch (ArrayIndexOutOfBoundsException e) {
- System.out.println("ArrayIndexOutOfBoundsException in AbstractNode.copyAddDependent()"/*nonNLS*/);
+ System.out.println("ArrayIndexOutOfBoundsException in AbstractNode.copyAddDependent()"); //$NON-NLS-1$
}
}
/**
@@ -148,28 +148,28 @@ try { * For debugging only.
*/
public void dump(Dumper dumper) {
- dumper.dump("element"/*nonNLS*/, getElement());
+ dumper.dump("element", getElement()); //$NON-NLS-1$
if (getKind() == JCU_NODE)
- dumper.dump("types"/*nonNLS*/, getTypes());
+ dumper.dump("types", getTypes()); //$NON-NLS-1$
Object[] dependencies = new Object[fDependencies.length];
for (int i = 0; i < fDependencies.length; ++i) {
dependencies[i] = fDependencies[i].getElement();
}
- dumper.dump("dependencies"/*nonNLS*/, dependencies);
+ dumper.dump("dependencies", dependencies); //$NON-NLS-1$
Object[] dependents = new Object[fNumDependents];
for (int i = 0; i < fDependents.length; ++i) {
dependents[i] = fDependents[i].getElement();
}
- dumper.dump("dependents"/*nonNLS*/, dependents);
+ dumper.dump("dependents", dependents); //$NON-NLS-1$
}
/**
* Make sure equality tests are never carried out on nodes
*/
public boolean equals(Object o) {
- Assert.isTrue(false, "Internal Error - Equality not defined for dependency graph nodes"/*nonNLS*/);
+ Assert.isTrue(false, "Internal Error - Equality not defined for dependency graph nodes"); //$NON-NLS-1$
return false;
}
/**
@@ -338,7 +338,7 @@ public void dump(Dumper dumper) { for (int i = 0; i < recursionLevel; ++i)
sb.append(' ');
sb.append(this);
- sb.append(": "/*nonNLS*/);
+ sb.append(": "); //$NON-NLS-1$
sb.append(refCount);
System.out.println(sb.toString());
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ArrayTypeHandleImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ArrayTypeHandleImpl.java index ac15d5b35f..12c57b273a 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ArrayTypeHandleImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ArrayTypeHandleImpl.java @@ -96,7 +96,7 @@ TypeImpl getElementType() { public String getName() {
String name = fElementType.getName();
for (int i = 0; i < fNestingDepth; i++)
- name += "[]"/*nonNLS*/;
+ name += "[]"; //$NON-NLS-1$
return name;
}
/**
@@ -111,7 +111,7 @@ int getNestingDepth() { public String getSimpleName() {
String simpleName = fElementType.getSimpleName();
for (int i = 0; i < fNestingDepth; i++)
- simpleName += "[]"/*nonNLS*/;
+ simpleName += "[]"; //$NON-NLS-1$
return simpleName;
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BatchImageBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BatchImageBuilder.java index 5b5415adf1..4b6e2c2b90 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BatchImageBuilder.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BatchImageBuilder.java @@ -53,15 +53,15 @@ public void build() { fNotifier.begin();
try {
fNewState.readClassPath();
- fNotifier.subTask(Util.bind("build.scrubbingOutput"/*nonNLS*/));
+ fNotifier.subTask(Util.bind("build.scrubbingOutput")); //$NON-NLS-1$
fNewState.getBinaryOutput().scrubOutput();
fNotifier.updateProgressDelta(0.05f);
- fNotifier.subTask(Util.bind("build.analyzingPackages"/*nonNLS*/));
+ fNotifier.subTask(Util.bind("build.analyzingPackages")); //$NON-NLS-1$
fNewState.buildInitialPackageMap();
fNotifier.updateProgressDelta(0.05f);
/* Force build all in build context */
- fNotifier.subTask(Util.bind("build.analyzingSources"/*nonNLS*/));
+ fNotifier.subTask(Util.bind("build.analyzingSources")); //$NON-NLS-1$
IPackage[] pkgs = fNewState.getPackageMap().getAllPackagesAsArray();
for (int i = 0; i < pkgs.length; ++i) {
fNotifier.checkCancel();
@@ -104,13 +104,13 @@ public IDelta getImageDelta(IImageContext imageContext) { public void lazyBuild(PackageElement unit) {
// String msg = "Attempt to lazy build " + unit.getPackage().getName() + "." + unit.getFileName();
// System.err.println(msg + ". " + "Lazy building has been disabled.");
- Assert.isTrue(false, "Internal Error - Lazy building has been disabled"/*nonNLS*/);
+ Assert.isTrue(false, "Internal Error - Lazy building has been disabled"); //$NON-NLS-1$
}
/**
* Returns a string describe the builder
* @see IImageBuilder
*/
public String toString() {
- return "batch image builder for:\n\tnew state: "/*nonNLS*/ + getNewState();
+ return "batch image builder for:\n\tnew state: " + getNewState(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BuildNotifier.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BuildNotifier.java index fb4f4c9251..1e84777f42 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BuildNotifier.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BuildNotifier.java @@ -46,10 +46,10 @@ public BuildNotifier(JavaDevelopmentContextImpl dc, boolean isBatch) { }
public void begin() {
if (fBuildMonitor != null) {
- fBuildMonitor.beginBuild(fIsBatch ? Util.bind("build.beginBatch"/*nonNLS*/) : Util.bind("build.beginIncremental"/*nonNLS*/));
+ fBuildMonitor.beginBuild(fIsBatch ? Util.bind("build.beginBatch") : Util.bind("build.beginIncremental")); //$NON-NLS-2$ //$NON-NLS-1$
}
if (fProgress != null) {
- fProgress.beginTask(""/*nonNLS*/, fTotalWork);
+ fProgress.beginTask("", fTotalWork); //$NON-NLS-1$
}
this.previousSubtask = null;
}
@@ -90,9 +90,9 @@ public void compiling(CompilerCompilationUnit unit) { int start = message.indexOf('/', 1);
int end = message.lastIndexOf('/');
if (end <= start){
- message = Util.bind("build.compiling"/*nonNLS*/, message.substring(start+1));
+ message = Util.bind("build.compiling", message.substring(start+1)); //$NON-NLS-1$
} else {
- message = Util.bind("build.compilingContent"/*nonNLS*/, message.substring(start+1, end));
+ message = Util.bind("build.compilingContent", message.substring(start+1, end)); //$NON-NLS-1$
}
subTask(message);
updateProgressDelta(fProgressPerCompilationUnit/2);
@@ -100,12 +100,12 @@ public void compiling(CompilerCompilationUnit unit) { }
public void done() {
updateProgress(1.0f);
- subTask(Util.bind("build.done"/*nonNLS*/));
+ subTask(Util.bind("build.done")); //$NON-NLS-1$
if (fProgress != null) {
fProgress.done();
}
if (fBuildMonitor != null) {
- fBuildMonitor.endBuild(fIsBatch ? Util.bind("build.endBatch"/*nonNLS*/) : Util.bind("build.endIncremental"/*nonNLS*/));
+ fBuildMonitor.endBuild(fIsBatch ? Util.bind("build.endBatch") : Util.bind("build.endIncremental")); //$NON-NLS-2$ //$NON-NLS-1$
}
this.previousSubtask = null;
}
@@ -154,16 +154,16 @@ protected String problemsMessage() { int numNew = fNewErrorCount + fNewWarningCount;
int numFixed = fFixedErrorCount + fFixedWarningCount;
if (numNew == 0 && numFixed == 0) {
- return ""/*nonNLS*/;
+ return ""; //$NON-NLS-1$
}
if (numFixed == 0) {
- return '(' + numNew == 1 ? Util.bind("build.oneProblemFound"/*nonNLS*/, String.valueOf(numNew)) : Util.bind("build.problemsFound"/*nonNLS*/, String.valueOf(numNew)) +')';
+ return '(' + numNew == 1 ? Util.bind("build.oneProblemFound", String.valueOf(numNew)) : Util.bind("build.problemsFound", String.valueOf(numNew)) +')'; //$NON-NLS-2$ //$NON-NLS-1$
} else
if (numNew == 0) {
- return '(' + numFixed == 1 ? Util.bind("build.oneProblemFixed"/*nonNLS*/, String.valueOf(numFixed)) : Util.bind("build.problemsFixed"/*nonNLS*/, String.valueOf(numFixed)) + ')';
+ return '(' + numFixed == 1 ? Util.bind("build.oneProblemFixed", String.valueOf(numFixed)) : Util.bind("build.problemsFixed", String.valueOf(numFixed)) + ')'; //$NON-NLS-2$ //$NON-NLS-1$
} else {
- return '(' + (numFixed == 1 ? Util.bind("build.oneProblemFixed"/*nonNLS*/, String.valueOf(numFixed)) : Util.bind("build.problemsFixed"/*nonNLS*/, String.valueOf(numFixed)))
- + (numNew == 1 ? Util.bind("build.oneProblemFound"/*nonNLS*/, String.valueOf(numNew)) : Util.bind("build.problemsFound"/*nonNLS*/, String.valueOf(numNew))) + ')';
+ return '(' + (numFixed == 1 ? Util.bind("build.oneProblemFixed", String.valueOf(numFixed)) : Util.bind("build.problemsFixed", String.valueOf(numFixed))) //$NON-NLS-2$ //$NON-NLS-1$
+ + (numNew == 1 ? Util.bind("build.oneProblemFound", String.valueOf(numNew)) : Util.bind("build.problemsFound", String.valueOf(numNew))) + ')'; //$NON-NLS-2$ //$NON-NLS-1$
}
}
/**
@@ -183,7 +183,7 @@ public void setProgressPerCompilationUnit(float progress) { }
public void subTask(String message) {
String pm = problemsMessage();
- String msg = pm.length() == 0 ? message : pm + " "/*nonNLS*/ + message;
+ String msg = pm.length() == 0 ? message : pm + " " + message; //$NON-NLS-1$
if (msg.equals(this.previousSubtask)) return; // avoid refreshing with same one
if (DEBUG) System.out.println(msg);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ClassOrInterfaceHandleImplSWH.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ClassOrInterfaceHandleImplSWH.java index 6f5d52fc72..d4dadea883 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ClassOrInterfaceHandleImplSWH.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ClassOrInterfaceHandleImplSWH.java @@ -206,7 +206,7 @@ public int getDeclaredModifiers() throws NotPresentException { public String getDeclaredName() throws NotPresentException {
if (isAnonymous()) {
- return ""/*nonNLS*/;
+ return ""; //$NON-NLS-1$
}
String name = fHandle.getSimpleName();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/CompilerCompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/CompilerCompilationUnit.java index 37a55091c4..a56bd4af4c 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/CompilerCompilationUnit.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/CompilerCompilationUnit.java @@ -64,6 +64,6 @@ public SourceEntry getSourceEntry() { }
public String toString() {
// don't use append(char[]) due to JDK1.2 problems
- return new StringBuffer("CompilationUnit("/*nonNLS*/).append(getFileName()).append(")"/*nonNLS*/).toString();
+ return new StringBuffer("CompilationUnit(").append(getFileName()).append(")").toString(); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConstructorImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConstructorImpl.java index 260240acea..fe2ac0be92 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConstructorImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConstructorImpl.java @@ -9,7 +9,7 @@ import org.eclipse.jdt.internal.core.builder.*; public class ConstructorImpl extends AbstractMemberHandle implements IConstructor {
ConstructorImpl (ClassOrInterfaceHandleImpl owner, IType[] paramTypes) {
fOwner = owner;
- fSignature = computeSignature(""/*nonNLS*/, paramTypes);
+ fSignature = computeSignature("", paramTypes); //$NON-NLS-1$
}
public ConstructorImpl(ClassOrInterfaceHandleImpl owner, String signature) {
fOwner = owner;
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConvertedCompilationResult.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConvertedCompilationResult.java index d023e60cd2..e2afe9c68c 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConvertedCompilationResult.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConvertedCompilationResult.java @@ -38,6 +38,6 @@ ConvertedCompilationResult( return fTypes;
}
public String toString() {
- return (fProblems.length == 0 ? ""/*nonNLS*/ : "*"/*nonNLS*/) + "ConvertedCompilationResult("/*nonNLS*/ + fPackageElement + ")"/*nonNLS*/;
+ return (fProblems.length == 0 ? "" : "*") + "ConvertedCompilationResult(" + fPackageElement + ")"; //$NON-NLS-1$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-4$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DeltaImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DeltaImpl.java index 5407ba1f24..7d0040a654 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DeltaImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DeltaImpl.java @@ -28,17 +28,17 @@ class DeltaImpl implements IDelta { protected IImageContext fContext;
/* names for checklist items */
- public static final String fgImage = "Image"/*nonNLS*/;
+ public static final String fgImage = "Image"; //$NON-NLS-1$
- public static final String fgPackageCategory = "Packages"/*nonNLS*/;
- public static final String fgTypeCategory = "Types"/*nonNLS*/;
- public static final String fgBinaryCategory = "Binaries"/*nonNLS*/;
- public static final String fgMethodCategory = "Methods"/*nonNLS*/;
+ public static final String fgPackageCategory = "Packages"; //$NON-NLS-1$
+ public static final String fgTypeCategory = "Types"; //$NON-NLS-1$
+ public static final String fgBinaryCategory = "Binaries"; //$NON-NLS-1$
+ public static final String fgMethodCategory = "Methods"; //$NON-NLS-1$
- public static final String fgPackage = "Package"/*nonNLS*/;
- public static final String fgType = "Type"/*nonNLS*/;
- public static final String fgBinary = "Binary"/*nonNLS*/;
- public static final String fgMethod = "Method"/*nonNLS*/;
+ public static final String fgPackage = "Package"; //$NON-NLS-1$
+ public static final String fgType = "Type"; //$NON-NLS-1$
+ public static final String fgBinary = "Binary"; //$NON-NLS-1$
+ public static final String fgMethod = "Method"; //$NON-NLS-1$
/* convenience structure for delta calculation process */
class DeltaInfo {
@@ -99,7 +99,7 @@ class DeltaImpl implements IDelta { fNewState = (StateImpl)newState;
fOldState = (StateImpl)oldState;
} catch (ClassCastException cce) {
- Assert.isTrue(false, "Internal Error - Invalid states"/*nonNLS*/);
+ Assert.isTrue(false, "Internal Error - Invalid states"); //$NON-NLS-1$
}
fStatus = CHANGED;
fName = fgImage;
@@ -200,7 +200,7 @@ protected int compareBuilderType(BuilderType type) { */
public int compareTo(IDelta anotherDelta) {
/* is this used? */
- Assert.isTrue(false, "TBD"/*nonNLS*/);
+ Assert.isTrue(false, "TBD"); //$NON-NLS-1$
return 0;
}
/**
@@ -606,7 +606,7 @@ protected int compareTypes(IType handle) { }
protected static void dump(IDelta delta, int depth) {
for (int i = 0; i < depth; ++i)
- System.out.print(" "/*nonNLS*/);
+ System.out.print(" "); //$NON-NLS-1$
System.out.println(delta);
IDelta[] children = delta.getAffectedSubdeltas();
for (int i = 0; i < children.length; ++i) {
@@ -893,23 +893,23 @@ public Enumeration getAffectedPackages() { * @return java.lang.String
*/
public String toString() {
- StringBuffer sb = new StringBuffer("DeltaImpl("/*nonNLS*/);
+ StringBuffer sb = new StringBuffer("DeltaImpl("); //$NON-NLS-1$
switch (fStatus) {
- case ADDED: sb.append("+"/*nonNLS*/);
+ case ADDED: sb.append("+"); //$NON-NLS-1$
break;
- case REMOVED: sb.append("-"/*nonNLS*/);
+ case REMOVED: sb.append("-"); //$NON-NLS-1$
break;
- case CHANGED: sb.append("*"/*nonNLS*/);
+ case CHANGED: sb.append("*"); //$NON-NLS-1$
break;
- case SAME: sb.append("="/*nonNLS*/);
+ case SAME: sb.append("="); //$NON-NLS-1$
break;
- case UNKNOWN: sb.append("?"/*nonNLS*/);
+ case UNKNOWN: sb.append("?"); //$NON-NLS-1$
break;
- default: sb.append("(ERROR)"/*nonNLS*/);
+ default: sb.append("(ERROR)"); //$NON-NLS-1$
}
if (fKey.isRoot()) {
sb.append(fOldState);
- sb.append("-->"/*nonNLS*/);
+ sb.append("-->"); //$NON-NLS-1$
sb.append(fNewState);
}
else {
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DependencyGraph.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DependencyGraph.java index feeaac13a6..2ffce7be21 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DependencyGraph.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DependencyGraph.java @@ -106,7 +106,7 @@ public void add(PackageElement resultUnit, IType[] types, Vector vDependencies) }
catch (CloneNotSupportedException e) {
// Should not happen since we implement Cloneable
- Assert.isTrue(false, "Unexpected clone exception in DependencyGraph.clone()"/*nonNLS*/);
+ Assert.isTrue(false, "Unexpected clone exception in DependencyGraph.clone()"); //$NON-NLS-1$
return null;
}
}
@@ -186,7 +186,7 @@ public void add(PackageElement resultUnit, IType[] types, Vector vDependencies) value = fZips.remove(((ZipNode)toRemove).getZipFile());
break;
default:
- Assert.isTrue(false, "Attempt to delete unknown node type from dependency graph"/*nonNLS*/);
+ Assert.isTrue(false, "Attempt to delete unknown node type from dependency graph"); //$NON-NLS-1$
}
return (INode)value;
}
@@ -194,7 +194,7 @@ public void add(PackageElement resultUnit, IType[] types, Vector vDependencies) * For debugging only. Dump the graph in readable form.
*/
public void dump(Dumper dumper) {
- dumper.dumpMessage("Namespaces"/*nonNLS*/, ""/*nonNLS*/);
+ dumper.dumpMessage("Namespaces", ""); //$NON-NLS-2$ //$NON-NLS-1$
dumper.indent();
for (Enumeration e = fNamespaces.elements(); e.hasMoreElements();) {
AbstractNode node = (AbstractNode) e.nextElement();
@@ -202,7 +202,7 @@ public void dump(Dumper dumper) { }
dumper.outdent();
- dumper.dumpMessage("JCUs"/*nonNLS*/, ""/*nonNLS*/);
+ dumper.dumpMessage("JCUs", ""); //$NON-NLS-2$ //$NON-NLS-1$
dumper.indent();
for (Enumeration e = fCompilationUnits.elements(); e.hasMoreElements();) {
AbstractNode node = (AbstractNode) e.nextElement();
@@ -210,7 +210,7 @@ public void dump(Dumper dumper) { }
dumper.outdent();
- dumper.dumpMessage("ZIPs"/*nonNLS*/, ""/*nonNLS*/);
+ dumper.dumpMessage("ZIPs", ""); //$NON-NLS-2$ //$NON-NLS-1$
dumper.indent();
for (Enumeration e = fZips.elements(); e.hasMoreElements();) {
AbstractNode node = (AbstractNode) e.nextElement();
@@ -312,7 +312,7 @@ public Enumeration getJCUNodes() { return getNodeFor((IPath)o, create);
}
else {
- Assert.isTrue(false, "Unknown kind of node"/*nonNLS*/);
+ Assert.isTrue(false, "Unknown kind of node"); //$NON-NLS-1$
return null;
}
}
@@ -477,7 +477,7 @@ public Vector getUnusedNamespaceNodes() { * For debugging only -- asserts graph integrity
*/
public void integrityCheck(Dictionary table) {
- String msg = "Internal Error: the dependency graph is corrupt, do a full build to workaround error"/*nonNLS*/;
+ String msg = "Internal Error: the dependency graph is corrupt, do a full build to workaround error"; //$NON-NLS-1$
for (Enumeration e = table.elements(); e.hasMoreElements();) {
AbstractNode node = (AbstractNode) e.nextElement();
@@ -564,6 +564,6 @@ public void removePackage(IPackage pkg) { return fNamespaces.size() + fTypes.size() + fCompilationUnits.size();
}
public String toString() {
- return "a DependencyGraph"/*nonNLS*/;
+ return "a DependencyGraph"; //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldCollaboratorIndictment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldCollaboratorIndictment.java index 9f30f029a4..a838444518 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldCollaboratorIndictment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldCollaboratorIndictment.java @@ -24,6 +24,6 @@ protected FieldCollaboratorIndictment(char[] name) { */
public String toString() {
// don't use + with char[]
- return new StringBuffer("FieldIndictment("/*nonNLS*/).append(fName).append(")"/*nonNLS*/).toString();
+ return new StringBuffer("FieldIndictment(").append(fName).append(")").toString(); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldImpl.java index c2762ae8c0..f5bbc14bfa 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldImpl.java @@ -44,6 +44,6 @@ public IHandle inState(IState s) throws org.eclipse.jdt.internal.core.builder.St * toString method comment.
*/
public String toString() {
- return getDeclaringClass().getName() + "."/*nonNLS*/ + getName();
+ return getDeclaringClass().getName() + "." + getName(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageBuilderInternalException.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageBuilderInternalException.java index 3c67b9ee96..0f16b2f909 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageBuilderInternalException.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageBuilderInternalException.java @@ -40,7 +40,7 @@ public Throwable getThrowable() { public void printStackTrace() {
if (fThrowable != null) {
System.err.println(this);
- System.err.println("Stack trace of embedded throwable:"/*nonNLS*/);
+ System.err.println("Stack trace of embedded throwable:"); //$NON-NLS-1$
fThrowable.printStackTrace();
} else {
super.printStackTrace();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageContextImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageContextImpl.java index 210df5cc37..5a4fd511a0 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageContextImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageContextImpl.java @@ -88,9 +88,9 @@ public class ImageContextImpl implements IImageContext { * purposes only.
*/
public String toString() {
- StringBuffer buf = new StringBuffer("ImageContext with packages: \n"/*nonNLS*/);
+ StringBuffer buf = new StringBuffer("ImageContext with packages: \n"); //$NON-NLS-1$
for (int i = 0; i < fPackages.length; i++)
- buf.append(" "/*nonNLS*/ + fPackages[i].getName() + "\n"/*nonNLS*/);
+ buf.append(" " + fPackages[i].getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImpl.java index 1bf30c241f..41a3091b13 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImpl.java @@ -199,7 +199,7 @@ public org.eclipse.jdt.internal.core.builder.IType shortType() { * Returns a string representation of the image handle.
*/
public String toString() {
- return "image"/*nonNLS*/;
+ return "image"; //$NON-NLS-1$
}
/**
* Returns the Type representing the primitive type void
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImplSWH.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImplSWH.java index 1d35cebf32..6c8569537e 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImplSWH.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImplSWH.java @@ -114,7 +114,7 @@ public IType[] getAllClasses(IImageContext context) { Vector vResult = new Vector();
// try {
String extension = path.getFileExtension().toLowerCase();
- if (extension.equals("java"/*nonNLS*/) || extension.equals("class"/*nonNLS*/)) {
+ if (extension.equals("java") || extension.equals("class")) { //$NON-NLS-1$ //$NON-NLS-2$
IPath pkgPath = path.removeLastSegments(1);
IPackage pkg = fState.getPathMap().packageHandleFromPath(pkgPath);
TypeStructureEntry[] tsEntries = fState.getAllTypesForPackage(pkg);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IncrementalImageBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IncrementalImageBuilder.java index bfe0c977aa..398878fa64 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IncrementalImageBuilder.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IncrementalImageBuilder.java @@ -155,7 +155,7 @@ protected void addChangedFileNamesFromChangedPackage(IResourceDelta pkgDelta, Ha IPath path = elementDelta.getFullPath();
String extension = path.getFileExtension();
if (extension != null) {
- if (extension.equalsIgnoreCase("java"/*nonNLS*/) || extension.equalsIgnoreCase("class"/*nonNLS*/)) {
+ if (extension.equalsIgnoreCase("java") || extension.equalsIgnoreCase("class")) { //$NON-NLS-1$ //$NON-NLS-2$
SourceEntry entry = new SourceEntry(path, null, null);
PackageElement element = new PackageElement(pkg, entry);
pkgTable.put(entry.getFileName(), element);
@@ -198,7 +198,7 @@ protected void addSourceElement(SourceEntry newEntry) { public void applySourceDelta(Hashtable deltas) {
fNotifier = new BuildNotifier(fDC, false);
fNotifier.begin();
- fNotifier.subTask(Util.bind("build.preparingBuild"/*nonNLS*/));
+ fNotifier.subTask(Util.bind("build.preparingBuild")); //$NON-NLS-1$
fSourceDeltas = deltas;
fNewState = fOldState.copy(fNewProject, fImageContext);
@@ -207,7 +207,7 @@ public void applySourceDelta(Hashtable deltas) { try {
/* find out what has changed at the package level */
- fNotifier.subTask(Util.bind("build.analyzingPackages"/*nonNLS*/));
+ fNotifier.subTask(Util.bind("build.analyzingPackages")); //$NON-NLS-1$
computeAllPackages();
checkCancel();
@@ -235,7 +235,7 @@ public void applySourceDelta(Hashtable deltas) { }
/* find out what has changed at the package element level */
- fNotifier.subTask(Util.bind("build.analyzingSources"/*nonNLS*/));
+ fNotifier.subTask(Util.bind("build.analyzingSources")); //$NON-NLS-1$
computeAllClasses();
checkCancel();
@@ -581,8 +581,8 @@ protected void computeAllPackages(IResourceDelta delta, IPackageFragmentRoot[] o for (int i = 0; i < children.length; ++i) {
String extension = children[i].getFullPath().getFileExtension();
if (extension == null
- || extension.equalsIgnoreCase("zip"/*nonNLS*/)
- || extension.equalsIgnoreCase("jar"/*nonNLS*/)) {
+ || extension.equalsIgnoreCase("zip") //$NON-NLS-1$
+ || extension.equalsIgnoreCase("jar")) { //$NON-NLS-1$
// TBD: Currently rely on empty extension indicating folder
computeAllPackages(children[i], oldRoots, newRoots);
}
@@ -627,7 +627,7 @@ protected void computeNamespaceChanges() { // Process added packages
for (Enumeration addedPkgs = fAddedPackageHandles.elements(); addedPkgs.hasMoreElements();) {
IPackage pkg = (IPackage) addedPkgs.nextElement();
- fNotifier.subTask(Util.bind("build.analyzing"/*nonNLS*/, PackageImpl.readableName(pkg)));
+ fNotifier.subTask(Util.bind("build.analyzing", PackageImpl.readableName(pkg))); //$NON-NLS-1$
// Mark all dependents of missing namespace as needing compile.
markDependentsAsNeedingCompile(pkg);
@@ -642,7 +642,7 @@ protected void computeNamespaceChanges() { // Process removed packages
for (Enumeration removedPkgs = fRemovedPackageHandles.elements(); removedPkgs.hasMoreElements();) {
IPackage pkg = (IPackage) removedPkgs.nextElement();
- fNotifier.subTask(Util.bind("build.analyzing"/*nonNLS*/, PackageImpl.readableName(pkg)));
+ fNotifier.subTask(Util.bind("build.analyzing", PackageImpl.readableName(pkg))); //$NON-NLS-1$
// Mark all dependents of namespace as needing compile.
markDependentsAsNeedingCompile(pkg);
@@ -657,7 +657,7 @@ protected void computeNamespaceChanges() { // Process changed packages
for (Enumeration changedPkgs = fChangedPackageHandles.elements(); changedPkgs.hasMoreElements();) {
IPackage pkg = (IPackage) changedPkgs.nextElement();
- fNotifier.subTask(Util.bind("build.analyzing"/*nonNLS*/, PackageImpl.readableName(pkg)));
+ fNotifier.subTask(Util.bind("build.analyzing", PackageImpl.readableName(pkg))); //$NON-NLS-1$
computeNamespaceChanges(pkg);
fNotifier.updateProgressDelta(progressDelta);
fNotifier.checkCancel();
@@ -670,7 +670,7 @@ protected void computeNamespaceChanges(Hashtable oldTSEntries, String parentType String typeName = type.getElementName();
if (parentTypeName != null) {
int len = parentTypeName.length() + typeName.length() + 1;
- typeName = new StringBuffer(len).append(parentTypeName).append("$"/*nonNLS*/).append(typeName).toString();
+ typeName = new StringBuffer(len).append(parentTypeName).append("$").append(typeName).toString(); //$NON-NLS-1$
}
/* Remove it so that only non-matching ones remain in the table. */
TypeStructureEntry tsEntry = (TypeStructureEntry) oldTSEntries.remove(typeName);
@@ -913,7 +913,7 @@ static void dump(IResourceDelta delta) { StringBuffer sb = new StringBuffer();
IPath path = delta.getFullPath();
for (int i = path.segmentCount(); --i > 0;) {
- sb.append(" "/*nonNLS*/);
+ sb.append(" "); //$NON-NLS-1$
}
switch (delta.getKind()) {
case IResourceDelta.ADDED:
@@ -1047,7 +1047,7 @@ protected Dictionary getSourceChanges(IPackage pkgHandle) { /* skip non-java resources */
String extension = path.getFileExtension();
- if (extension != null && (extension.equalsIgnoreCase("java"/*nonNLS*/) || extension.equalsIgnoreCase("class"/*nonNLS*/))) {
+ if (extension != null && (extension.equalsIgnoreCase("java") || extension.equalsIgnoreCase("class"))) { //$NON-NLS-1$ //$NON-NLS-2$
set.put(path, path);
}
}
@@ -1071,7 +1071,7 @@ protected boolean hasPackageMapChanges() { IResourceDelta changed = (IResourceDelta) e.nextElement();
String extension = changed.getFullPath().getFileExtension();
if (extension != null) {
- if (extension.equalsIgnoreCase("zip"/*nonNLS*/) || extension.equalsIgnoreCase("jar"/*nonNLS*/)) {
+ if (extension.equalsIgnoreCase("zip") || extension.equalsIgnoreCase("jar")) { //$NON-NLS-1$ //$NON-NLS-2$
return true;
}
}
@@ -1126,7 +1126,7 @@ protected boolean hasSourceEntryChanges(IPackage pkgHandle) { /* skip java resources */
String extension = path.getFileExtension();
if (extension != null) {
- if ((extension.equalsIgnoreCase("java"/*nonNLS*/) || extension.equalsIgnoreCase("class"/*nonNLS*/))) {
+ if ((extension.equalsIgnoreCase("java") || extension.equalsIgnoreCase("class"))) { //$NON-NLS-1$ //$NON-NLS-2$
/* if there is an added or removed jcu or binary, the source entries have changed */
int status = fileDeltas[j].getKind();
if (status == IResourceDelta.ADDED || status == IResourceDelta.REMOVED) {
@@ -1422,7 +1422,7 @@ protected void sort(PackageElement[] compileArray) { * @see IImageBuilder
*/
public String toString() {
- return "incremental image builder for:\n"/*nonNLS*/ + "\tnew state: "/*nonNLS*/ + getNewState() + "\n"/*nonNLS*/ + "\told state: "/*nonNLS*/ + getOldState();
+ return "incremental image builder for:\n" + "\tnew state: " + getNewState() + "\n" + "\told state: " + getOldState(); //$NON-NLS-1$ //$NON-NLS-4$ //$NON-NLS-2$ //$NON-NLS-3$
}
/**
* If this type is a subtype is the originator of an abstract method
@@ -1633,7 +1633,7 @@ protected boolean tryZeroArgConstructorInSuperclass(PackageElement unit, Indictm for (int i = 0; i < types.length; ++i) {
IType superclass = getBuilderType(types[i]).getSuperclass();
if (superclass != null) {
- String key = '<' + superclass.getDeclaredName() + ">/0"/*nonNLS*/;
+ String key = '<' + superclass.getDeclaredName() + ">/0"; //$NON-NLS-1$
if (indictments.tryMethodEvidence(key.toCharArray())) {
return true;
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IndictmentSet.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IndictmentSet.java index b9040e53ca..c37effa7b2 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IndictmentSet.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IndictmentSet.java @@ -56,7 +56,7 @@ public class IndictmentSet { fMethodOwners = new Hashtable(11);
fMethodOwners.put(owner, owner);
fMethodOwnersArray = null;
- if (i.getName().startsWith("<"/*nonNLS*/)) {
+ if (i.getName().startsWith("<")) { //$NON-NLS-1$
fHasConstructorIndictments = true;
}
break;
@@ -71,7 +71,7 @@ public class IndictmentSet { fAbstractMethodTable.put(i.getKey(), i);
break;
default:
- Assert.isTrue(false, "Internal Error - Unexpected kind of indictment"/*nonNLS*/);
+ Assert.isTrue(false, "Internal Error - Unexpected kind of indictment"); //$NON-NLS-1$
break;
}
}
@@ -161,13 +161,13 @@ public void convictAll() { */
public String toString() {
return
- "IndictmentSet("/*nonNLS*/
- + "\n hierarchyChange: "/*nonNLS*/ + fHierarchyChange
- + "\n types:\n"/*nonNLS*/ + fTypesTable
- + "\n interfaces:\n"/*nonNLS*/ + fAbstractMethodTable
- + "\n methods:\n"/*nonNLS*/ + fMethodsTable
- + "\n fields:\n"/*nonNLS*/ + fFieldsTable
- + "\n)"/*nonNLS*/;
+ "IndictmentSet(" //$NON-NLS-1$
+ + "\n hierarchyChange: " + fHierarchyChange //$NON-NLS-1$
+ + "\n types:\n" + fTypesTable //$NON-NLS-1$
+ + "\n interfaces:\n" + fAbstractMethodTable //$NON-NLS-1$
+ + "\n methods:\n" + fMethodsTable //$NON-NLS-1$
+ + "\n fields:\n" + fFieldsTable //$NON-NLS-1$
+ + "\n)"; //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JCUNode.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JCUNode.java index 192d62644e..3438cb221a 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JCUNode.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JCUNode.java @@ -86,6 +86,6 @@ public class JCUNode extends AbstractNode { * purposes only.
*/
public String toString() {
- return "JCUNode("/*nonNLS*/ + fUnit.getFileName() + ")"/*nonNLS*/;
+ return "JCUNode(" + fUnit.getFileName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaBuilder.java index 4243f759c5..f18efd9ed9 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaBuilder.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaBuilder.java @@ -60,7 +60,7 @@ public JavaBuilder() { if (e.getThrowable() instanceof CoreException) {
throw (CoreException) e.getThrowable();
} else {
- throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("build.builderName"/*nonNLS*/), e));
+ throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, -1, Util.bind("build.builderName"), e)); //$NON-NLS-1$
}
} catch (OperationCanceledException e) {
// Do nothing for now, and avoid propagating the exception.
@@ -74,7 +74,7 @@ public JavaBuilder() { // forcing a full build next time.
setLastBuiltState(null);
}
- if (monitor != null) monitor.subTask(Util.bind("build.completed"/*nonNLS*/));
+ if (monitor != null) monitor.subTask(Util.bind("build.completed")); //$NON-NLS-1$
}
return getRequiredProjects(getLastBuiltState(monitor));
}
@@ -93,28 +93,28 @@ public JavaBuilder() { Hashtable deltas = new Hashtable(11);
IProject project = getProject();
- if (monitor != null) monitor.subTask(Util.bind("build.readingDelta"/*nonNLS*/, project.getName()));
+ if (monitor != null) monitor.subTask(Util.bind("build.readingDelta", project.getName())); //$NON-NLS-1$
IResourceDelta delta = getDelta(project);
if (delta == null){
//System.out.println("Missing delta for: "+ project.getName());
- if (monitor != null) monitor.subTask(""/*nonNLS*/);
+ if (monitor != null) monitor.subTask(""); //$NON-NLS-1$
return null;
} else {
deltas.put(project, delta);
}
IProject[] prereqs = getRequiredProjects(oldState);
for (int i = 0; i < prereqs.length; ++i) {
- if (monitor != null) monitor.subTask(Util.bind("build.readingDelta"/*nonNLS*/, prereqs[i].getName()));
+ if (monitor != null) monitor.subTask(Util.bind("build.readingDelta", prereqs[i].getName())); //$NON-NLS-1$
delta = getDelta(prereqs[i]);
if (delta == null){
//System.out.println("Missing delta for: "+ prereqs[i].getName());
- if (monitor != null) monitor.subTask(""/*nonNLS*/);
+ if (monitor != null) monitor.subTask(""); //$NON-NLS-1$
return null;
} else {
deltas.put(prereqs[i], delta);
}
}
- if (monitor != null) monitor.subTask(""/*nonNLS*/);
+ if (monitor != null) monitor.subTask(""); //$NON-NLS-1$
return deltas;
}
/**
@@ -127,7 +127,7 @@ protected boolean classpathChanged(IState lastBuiltState) throws CoreException { return !Util.equalArraysOrNull(oldRoots, newRoots);
} catch (JavaModelException e) {
throw new CoreException(
- new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, Util.bind("element.projectDoesNotExist"/*nonNLS*/, getProject().getFullPath().toString()), e));
+ new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, Util.bind("element.projectDoesNotExist", getProject().getFullPath().toString()), e)); //$NON-NLS-1$
}
}
/**
@@ -237,8 +237,8 @@ protected boolean isEmpty(IResourceDelta change) { int flags = change.getFlags();
boolean contentChanged = isChanged && (flags & IResourceDelta.CONTENT) != 0;
String extension = change.getFullPath().getFileExtension();
- boolean isJavaOrClassFile = extension != null && (extension.equalsIgnoreCase("java"/*nonNLS*/) || extension.equalsIgnoreCase("class"/*nonNLS*/));
- boolean isArchive = extension != null && (extension.equalsIgnoreCase("zip"/*nonNLS*/) || extension.equalsIgnoreCase("jar"/*nonNLS*/));
+ boolean isJavaOrClassFile = extension != null && (extension.equalsIgnoreCase("java") || extension.equalsIgnoreCase("class")); //$NON-NLS-1$ //$NON-NLS-2$
+ boolean isArchive = extension != null && (extension.equalsIgnoreCase("zip") || extension.equalsIgnoreCase("jar")); //$NON-NLS-1$ //$NON-NLS-2$
// care about added, removed and modified (content actually modified) .java and .class files
if (isJavaOrClassFile && (isAdded || isRemoved || contentChanged))
@@ -288,7 +288,7 @@ protected boolean outputLocationChanged(IState lastBuiltState) throws CoreExcept IPath newOutputLocation = getJavaProject().getOutputLocation();
return !oldOutputLocation.equals(newOutputLocation);
} catch (JavaModelException e) {
- throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, Util.bind("element.projectDoesNotExist"/*nonNLS*/, getProject().getFullPath().toString()), e));
+ throw new CoreException(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Platform.PLUGIN_ERROR, Util.bind("element.projectDoesNotExist", getProject().getFullPath().toString()), e)); //$NON-NLS-1$
}
}
protected void setLastBuiltState(IState state) {
@@ -300,9 +300,9 @@ protected void setLastBuiltState(IState state) { public String toString() {
IState lastBuiltState = getLastBuiltState(null);
if (lastBuiltState == null) {
- return "JavaBuilder(no built state)"/*nonNLS*/;
+ return "JavaBuilder(no built state)"; //$NON-NLS-1$
} else {
- return "JavaBuilder("/*nonNLS*/ + lastBuiltState + ")"/*nonNLS*/;
+ return "JavaBuilder(" + lastBuiltState + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaDevelopmentContextImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaDevelopmentContextImpl.java index 720f1c48d6..118f597b18 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaDevelopmentContextImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaDevelopmentContextImpl.java @@ -72,12 +72,12 @@ public class JavaDevelopmentContextImpl implements IDevelopmentContext { /**
* The default package.
*/
- private final IPackage fDefaultPackage = fImage.getPackageHandle("java.lang"/*nonNLS*/, false);
+ private final IPackage fDefaultPackage = fImage.getPackageHandle("java.lang", false); //$NON-NLS-1$
/**
* The root class handle
*/
- private final IType fRootClass = fDefaultPackage.getClassHandle("Object"/*nonNLS*/);
+ private final IType fRootClass = fDefaultPackage.getClassHandle("Object"); //$NON-NLS-1$
/**
* Primitive types
@@ -197,7 +197,7 @@ protected Vector getBuildListeners() { }
public IState getCurrentState() throws NotPresentException {
if (fCurrentState == null) {
- throw new NotPresentException("Internal Error - No current state"/*nonNLS*/);
+ throw new NotPresentException("Internal Error - No current state"); //$NON-NLS-1$
}
return fCurrentState;
}
@@ -297,7 +297,7 @@ protected IType[] parameterTypesFromSignature(final String signature) { char c = localSig.charAt(position);
if (c == 'L' || c == 'Q') {
/* its a class type */
- int endIndex = localSig.indexOf(";"/*nonNLS*/) + 1;
+ int endIndex = localSig.indexOf(";") + 1; //$NON-NLS-1$
parmType = classTypeFromName(localSig.substring(position, endIndex));
localSig = localSig.substring(endIndex);
} else {
@@ -413,6 +413,6 @@ public void setCurrentState(IState state) { fProgressMonitor = monitor;
}
public String toString() {
- return "a JavaDevelopmentContextImpl("/*nonNLS*/ + fCurrentState + ")"/*nonNLS*/;
+ return "a JavaDevelopmentContextImpl(" + fCurrentState + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MarkerProblemReporter.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MarkerProblemReporter.java index 20afe786bd..11927c5611 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MarkerProblemReporter.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MarkerProblemReporter.java @@ -123,7 +123,7 @@ protected void markerFromProblemDetail(IResource resource, IProblemDetail proble int start = problem.getStartPos();
int sev = problem.getSeverity();
marker.setAttributes(
- new String[]{ IMarker.MESSAGE, IMarker.SEVERITY, "ID"/*nonNLS*/, IMarker.CHAR_START, IMarker.CHAR_END, IMarker.LINE_NUMBER},
+ new String[]{ IMarker.MESSAGE, IMarker.SEVERITY, "ID", IMarker.CHAR_START, IMarker.CHAR_END, IMarker.LINE_NUMBER}, //$NON-NLS-1$
new Object[]{
problem.getMessage(),
new Integer((sev & IProblemDetail.S_ERROR) != 0 ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING),
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodCollaboratorIndictment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodCollaboratorIndictment.java index 4d8740ed2e..bb99d279e2 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodCollaboratorIndictment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodCollaboratorIndictment.java @@ -57,7 +57,7 @@ protected MethodCollaboratorIndictment(IType owner, char[] name, int parmCount) * only (NON-NLS).
*/
public String toString() {
- StringBuffer buf = new StringBuffer("MethodIndictment("/*nonNLS*/);
+ StringBuffer buf = new StringBuffer("MethodIndictment("); //$NON-NLS-1$
buf.append(fName);
buf.append('/');
buf.append(fParmCount);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodImpl.java index 9f37f904a1..7864051a0b 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodImpl.java @@ -61,14 +61,14 @@ public class MethodImpl extends AbstractMemberHandle implements IMethod { * unqualified source signature format.
*/
protected String getSourceParameters() {
- String sourceSig = "("/*nonNLS*/;
+ String sourceSig = "("; //$NON-NLS-1$
/* append parameter types to signature */
IType[] parms = getParameterTypes();
for (int i = 0; i < parms.length; i++) {
sourceSig += parms[i].getSimpleName().replace('L', 'Q');
}
- sourceSig += ")"/*nonNLS*/;
+ sourceSig += ")"; //$NON-NLS-1$
return sourceSig;
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ModifiedBuilderType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ModifiedBuilderType.java index 283589f160..74aea1cb36 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ModifiedBuilderType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ModifiedBuilderType.java @@ -249,7 +249,7 @@ public void setNewTypeStructureEntry(TypeStructureEntry newEntry) { * For debugging only
*/
public String toString() {
- StringBuffer buf = new StringBuffer("ModifiedBuilderType("/*nonNLS*/);
+ StringBuffer buf = new StringBuffer("ModifiedBuilderType("); //$NON-NLS-1$
return buf.append(fOldTSEntry.getType().getName()).append(')').toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NamespaceNode.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NamespaceNode.java index 852058220b..2c53ebf0c1 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NamespaceNode.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NamespaceNode.java @@ -62,6 +62,6 @@ public class NamespaceNode extends AbstractNode { * purposes only.
*/
public String toString() {
- return "NamespaceNode("/*nonNLS*/ + fPackage.getName() + ")"/*nonNLS*/;
+ return "NamespaceNode(" + fPackage.getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NewBuilderType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NewBuilderType.java index 1b40365c57..aff7c6241f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NewBuilderType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NewBuilderType.java @@ -48,6 +48,6 @@ public void setNewTypeStructureEntry(TypeStructureEntry newEntry) { * For debugging only
*/
public String toString() {
- return "NewBuilderType("/*nonNLS*/ + fNewTSEntry.getType().getName() + ")"/*nonNLS*/;
+ return "NewBuilderType(" + fNewTSEntry.getType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NonStateSpecificHandleImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NonStateSpecificHandleImpl.java index 2b5be96a65..71dde7667d 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NonStateSpecificHandleImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NonStateSpecificHandleImpl.java @@ -9,7 +9,7 @@ import org.eclipse.jdt.internal.core.builder.*; public abstract class NonStateSpecificHandleImpl implements IHandle {
public boolean equals(Object obj) {
- Assert.isTrue(false, "TBD"/*nonNLS*/);
+ Assert.isTrue(false, "TBD"); //$NON-NLS-1$
return false;
}
public IDevelopmentContext getDevelopmentContext() {
@@ -107,7 +107,7 @@ static IType[] nonStateSpecific(IType[] stateSpecific) { return result;
}
public String toString() {
- Assert.isTrue(false, "TBD"/*nonNLS*/);
+ Assert.isTrue(false, "TBD"); //$NON-NLS-1$
return null;
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OldBuilderType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OldBuilderType.java index 7d947d4935..f65be18f2e 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OldBuilderType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OldBuilderType.java @@ -56,6 +56,6 @@ public void setNewTypeStructureEntry(TypeStructureEntry newEntry) { * For debugging only
*/
public String toString() {
- return "OldBuilderType("/*nonNLS*/ + fOldTSEntry.getType().getName() + ")"/*nonNLS*/;
+ return "OldBuilderType(" + fOldTSEntry.getType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OrderedSet.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OrderedSet.java index a37998d4ef..5cbcc5fbce 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OrderedSet.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OrderedSet.java @@ -214,7 +214,7 @@ public String toString () { for (int i=0; i<elementCount; i++) {
if (i != 0) buffer.append (',');
if (buffer.length() > 1000) {
- buffer.append("..."/*nonNLS*/);
+ buffer.append("..."); //$NON-NLS-1$
break;
}
buffer.append (orderedList[i]);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImpl.java index 99c8630ce8..1a6c0c971c 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImpl.java @@ -19,7 +19,7 @@ public class PackageImpl extends NonStateSpecificHandleImpl implements IPackage String fName;
boolean fIsUnnamed;
- public static final String DEFAULT_PACKAGE_PREFIX = "Default-"/*nonNLS*/;
+ public static final String DEFAULT_PACKAGE_PREFIX = "Default-"; //$NON-NLS-1$
/**
* Creates a new package
* @param name of package
@@ -203,9 +203,9 @@ public boolean isUnnamed() { public static String readableName(IPackage pkg) {
String name = pkg.getName();
if (pkg.isUnnamed()) {
- return Util.bind("build.defaultPackageName"/*nonNLS*/, name.substring(DEFAULT_PACKAGE_PREFIX.length()));
+ return Util.bind("build.defaultPackageName", name.substring(DEFAULT_PACKAGE_PREFIX.length())); //$NON-NLS-1$
} else {
- return Util.bind("build.packageName"/*nonNLS*/, name);
+ return Util.bind("build.packageName", name); //$NON-NLS-1$
}
}
/**
@@ -213,9 +213,9 @@ public static String readableName(IPackage pkg) { * only (NON-NLS).
*/
public String toString() {
- String result = "package "/*nonNLS*/;
+ String result = "package "; //$NON-NLS-1$
if (isUnnamed())
- result += "{unnamed, id="/*nonNLS*/ + getName() + "}"/*nonNLS*/;
+ result += "{unnamed, id=" + getName() + "}"; //$NON-NLS-2$ //$NON-NLS-1$
else
result += getName();
return result;
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImplSWH.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImplSWH.java index 8bf3a153fa..4f34fc8b68 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImplSWH.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImplSWH.java @@ -146,7 +146,7 @@ public IPackage[] getReferencedPackages() throws NotPresentException { public IPackage[] getReferencingPackages(IImageContext context)
throws NotPresentException {
if (!isPresent())
- throw new NotPresentException(Util.bind("element.notPresent"/*nonNLS*/));
+ throw new NotPresentException(Util.bind("element.notPresent")); //$NON-NLS-1$
IPackage[] pkgs = fState.getReferencingPackages(fHandle, context);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMap.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMap.java index 8f88cf2b6e..ed4d744c87 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMap.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMap.java @@ -112,15 +112,15 @@ public class PackageMap extends StateTables { IPackage[] pkgs = getAllPackagesAsArray();
Arrays.sort(pkgs, StateImpl.getPackageComparator());
StringBuffer sb = new StringBuffer();
- sb.append(super.toString() + ":\n"/*nonNLS*/);
+ sb.append(super.toString() + ":\n"); //$NON-NLS-1$
for (int i = 0; i < pkgs.length; ++i) {
- sb.append(" "/*nonNLS*/ + pkgs[i].getName() + ": "/*nonNLS*/);
+ sb.append(" " + pkgs[i].getName() + ": "); //$NON-NLS-2$ //$NON-NLS-1$
IPath[] fragments = getFragments(pkgs[i]);
for (int j = 0; j < fragments.length; ++j) {
- if (j != 0) sb.append(", "/*nonNLS*/);
+ if (j != 0) sb.append(", "); //$NON-NLS-1$
sb.append(fragments[j]);
}
- sb.append("\n"/*nonNLS*/);
+ sb.append("\n"); //$NON-NLS-1$
}
return sb.toString();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMapEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMapEntry.java index 6f80669b5e..869afaa6df 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMapEntry.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMapEntry.java @@ -73,9 +73,9 @@ void addFragment(IPath fragment) { * This method is for debugging purposes only.
*/
public String toString() {
- StringBuffer buf = new StringBuffer("PackageMapEntry("/*nonNLS*/);
+ StringBuffer buf = new StringBuffer("PackageMapEntry("); //$NON-NLS-1$
buf.append(fPkg);
- buf.append(")"/*nonNLS*/);
+ buf.append(")"); //$NON-NLS-1$
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PathMap.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PathMap.java index 4a85e78bc8..98908acfe6 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PathMap.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PathMap.java @@ -61,10 +61,10 @@ boolean hasPath(IPath path) { IPackage packageHandleFromPath(IPath path) {
IPackage[] pkgs = (IPackage[])fTable.get(path);
if (pkgs == null) {
- throw new Error(Util.bind("build.noPackagePath"/*nonNLS*/, path.toString()));
+ throw new Error(Util.bind("build.noPackagePath", path.toString())); //$NON-NLS-1$
}
if (pkgs.length != 1) {
- throw new Error(Util.bind("build.ambiguousPackage"/*nonNLS*/, path.toString()));
+ throw new Error(Util.bind("build.ambiguousPackage", path.toString())); //$NON-NLS-1$
}
return pkgs[0];
}
@@ -120,23 +120,23 @@ IPackage[] packageHandlesFromPath(IPath path) { }
Collections.sort(list, StateImpl.getPathComparator());
StringBuffer sb = new StringBuffer();
- sb.append(super.toString() + ":\n"/*nonNLS*/);
+ sb.append(super.toString() + ":\n"); //$NON-NLS-1$
for (int i = 0; i < list.size(); ++i) {
IPath path = (IPath) list.get(i);
- sb.append(" "/*nonNLS*/ + path + ": "/*nonNLS*/);
+ sb.append(" " + path + ": "); //$NON-NLS-2$ //$NON-NLS-1$
IPackage[] pkgs = packageHandlesFromPath(path);
if (pkgs.length == 1) {
sb.append(pkgs[0].getName());
}
else {
Arrays.sort(pkgs, StateImpl.getPackageComparator());
- sb.append("("/*nonNLS*/ + pkgs.length + " packages)"/*nonNLS*/);
+ sb.append("(" + pkgs.length + " packages)"); //$NON-NLS-2$ //$NON-NLS-1$
for (int j = 0; j < pkgs.length; ++j) {
- sb.append("\n "/*nonNLS*/);
+ sb.append("\n "); //$NON-NLS-1$
sb.append(pkgs[j].getName());
}
}
- sb.append("\n"/*nonNLS*/);
+ sb.append("\n"); //$NON-NLS-1$
}
return sb.toString();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PrimitiveTypeHandleImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PrimitiveTypeHandleImpl.java index ecf1893011..db45948865 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PrimitiveTypeHandleImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PrimitiveTypeHandleImpl.java @@ -149,23 +149,23 @@ public String getName() { public String getSimpleName() {
switch (fTypeCode) {
case TC_BOOLEAN :
- return "boolean"/*nonNLS*/;
+ return "boolean"; //$NON-NLS-1$
case TC_BYTE :
- return "byte"/*nonNLS*/;
+ return "byte"; //$NON-NLS-1$
case TC_CHAR :
- return "char"/*nonNLS*/;
+ return "char"; //$NON-NLS-1$
case TC_DOUBLE :
- return "double"/*nonNLS*/;
+ return "double"; //$NON-NLS-1$
case TC_FLOAT :
- return "float"/*nonNLS*/;
+ return "float"; //$NON-NLS-1$
case TC_INT :
- return "int"/*nonNLS*/;
+ return "int"; //$NON-NLS-1$
case TC_LONG :
- return "long"/*nonNLS*/;
+ return "long"; //$NON-NLS-1$
case TC_SHORT :
- return "short"/*nonNLS*/;
+ return "short"; //$NON-NLS-1$
case TC_VOID :
- return "void"/*nonNLS*/;
+ return "void"; //$NON-NLS-1$
default :
}
return null;
@@ -219,25 +219,25 @@ public boolean isPrimitive() { protected static String typeSignature(int typeCode) {
switch (typeCode) {
case TC_VOID :
- return "V"/*nonNLS*/;
+ return "V"; //$NON-NLS-1$
case TC_BOOLEAN :
- return "Z"/*nonNLS*/;
+ return "Z"; //$NON-NLS-1$
case TC_BYTE :
- return "B"/*nonNLS*/;
+ return "B"; //$NON-NLS-1$
case TC_CHAR :
- return "C"/*nonNLS*/;
+ return "C"; //$NON-NLS-1$
case TC_SHORT :
- return "S"/*nonNLS*/;
+ return "S"; //$NON-NLS-1$
case TC_INT :
- return "I"/*nonNLS*/;
+ return "I"; //$NON-NLS-1$
case TC_LONG :
- return "J"/*nonNLS*/;
+ return "J"; //$NON-NLS-1$
case TC_FLOAT :
- return "F"/*nonNLS*/;
+ return "F"; //$NON-NLS-1$
case TC_DOUBLE :
- return "D"/*nonNLS*/;
+ return "D"; //$NON-NLS-1$
default :
- return "unknown"/*nonNLS*/;
+ return "unknown"; //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemDetailImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemDetailImpl.java index 812c53225b..a0d71a0ee9 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemDetailImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemDetailImpl.java @@ -197,6 +197,6 @@ public void setSourceStart(int sourceStart) { * purposes only. Non-NLS.
*/
public String toString() {
- return "ProblemDetail("/*nonNLS*/ + getMessage() + ")"/*nonNLS*/;
+ return "ProblemDetail(" + getMessage() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemFactory.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemFactory.java index 87c7237959..14672d113d 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemFactory.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemFactory.java @@ -25,7 +25,7 @@ public class ProblemFactory implements IProblemFactory { */
private ProblemFactory(Locale locale) {
fLocale = locale;
- fCompilerResources = ResourceBundle.getBundle("org.eclipse.jdt.internal.compiler.problem.Messages"/*nonNLS*/, locale);
+ fCompilerResources = ResourceBundle.getBundle("org.eclipse.jdt.internal.compiler.problem.Messages", locale); //$NON-NLS-1$
initializeMessageTemplates();
}
/**
@@ -53,7 +53,7 @@ public String getLocalizedMessage(int id, String[] problemArguments) { StringBuffer output = new StringBuffer(80);
String message = fMessageTemplates[ (id & ProblemIrritants.IgnoreCategoriesMask)];
if (message == null) {
- return "Unable to retrieve the error message for problem id: "/*nonNLS*/+ id + ". Check compiler resources."/*nonNLS*/;
+ return "Unable to retrieve the error message for problem id: "+ id + ". Check compiler resources."; //$NON-NLS-1$ //$NON-NLS-2$
}
int length = message.length();
int start = -1, end = length;
@@ -66,7 +66,7 @@ public String getLocalizedMessage(int id, String[] problemArguments) { } catch (NumberFormatException nfe) {
output.append(message.substring(end + 1, start + 1));
} catch (ArrayIndexOutOfBoundsException e) {
- return "Corrupted compiler resources for problem id: "/*nonNLS*/ + (id & ProblemIrritants.IgnoreCategoriesMask) + ". Check compiler resources."/*nonNLS*/;
+ return "Corrupted compiler resources for problem id: " + (id & ProblemIrritants.IgnoreCategoriesMask) + ". Check compiler resources."; //$NON-NLS-1$ //$NON-NLS-2$
}
} else {
output.append(message.substring(end, length));
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemTable.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemTable.java index 3b7e49c40b..9d92795185 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemTable.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemTable.java @@ -170,12 +170,12 @@ public void removeSyntaxErrors(Object entry) { * @return a string representation of the receiver
*/
public String toString() {
- StringBuffer buf = new StringBuffer("ProblemTable(\n\t"/*nonNLS*/);
- buf.append("type problems: "/*nonNLS*/);
+ StringBuffer buf = new StringBuffer("ProblemTable(\n\t"); //$NON-NLS-1$
+ buf.append("type problems: "); //$NON-NLS-1$
buf.append(fTable);
- buf.append("\n\timage problems: "/*nonNLS*/);
+ buf.append("\n\timage problems: "); //$NON-NLS-1$
buf.append(fImageProblems);
- buf.append(")"/*nonNLS*/);
+ buf.append(")"); //$NON-NLS-1$
return buf.toString();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectBinaryOutput.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectBinaryOutput.java index 2f891aeca5..6973b1669b 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectBinaryOutput.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectBinaryOutput.java @@ -103,7 +103,7 @@ private void deleteClassesInContainer(IContainer container) { IResource resource = (IResource) members[i];
switch (resource.getType()) {
case IResource.FILE :
- if (resource.getName().toLowerCase().endsWith(".class"/*nonNLS*/)) {
+ if (resource.getName().toLowerCase().endsWith(".class")) { //$NON-NLS-1$
resource.delete(true, null);
}
break;
@@ -175,7 +175,7 @@ IPath getOutputPath() { * Returns the path in the output folder for the given type.
*/
private IPath getPathForBinary(IType type) {
- return getOutputPath().append(type.getName().replace('.', '/') + ".class"/*nonNLS*/);
+ return getOutputPath().append(type.getName().replace('.', '/') + ".class"); //$NON-NLS-1$
}
/**
* Returns the container at the given path, creating it and any parent folders if necessary.
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectResourceCopier.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectResourceCopier.java index 628a23699b..90194e8756 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectResourceCopier.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectResourceCopier.java @@ -65,7 +65,7 @@ public void copyAllResourcesOnClasspath(){ if (this.outputLocation.equals(this.sourceFolders[i].getFullPath())) continue; // do nothing if output is same as source folder
if (!hasNotified){
hasNotified = true;
- if (notifier != null) notifier.subTask(Util.bind("build.copyingResources"/*nonNLS*/));
+ if (notifier != null) notifier.subTask(Util.bind("build.copyingResources")); //$NON-NLS-1$
}
this.sourceFolders[i].accept(this);
}
@@ -87,7 +87,7 @@ private boolean copyToOutput(IResource resource) { switch (resource.getType()){
case IResource.FILE :
if (sourceFolderPath == null) return false; // resource is not inside the classpath
- if (!"java"/*nonNLS*/.equals(resource.getFileExtension())){ // ignore source files
+ if (!"java".equals(resource.getFileExtension())){ // ignore source files //$NON-NLS-1$
IFile currentFile = (IFile) resource;
IPath pathSuffix = resourcePath.removeFirstSegments(sourceFolderPath.segmentCount());
@@ -140,7 +140,7 @@ private boolean deleteResourceCopyFromOutput(IResource resource) { switch (resource.getType()){
case IResource.FILE :
- if (!"java"/*nonNLS*/.equals(resource.getFileExtension())){ // ignore source files
+ if (!"java".equals(resource.getFileExtension())){ // ignore source files //$NON-NLS-1$
IFile currentFile = (IFile) resource;
pathSuffix = resourcePath.removeFirstSegments(sourceFolderPath.segmentCount());
@@ -195,7 +195,7 @@ private IPath getSourceFolderPath(IResource resource) { if (this.outputLocation.equals(this.sourceFolders[i].getFullPath())) continue; // do nothing if output is same as source folder
if (!hasNotified){
hasNotified = true;
- if (notifier != null) notifier.subTask(Util.bind("build.updatingResources"/*nonNLS*/));
+ if (notifier != null) notifier.subTask(Util.bind("build.updatingResources")); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ReportCardImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ReportCardImpl.java index 10bef72e28..5590beff71 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ReportCardImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ReportCardImpl.java @@ -104,7 +104,7 @@ private void getProblemsForPath(IPath path, Vector vResults) { if (path.isPrefixOf(sEntryPath)) {
String extension = sEntryPath.getFileExtension();
// test most frequent cases first
- if (extension != null && (extension.toLowerCase().equals("java"/*nonNLS*/) || extension.toLowerCase().equals("class"/*nonNLS*/))) {
+ if (extension != null && (extension.toLowerCase().equals("java") || extension.toLowerCase().equals("class"))) { //$NON-NLS-1$ //$NON-NLS-2$
getProblemsForSourceEntry(sEntry, vResults);
} else {
if (fState.isZipElement(sEntryPath)) {
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceElementTable.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceElementTable.java index 48067b1fe7..efd6f1ddfb 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceElementTable.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceElementTable.java @@ -123,6 +123,6 @@ SourceEntry removeSourceEntry(IPackage pkg, String fileName) { * @return a string representation of the receiver
*/
public String toString() {
- return "SourceElementTable("/*nonNLS*/ + fPackageTable + ")"/*nonNLS*/;
+ return "SourceElementTable(" + fPackageTable + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceEntry.java index d42409f719..a63718d9ba 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceEntry.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceEntry.java @@ -94,7 +94,7 @@ public String getPathWithZipEntryName() { return s.replace('/', File.separatorChar);
}
public String getZipEntryName() {
- return fZipEntryPath == null ? fZipEntryFileName : fZipEntryPath + "/"/*nonNLS*/ + fZipEntryFileName;
+ return fZipEntryPath == null ? fZipEntryFileName : fZipEntryPath + "/" + fZipEntryFileName; //$NON-NLS-1$
}
public int hashCode() {
int code = fPath.hashCode();
@@ -112,10 +112,10 @@ public String getPathWithZipEntryName() { */
public boolean isBinary() {
if (fZipEntryFileName != null) {
- return fZipEntryFileName.endsWith(".class"/*nonNLS*/);
+ return fZipEntryFileName.endsWith(".class"); //$NON-NLS-1$
}
String extension = fPath.getFileExtension();
- return extension != null && extension.equalsIgnoreCase("class"/*nonNLS*/);
+ return extension != null && extension.equalsIgnoreCase("class"); //$NON-NLS-1$
}
/**
* Returns true if the source entry comes from a compilation unit, otherwise
@@ -123,16 +123,16 @@ public String getPathWithZipEntryName() { */
public boolean isSource() {
if (fZipEntryFileName != null) {
- return fZipEntryFileName.endsWith(".java"/*nonNLS*/);
+ return fZipEntryFileName.endsWith(".java"); //$NON-NLS-1$
}
String extension = fPath.getFileExtension();
- return extension != null && extension.equalsIgnoreCase("java"/*nonNLS*/);
+ return extension != null && extension.equalsIgnoreCase("java"); //$NON-NLS-1$
}
/**
* Returns a String that represents the value of this object.
* @return a string representation of the receiver
*/
public String toString() {
- return fZipEntryFileName == null ? fPath.toString() : fPath.toString() + ", entry: "/*nonNLS*/ + this.getZipEntryName();
+ return fZipEntryFileName == null ? fPath.toString() : fPath.toString() + ", entry: " + this.getZipEntryName(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceFragmentImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceFragmentImpl.java index 76a1bf438d..d1dc34f996 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceFragmentImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceFragmentImpl.java @@ -62,7 +62,7 @@ public String getZipEntryName() { */
public String toString() {
return
- "SourceFragmentImpl("/*nonNLS*/ + fPath
- + (fZipEntryName == null ? ""/*nonNLS*/ : " : "/*nonNLS*/ + fZipEntryName) + ")"/*nonNLS*/;
+ "SourceFragmentImpl(" + fPath //$NON-NLS-1$
+ + (fZipEntryName == null ? "" : " : " + fZipEntryName) + ")"; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateImpl.java index 6d9623f525..b22c4dcabe 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateImpl.java @@ -193,7 +193,7 @@ public class StateImpl implements IState { /**
* Name for namespace node representing unknown dependencies.
*/
- private static final String UNKNOWN_DEPENDENCIES= "$UNKNOWN_DEPENDENCIES$"/*nonNLS*/;
+ private static final String UNKNOWN_DEPENDENCIES= "$UNKNOWN_DEPENDENCIES$"; //$NON-NLS-1$
/**
* Random number generator, used for generating fingerprints.
@@ -420,7 +420,7 @@ public class StateImpl implements IState { String className= Util.toString(classFile.getCompoundName());
if (classFile == null) {
// Could not discover principal structure
- String msg= Util.bind("build.errorParsingBinary"/*nonNLS*/, className);
+ String msg= Util.bind("build.errorParsingBinary", className); //$NON-NLS-1$
ProblemDetailImpl problem= new ProblemDetailImpl(msg, sEntry);
vProblems.addElement(problem);
// skip it
@@ -439,7 +439,7 @@ public class StateImpl implements IState { if (!typePkg.isUnnamed()) {
path= path.append(typePkg.getName().replace('.', IPath.SEPARATOR));
}
- String msg= Util.bind("build.packageMismatch"/*nonNLS*/, path.toString());
+ String msg= Util.bind("build.packageMismatch", path.toString()); //$NON-NLS-1$
ProblemDetailImpl problem= new ProblemDetailImpl(msg, 0, IProblemDetail.S_ERROR, sEntry, 0, 0, 1);
vProblems.addElement(problem);
// Only report the conflict once (there may be several types, but there's only one package declaration).
@@ -538,7 +538,7 @@ public class StateImpl implements IState { }
if (lazyBuildCU && binaryType == null) {
/* couldn't parse the class file */
- ProblemDetailImpl problem= new ProblemDetailImpl(Util.bind("build.errorParsingBinary"/*nonNLS*/, type.getName()), sEntry);
+ ProblemDetailImpl problem= new ProblemDetailImpl(Util.bind("build.errorParsingBinary", type.getName()), sEntry); //$NON-NLS-1$
fProblemReporter.putProblem(sEntry, problem);
}
return binaryType;
@@ -652,7 +652,7 @@ public class StateImpl implements IState { /* rebuild descriptor from indexes or binary */
IBinaryType binaryType= forceBinaryType(tsEntry, false); // Use false for 1FVQGL1: ITPJCORE:WINNT - SEVERE - Error saving java file
if (binaryType == null) {
- throw new NotPresentException(Util.bind("build.errorBuildingType"/*nonNLS*/, tsEntry.getSourceEntry().getFileName()));
+ throw new NotPresentException(Util.bind("build.errorBuildingType", tsEntry.getSourceEntry().getFileName())); //$NON-NLS-1$
}
return binaryType;
}
@@ -717,7 +717,7 @@ public class StateImpl implements IState { if (!fSourceElementTable.containsPackage(pkg)) {
getSourceEntries(pkg);
}
- SourceEntry entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".java"/*nonNLS*/);
+ SourceEntry entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".java"); //$NON-NLS-1$
if (entry == null)
return null;
return new PackageElement(pkg, entry);
@@ -803,7 +803,7 @@ public class StateImpl implements IState { return fDevelopmentContext.getBinaryFromFileSystem(file);
} catch (IOException e) {
String message= e.getMessage();
- message= (message == null ? "."/*nonNLS*/ : " due to "/*nonNLS*/ + message + "."/*nonNLS*/);
+ message= (message == null ? "." : " due to " + message + "."); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
return new byte[0];
}
}
@@ -920,7 +920,7 @@ public class StateImpl implements IState { }
}
if (frag == null) {
- throw internalException(Util.bind("build.missingFile"/*nonNLS*/, sEntry.toString()));
+ throw internalException(Util.bind("build.missingFile", sEntry.toString())); //$NON-NLS-1$
}
String fileName= sEntry.getPath().lastSegment();
if (sEntry.isSource()) {
@@ -1208,9 +1208,9 @@ static Comparator getPathComparator() { ICompilationUnit unit= units[i];
String fileName= unit.getElementName();
// get the corresponding .class file name
- String classFileName = ""/*nonNLS*/;
+ String classFileName = ""; //$NON-NLS-1$
if (Util.isJavaFileName(fileName)) { // paranoia check
- classFileName = fileName.substring(0, fileName.length()-5).concat(".class"/*nonNLS*/);
+ classFileName = fileName.substring(0, fileName.length()-5).concat(".class"); //$NON-NLS-1$
}
// see if a source entry exists for this file name
// or for the corresponding .class file
@@ -1234,7 +1234,7 @@ static Comparator getPathComparator() { String fileName= classFile.getElementName();
// get the corresponding .java file name
// note: this handles nested types, but not secondary types (e.g. class B defined in A.java)
- String javaFileName = ""/*nonNLS*/;
+ String javaFileName = ""; //$NON-NLS-1$
if (Util.isClassFileName(fileName)) { // paranoia check
// strip off any nested types
javaFileName = fileName.substring(0, fileName.length()-6);
@@ -1242,7 +1242,7 @@ static Comparator getPathComparator() { if (dol != -1) {
javaFileName = javaFileName.substring(0, dol);
}
- javaFileName = javaFileName.concat(".java"/*nonNLS*/);
+ javaFileName = javaFileName.concat(".java"); //$NON-NLS-1$
}
// see if a source entry exists for this file name
// or for the corresponding .java file
@@ -1304,7 +1304,7 @@ static Comparator getPathComparator() { protected SourceEntry getSourceEntry(String qualifiedNameWithSuffix) {
int dot= qualifiedNameWithSuffix.lastIndexOf('.');
dot= qualifiedNameWithSuffix.lastIndexOf('.', dot - 1);
- String pkgName= (dot == -1 ? ".default"/*nonNLS*/ : qualifiedNameWithSuffix.substring(0, dot));
+ String pkgName= (dot == -1 ? ".default" : qualifiedNameWithSuffix.substring(0, dot)); //$NON-NLS-1$
String fileName= (dot == -1 ? qualifiedNameWithSuffix : qualifiedNameWithSuffix.substring(dot + 1));
IPackage pkg= fDevelopmentContext.getImage().getPackageHandle(pkgName, false);
getSourceEntries(pkg); // force
@@ -1333,16 +1333,16 @@ static Comparator getPathComparator() { getSourceEntries(pkg);
}
String simpleName= type.getSimpleName();
- SourceEntry entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".java"/*nonNLS*/);
+ SourceEntry entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".java"); //$NON-NLS-1$
if (entry == null) {
- entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".class"/*nonNLS*/);
+ entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".class"); //$NON-NLS-1$
if (entry == null) {
int firstDollar= simpleName.indexOf('$');
if (firstDollar != -1) {
simpleName= simpleName.substring(0, firstDollar);
- entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".java"/*nonNLS*/);
+ entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".java"); //$NON-NLS-1$
if (entry == null) {
- entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".class"/*nonNLS*/);
+ entry= fSourceElementTable.getSourceEntry(pkg, simpleName + ".class"); //$NON-NLS-1$
}
}
}
@@ -1441,7 +1441,7 @@ static Comparator getPathComparator() { */
protected TypeStructureEntry getTypeStructureEntry(String qualifiedNameWithoutSuffix) {
int dot= qualifiedNameWithoutSuffix.lastIndexOf('.');
- String pkgName= (dot == -1 ? ".default"/*nonNLS*/ : qualifiedNameWithoutSuffix.substring(0, dot));
+ String pkgName= (dot == -1 ? ".default" : qualifiedNameWithoutSuffix.substring(0, dot)); //$NON-NLS-1$
String typeName= (dot == -1 ? qualifiedNameWithoutSuffix : qualifiedNameWithoutSuffix.substring(dot + 1));
IPackage pkg= fDevelopmentContext.getImage().getPackageHandle(pkgName, false);
IType type= pkg.getClassHandle(typeName);
@@ -1521,7 +1521,7 @@ static Comparator getPathComparator() { */
protected static boolean isZipElement(IPath path) {
String extension= path.getFileExtension();
- return extension != null && (extension.equalsIgnoreCase("zip"/*nonNLS*/) || extension.equalsIgnoreCase("jar"/*nonNLS*/));
+ return extension != null && (extension.equalsIgnoreCase("zip") || extension.equalsIgnoreCase("jar")); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
* Given a project-relative path, returns an absolute path.
@@ -1607,7 +1607,7 @@ static Comparator getPathComparator() { if (tsExisting != null) {
if (!tsExisting.getSourceEntry().getFileName().equals(sEntry.getFileName())) {
// Same type provided by different files
- String msg= Util.bind("build.duplicateType"/*nonNLS*/, typeHandle.getName(), tsExisting.getSourceEntry().getFileName());
+ String msg= Util.bind("build.duplicateType", typeHandle.getName(), tsExisting.getSourceEntry().getFileName()); //$NON-NLS-1$
ProblemDetailImpl problem= new ProblemDetailImpl(msg, sEntry);
fProblemReporter.putProblem(sEntry, problem);
// skip it
@@ -1798,7 +1798,7 @@ static Comparator getPathComparator() { * Returns a string representation of the receiver.
*/
public String toString() {
- return "StateImpl("/*nonNLS*/ + fStateNumber + ")"/*nonNLS*/;
+ return "StateImpl(" + fStateNumber + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
* Returns the type handle for the given type name,
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnap.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnap.java index 52fcb91c38..01bf6366de 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnap.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnap.java @@ -75,7 +75,7 @@ public StateImpl read(JavaDevelopmentContextImpl dc, IProject project, DataInput int magic = in.readInt();
int version = in.readShort();
if (magic != MAGIC) { // magic = "STAT"e
- throw new IOException(Util.bind("build.wrongFileFormat"/*nonNLS*/));
+ throw new IOException(Util.bind("build.wrongFileFormat")); //$NON-NLS-1$
}
/* dispatch to appropriate reader */
@@ -85,7 +85,7 @@ public StateImpl read(JavaDevelopmentContextImpl dc, IProject project, DataInput case VERSION6:
return new StateSnapV6().read(dc, project, in);
default:
- throw new IOException(Util.bind("build.unhandledVersionFormat"/*nonNLS*/));
+ throw new IOException(Util.bind("build.unhandledVersionFormat")); //$NON-NLS-1$
}
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapConstantPool.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapConstantPool.java index 7584b6f8fb..898311cce7 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapConstantPool.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapConstantPool.java @@ -114,14 +114,14 @@ public void add(IHandle handle) { // NOP
break;
default:
- Assert.isTrue(false, "Unknown kind of handle"/*nonNLS*/);
+ Assert.isTrue(false, "Unknown kind of handle"); //$NON-NLS-1$
}
}
/**
* Add a SourceEntry to the pool.
*/
public void add(SourceEntry entry) {
- Assert.isNotNull(entry, "Null SourceEntry being added to StateSnapConstantPool"/*nonNLS*/);
+ Assert.isNotNull(entry, "Null SourceEntry being added to StateSnapConstantPool"); //$NON-NLS-1$
if (!fSet.includes(entry)) {
add(entry.getPath());
String zipEntryPath = entry.fZipEntryPath;
@@ -171,12 +171,12 @@ public IHandle getHandle(int index) throws IOException { try {
IHandle result = (IHandle)fSet.get(index);
if (result == null) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
}
/**
@@ -192,12 +192,12 @@ public IPackage getPackage(int index) throws IOException { try {
IPackage result = (IPackage)fSet.get(index);
if (result == null) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
}
/**
@@ -207,12 +207,12 @@ public IPath getPath(int index) throws IOException { try {
IPath result = (IPath)fSet.get(index);
if (result == null) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
}
/**
@@ -222,12 +222,12 @@ public SourceEntry getSourceEntry(int index) throws IOException { try {
SourceEntry result = (SourceEntry)fSet.get(index);
if (result == null) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
}
/**
@@ -237,12 +237,12 @@ public String getString(int index) throws IOException { try {
String result = (String)fSet.get(index);
if (result == null) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
}
/**
@@ -263,7 +263,7 @@ public Object getStringOrNumber(int index) throws IOException { return result;
}
else {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
}
/**
@@ -273,12 +273,12 @@ public IType getType(int index) throws IOException { try {
IType result = (IType)fSet.get(index);
if (result == null) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
}
/**
@@ -306,10 +306,10 @@ public String histogram() { ++nN;
}
else {
- Assert.isTrue(false, "Unexpected pool item"/*nonNLS*/);
+ Assert.isTrue(false, "Unexpected pool item"); //$NON-NLS-1$
}
}
- return "nStr="/*nonNLS*/ + nStr + ", nID="/*nonNLS*/ + nID + ", nSE="/*nonNLS*/ + nSE + ", nH="/*nonNLS*/ + nH + ",nN="/*nonNLS*/ + nN;
+ return "nStr=" + nStr + ", nID=" + nID + ", nSE=" + nSE + ", nH=" + nH + ",nN=" + nN; //$NON-NLS-1$ //$NON-NLS-5$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-4$
}
/**
@@ -323,7 +323,7 @@ public int index(Object obj) { return fSet.index(obj);
}
catch (IllegalArgumentException e) {
- throw new IllegalArgumentException("Internal error in state serialization. Expected object missing from constant pool: "/*nonNLS*/ + obj);
+ throw new IllegalArgumentException("Internal error in state serialization. Expected object missing from constant pool: " + obj); //$NON-NLS-1$
}
}
/**
@@ -397,7 +397,7 @@ private void read(IDevelopmentContext dc, DataInputStream in, StateSnapV5 snap) fSet.put(i, readNumber(in, tag));
break;
default:
- throw new IOException("Unexpected kind of pool item"/*nonNLS*/);
+ throw new IOException("Unexpected kind of pool item"); //$NON-NLS-1$
}
}
}
@@ -415,7 +415,7 @@ private IHandle readHandle(IDevelopmentContext dc, DataInputStream in, int tag) case 5: {
// primitive type
// Should not occur since primitive types are well known and not written
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
case 6: {
// array type
@@ -433,7 +433,7 @@ private IHandle readHandle(IDevelopmentContext dc, DataInputStream in, int tag) // method
IType declaringClass = getType(in.readInt());
if (declaringClass.isPrimitive() || declaringClass.isArray()) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
String name = getString(in.readInt());
int numParams = in.readByte() & 0xFF;
@@ -447,7 +447,7 @@ private IHandle readHandle(IDevelopmentContext dc, DataInputStream in, int tag) // constructor
IType declaringClass = getType(in.readInt());
if (declaringClass.isPrimitive() || declaringClass.isArray()) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
int numParams = in.readByte() & 0xFF;
IType[] params = new IType[numParams];
@@ -460,7 +460,7 @@ private IHandle readHandle(IDevelopmentContext dc, DataInputStream in, int tag) // field
IType declaringClass = getType(in.readInt());
if (declaringClass.isPrimitive() || declaringClass.isArray()) {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
String name = getString(in.readInt());
return declaringClass.getFieldHandle(name);
@@ -469,7 +469,7 @@ private IHandle readHandle(IDevelopmentContext dc, DataInputStream in, int tag) // image
return dc.getImage();
default:
- throw new IOException("Unexpected kind of pool item"/*nonNLS*/);
+ throw new IOException("Unexpected kind of pool item"); //$NON-NLS-1$
}
}
/**
@@ -490,7 +490,7 @@ private Number readNumber(DataInputStream in, int tag) throws IOException { // Double
return new Double(Double.longBitsToDouble(in.readLong()));
default:
- throw new IOException("Unexpected type of number"/*nonNLS*/);
+ throw new IOException("Unexpected type of number"); //$NON-NLS-1$
}
}
/**
@@ -539,7 +539,7 @@ public void write(DataOutputStream out) throws IOException { writeNumber((Number)obj, out); // tags 12 through 15
}
else {
- Assert.isTrue(false, "Unexpected kind of pool item"/*nonNLS*/);
+ Assert.isTrue(false, "Unexpected kind of pool item"); //$NON-NLS-1$
}
}
}
@@ -559,7 +559,7 @@ private void writeHandle(IHandle h, DataOutputStream out) throws IOException { if (t.isPrimitive()) {
// tag=5
// Primitive types should not show up since they are well known and are not written.
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
else if (t.isArray()) {
ArrayTypeHandleImpl at = (ArrayTypeHandleImpl)t;
@@ -611,7 +611,7 @@ private void writeHandle(IHandle h, DataOutputStream out) throws IOException { out.writeByte(11);
break;
default:
- Assert.isTrue(false, "Unknown kind of handle"/*nonNLS*/);
+ Assert.isTrue(false, "Unknown kind of handle"); //$NON-NLS-1$
}
}
/**
@@ -635,7 +635,7 @@ private void writeNumber(Number num, DataOutputStream out) throws IOException { out.writeLong(Double.doubleToLongBits(num.doubleValue()));
}
else {
- Assert.isTrue(false, "Unexpected type of number"/*nonNLS*/);
+ Assert.isTrue(false, "Unexpected type of number"); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapV5.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapV5.java index e7f9d4f4fd..75baf0db3f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapV5.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapV5.java @@ -75,7 +75,7 @@ protected void addDependencyGraphToPool(StateImpl state, StateSnapConstantPool p pool.add(((ZipNode)node).getZipFile());
break;
default:
- Assert.isTrue(false, "Unexpected kind of node"/*nonNLS*/);
+ Assert.isTrue(false, "Unexpected kind of node"); //$NON-NLS-1$
}
// Don't need to process node dependents here, since they're nodes as well
// and will have their info added to the pool above.
@@ -153,7 +153,7 @@ protected void addTypeStructureEntryToPool(TypeStructureEntry tsEntry, StateSnap pool.add(tsEntry.getType());
}
protected void badFormat() throws IOException {
- throw new IOException("Error in format"/*nonNLS*/);
+ throw new IOException("Error in format"); //$NON-NLS-1$
}
/**
* Check that the next section has the given name.
@@ -202,7 +202,7 @@ public StateImpl read(JavaDevelopmentContextImpl dc, IProject project, DataInput * Read the build context.
*/
protected IImageContext readBuildContext(IDevelopmentContext dc, StateSnapConstantPool pool, DataInputStream in) throws IOException {
- checkSection(in, "BuildContext"/*nonNLS*/);
+ checkSection(in, "BuildContext"); //$NON-NLS-1$
int numPkgs = in.readInt();
if (numPkgs == -1) {
return null;
@@ -218,7 +218,7 @@ protected IImageContext readBuildContext(IDevelopmentContext dc, StateSnapConsta * The state is needed to create CompilationUnit objects from SourceEntry objects.
*/
protected DependencyGraph readDependencyGraph(StateSnapConstantPool pool, DataInputStream in, StateImpl state) throws IOException {
- checkSection(in, "DependencyGraph"/*nonNLS*/);
+ checkSection(in, "DependencyGraph"); //$NON-NLS-1$
DependencyGraph graph = new DependencyGraph();
// Avoid creating package elements for each node and dependency.
@@ -268,7 +268,7 @@ protected DependencyGraph readDependencyGraph(StateSnapConstantPool pool, DataIn * Read the package map.
*/
protected PackageMap readPackageMap(StateSnapConstantPool pool, DataInputStream in) throws IOException {
- checkSection(in, "PackageMap"/*nonNLS*/);
+ checkSection(in, "PackageMap"); //$NON-NLS-1$
PackageMap map = new PackageMap();
int size = in.readInt();
for (int i = 0; i < size; ++i) {
@@ -286,7 +286,7 @@ protected PackageMap readPackageMap(StateSnapConstantPool pool, DataInputStream * Read the principal structure table.
*/
protected Hashtable readPrincipalStructureTable(StateSnapConstantPool pool, DataInputStream in, StateImpl state) throws IOException {
- checkSection(in, "PrincipalStructureTable"/*nonNLS*/);
+ checkSection(in, "PrincipalStructureTable"); //$NON-NLS-1$
int numEntries = in.readInt();
Hashtable table = new Hashtable(numEntries * 2 + 1);
for (int i = 0; i < numEntries; ++i) {
@@ -314,7 +314,7 @@ protected ProblemDetailImpl readProblem(StateSnapConstantPool pool, DataInputStr * Read the problem reporter.
*/
protected IProblemReporter readProblemReporter(IProject project, StateSnapConstantPool pool, DataInputStream in) throws IOException {
- checkSection(in, "Problems"/*nonNLS*/);
+ checkSection(in, "Problems"); //$NON-NLS-1$
IProblemReporter reporter = null;
boolean isProblemTable = in.readBoolean();
if (isProblemTable) {
@@ -330,14 +330,14 @@ protected IProblemReporter readProblemReporter(IProject project, StateSnapConsta try {
clazz = Class.forName(className);
} catch (ClassNotFoundException e) {
- throw new IOException("Class "/*nonNLS*/ + className + " was not found."/*nonNLS*/);
+ throw new IOException("Class " + className + " was not found."); //$NON-NLS-2$ //$NON-NLS-1$
}
try {
reporter = (IProblemReporter) clazz.newInstance();
} catch (InstantiationException e) {
- throw new IOException("Could not instanciate "/*nonNLS*/ + clazz.getName());
+ throw new IOException("Could not instanciate " + clazz.getName()); //$NON-NLS-1$
} catch (IllegalAccessException e) {
- throw new IOException("Could not instanciate "/*nonNLS*/ + clazz.getName());
+ throw new IOException("Could not instanciate " + clazz.getName()); //$NON-NLS-1$
}
reporter.initialize(project, JavaModelManager.getJavaModelManager().getDevelopmentContext(project));
}
@@ -347,7 +347,7 @@ protected IProblemReporter readProblemReporter(IProject project, StateSnapConsta * Read the source element table.
*/
protected SourceElementTable readSourceElementTable(StateSnapConstantPool pool, DataInputStream in) throws IOException {
- checkSection(in, "SourceElementTable"/*nonNLS*/);
+ checkSection(in, "SourceElementTable"); //$NON-NLS-1$
SourceElementTable table = new SourceElementTable();
int numPackages = in.readInt();
for (int i = 0; i < numPackages; ++i) {
@@ -476,7 +476,7 @@ protected void skipAttributes(DataInputStream in) throws IOException { * Write the build context.
*/
protected void writeBuildContext(StateImpl state, StateSnapConstantPool pool, DataOutputStream out) throws IOException {
- out.writeUTF("BuildContext"/*nonNLS*/);
+ out.writeUTF("BuildContext"); //$NON-NLS-1$
IImageContext ctx = state.getBuildContext();
if (ctx == null) {
out.writeInt(-1);
@@ -493,7 +493,7 @@ protected void writeBuildContext(StateImpl state, StateSnapConstantPool pool, Da * Write the dependency graph.
*/
protected void writeDependencyGraph(StateImpl state, StateSnapConstantPool pool, DataOutputStream out) throws IOException {
- out.writeUTF("DependencyGraph"/*nonNLS*/);
+ out.writeUTF("DependencyGraph"); //$NON-NLS-1$
DependencyGraph graph = state.getInternalDependencyGraph();
graph.integrityCheck();
/**
@@ -508,7 +508,7 @@ protected void writeDependencyGraph(StateImpl state, StateSnapConstantPool pool, out.writeBoolean(true);
SourceEntry sEntry = state.getSourceEntry(jcu.getPackageElement());
if (sEntry == null) {
- System.out.println("Warning: StatSnap: Attempt to serialize dependency graph node for missing JCU: "/*nonNLS*/ + jcu.getPackageElement() + ". Skipping..."/*nonNLS*/);
+ System.out.println("Warning: StatSnap: Attempt to serialize dependency graph node for missing JCU: " + jcu.getPackageElement() + ". Skipping..."); //$NON-NLS-1$ //$NON-NLS-2$
} else {
Assert.isNotNull(sEntry);
out.writeInt(pool.index(sEntry));
@@ -572,7 +572,7 @@ protected void writeEmptyAttributes(DataOutputStream out) throws IOException { * Write the package map.
*/
protected void writePackageMap(StateImpl state, StateSnapConstantPool pool, DataOutputStream out) throws IOException {
- out.writeUTF("PackageMap"/*nonNLS*/);
+ out.writeUTF("PackageMap"); //$NON-NLS-1$
PackageMap map = state.getPackageMap();
out.writeInt(map.size());
int count = 0;
@@ -592,7 +592,7 @@ protected void writePackageMap(StateImpl state, StateSnapConstantPool pool, Data * Write the principal structure table.
*/
protected void writePrincipalStructureTable(StateImpl state, StateSnapConstantPool pool, DataOutputStream out) throws IOException {
- out.writeUTF("PrincipalStructureTable"/*nonNLS*/);
+ out.writeUTF("PrincipalStructureTable"); //$NON-NLS-1$
Hashtable table = state.getPrincipalStructureTable();
int num = table.size();
out.writeInt(num);
@@ -621,7 +621,7 @@ protected void writeProblem(ProblemDetailImpl pb, StateSnapConstantPool pool, Da * Write the problem reporter.
*/
protected void writeProblemReporter(StateImpl state, StateSnapConstantPool pool, DataOutputStream out) throws IOException {
- out.writeUTF("Problems"/*nonNLS*/);
+ out.writeUTF("Problems"); //$NON-NLS-1$
IProblemReporter reporter = state.getProblemReporter();
if (reporter instanceof ProblemTable) {
out.writeBoolean(true);
@@ -645,7 +645,7 @@ protected void writeProblemReporter(StateImpl state, StateSnapConstantPool pool, * Write the source element table.
*/
protected void writeSourceElementTable(StateImpl state, StateSnapConstantPool pool, DataOutputStream out) throws IOException {
- out.writeUTF("SourceElementTable"/*nonNLS*/);
+ out.writeUTF("SourceElementTable"); //$NON-NLS-1$
SourceElementTable table = state.getSourceElementTable();
int num = table.numPackages();
out.writeInt(num);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeCollaboratorIndictment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeCollaboratorIndictment.java index 622b1e5361..b799ee9ff5 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeCollaboratorIndictment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeCollaboratorIndictment.java @@ -28,6 +28,6 @@ protected TypeCollaboratorIndictment(char[] name) { */
public String toString() {
// don't use + with char[]
- return new StringBuffer("TypeIndictment("/*nonNLS*/).append(fName).append(")"/*nonNLS*/).toString();
+ return new StringBuffer("TypeIndictment(").append(fName).append(")").toString(); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeHierarchyIndictment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeHierarchyIndictment.java index cf0bf75dfa..97d8a65c21 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeHierarchyIndictment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeHierarchyIndictment.java @@ -28,6 +28,6 @@ protected TypeHierarchyIndictment(char[] name) { */
public String toString() {
// don't use + with char[]
- return new StringBuffer("TypeHierarchyIndictment("/*nonNLS*/).append(fName).append(")"/*nonNLS*/).toString();
+ return new StringBuffer("TypeHierarchyIndictment(").append(fName).append(")").toString(); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImpl.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImpl.java index a7b9c0dc34..d398e6e1eb 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImpl.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImpl.java @@ -16,7 +16,7 @@ public abstract class TypeImpl extends NonStateSpecificHandleImpl implements ITy typeA = (IType)a;
typeB = (IType)b;
} catch (ClassCastException e) {
- Assert.isTrue(false, "Should only be comparing ITypes"/*nonNLS*/);
+ Assert.isTrue(false, "Should only be comparing ITypes"); //$NON-NLS-1$
}
return typeA.getName().compareTo(typeB.getName());
}
@@ -149,7 +149,7 @@ public int getDeclaredModifiers() throws NotPresentException { * a String of length 0.
*/
public String getDeclaredName() throws NotPresentException {
- return ""/*nonNLS*/;
+ return ""; //$NON-NLS-1$
}
/**
* If the class or interface represented by this Type object is
@@ -476,6 +476,6 @@ public boolean isTopLevel() throws org.eclipse.jdt.internal.core.builder.NotPres * only (NON-NLS).
*/
public String toString() {
- return "type "/*nonNLS*/ + getName();
+ return "type " + getName(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImplSWH.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImplSWH.java index 373d85435e..8f50227169 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImplSWH.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImplSWH.java @@ -126,7 +126,7 @@ public int getDeclaredModifiers() throws NotPresentException { * a String of length 0.
*/
public String getDeclaredName() throws NotPresentException {
- return ""/*nonNLS*/;
+ return ""; //$NON-NLS-1$
}
/**
* If the class or interface represented by this Type object is
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeNode.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeNode.java index bd9a84b627..e99317d460 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeNode.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeNode.java @@ -63,6 +63,6 @@ public IType[] getTypes() { * purposes only.
*/
public String toString() {
- return "TypeNode("/*nonNLS*/ + fType.getFileName() + ")"/*nonNLS*/;
+ return "TypeNode(" + fType.getFileName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeStructureEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeStructureEntry.java index 3e11a4f827..bdb9564bf8 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeStructureEntry.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeStructureEntry.java @@ -92,11 +92,11 @@ int getCRC32() { * @return a string representation of the receiver
*/
public String toString() {
- StringBuffer buf = new StringBuffer("TypeStructureEntry("/*nonNLS*/);
+ StringBuffer buf = new StringBuffer("TypeStructureEntry("); //$NON-NLS-1$
if (fType != null) {
buf.append(fType.getName());
}
- buf.append(")"/*nonNLS*/);
+ buf.append(")"); //$NON-NLS-1$
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/UnmodifiedBuilderType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/UnmodifiedBuilderType.java index 21812de253..83dd0eff3a 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/UnmodifiedBuilderType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/UnmodifiedBuilderType.java @@ -52,6 +52,6 @@ public boolean isAffected() { * For debugging only
*/
public String toString() {
- return "UnmodifiedBuilderType("/*nonNLS*/ + fNewTSEntry.getType().getName() + ")"/*nonNLS*/;
+ return "UnmodifiedBuilderType(" + fNewTSEntry.getType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/WorkQueue.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/WorkQueue.java index 8f263a08a0..7186c891c8 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/WorkQueue.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/WorkQueue.java @@ -61,7 +61,7 @@ public void add(PackageElement element) { } else {
if (entry.status != NEEDS_COMPILE) {
if (entry.status == COMPILED) {
- System.out.println("Warning: image builder wants to recompile already compiled element: "/*nonNLS*/ + element);
+ System.out.println("Warning: image builder wants to recompile already compiled element: " + element); //$NON-NLS-1$
}
entry.status = NEEDS_COMPILE;
needsCompileList.addElement(element);
@@ -79,7 +79,7 @@ public void compiled(PackageElement element) { entries.put(element, entry);
} else {
if (entry.status != NEEDS_COMPILE) {
- System.out.println("Warning: Java builder compiled the same element twice: "/*nonNLS*/ + element);
+ System.out.println("Warning: Java builder compiled the same element twice: " + element); //$NON-NLS-1$
}
needsCompileList.removeElement(element);
}
@@ -117,6 +117,6 @@ public boolean needsCompile(PackageElement element) { return entry != null && entry.status == NEEDS_COMPILE;
}
public String toString() {
- return "WorkQueue: "/*nonNLS*/ + needsCompileList;
+ return "WorkQueue: " + needsCompileList; //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ZipNode.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ZipNode.java index 2f51cb3f79..635086d5bc 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ZipNode.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ZipNode.java @@ -57,6 +57,6 @@ public IPath getZipFile() { * purposes only.
*/
public String toString() {
- return "ZipNode("/*nonNLS*/ + fZipFile + ")"/*nonNLS*/;
+ return "ZipNode(" + fZipFile + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/eval/EvaluationContextWrapper.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/eval/EvaluationContextWrapper.java index c66bbdbd91..e3cc003fdb 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/eval/EvaluationContextWrapper.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/eval/EvaluationContextWrapper.java @@ -53,7 +53,7 @@ public IGlobalVariable[] allVariables() { */
protected void checkBuilderState() throws JavaModelException {
if (!getProject().hasBuildState()) {
- throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.EVALUATION_ERROR, Util.bind("eval.needBuiltState"/*nonNLS*/)));
+ throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.EVALUATION_ERROR, Util.bind("eval.needBuiltState"))); //$NON-NLS-1$
}
}
/**
@@ -91,7 +91,7 @@ public void deleteVariable(IGlobalVariable variable) { GlobalVariableWrapper wrapper = (GlobalVariableWrapper)variable;
this.context.deleteVariable(wrapper.variable);
} else {
- throw new Error("Unknown implementation of IGlobalVariable"/*nonNLS*/);
+ throw new Error("Unknown implementation of IGlobalVariable"); //$NON-NLS-1$
}
}
/**
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java index 3e82004c7d..c8a6c6265b 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java @@ -162,27 +162,27 @@ public void recordSuperType(char[] superTypeName, char[] superQualification, cha public String toString() {
StringBuffer buffer = new StringBuffer();
if (this.modifiers == IConstants.AccPublic) {
- buffer.append("public "/*nonNLS*/);
+ buffer.append("public "); //$NON-NLS-1$
}
if (this.isClass()) {
- buffer.append("class "/*nonNLS*/);
+ buffer.append("class "); //$NON-NLS-1$
} else {
- buffer.append("interface "/*nonNLS*/);
+ buffer.append("interface "); //$NON-NLS-1$
}
if (this.name != null) {
buffer.append(this.name);
}
if (this.superclass != null) {
- buffer.append("\n extends "/*nonNLS*/);
+ buffer.append("\n extends "); //$NON-NLS-1$
buffer.append(this.superclass);
}
int length;
if (this.superInterfaces != null && (length = this.superInterfaces.length) != 0) {
- buffer.append("\n implements "/*nonNLS*/);
+ buffer.append("\n implements "); //$NON-NLS-1$
for (int i = 0; i < length; i++) {
buffer.append(this.superInterfaces[i]);
if (i != length - 1) {
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", "); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java index 1b204e594d..b611d2fe5c 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java @@ -75,7 +75,7 @@ public class IndexBasedHierarchyBuilder extends HierarchyBuilder { return name;
}
public String toString(){
- StringBuffer buffer = new StringBuffer("Queue:\n"/*nonNLS*/);
+ StringBuffer buffer = new StringBuffer("Queue:\n"); //$NON-NLS-1$
for (int i = this.start; i <= this.end; i++){
buffer.append(names[i]).append('\n');
}
@@ -319,7 +319,7 @@ private void createInfoFromClassFile(Openable handle, String osPath, Vector info */
private void createInfoFromClassFileInJar(Openable classFile, Vector infos) throws JavaModelException {
IJavaElement pkg = classFile.getParent();
- String classFilePath = pkg.getElementName().replace('.', '/') + "/"/*nonNLS*/ + classFile.getElementName();
+ String classFilePath = pkg.getElementName().replace('.', '/') + "/" + classFile.getElementName(); //$NON-NLS-1$
IGenericType info = null;
java.util.zip.ZipFile zipFile = null;
try {
@@ -443,7 +443,7 @@ public static void searchAllPossibleSubTypes( IIndexSearchRequestor searchRequestor = new IndexSearchAdapter(){
public void acceptSuperTypeReference(String resourcePath, char[] qualification, char[] typeName, char[] enclosingTypeName, char classOrInterface, char[] superQualification, char[] superTypeName, char superClassOrInterface, int modifiers) {
pathRequestor.acceptPath(resourcePath);
- if (resourcePath.endsWith("class"/*nonNLS*/)){
+ if (resourcePath.endsWith("class")){ //$NON-NLS-1$
HierarchyBinaryType binaryType = (HierarchyBinaryType)binariesFromIndexMatches.get(resourcePath);
if (binaryType == null){
binaryType = new HierarchyBinaryType(modifiers, qualification, typeName, enclosingTypeName, classOrInterface);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java index de684ca051..afb64f0fd0 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java @@ -1022,7 +1022,7 @@ public void refresh(IProgressMonitor monitor) throws JavaModelException { }
fProgressMonitor = monitor;
if (monitor != null) {
- monitor.beginTask(Util.bind("hierarchy.creating"/*nonNLS*/), IProgressMonitor.UNKNOWN);
+ monitor.beginTask(Util.bind("hierarchy.creating"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
}
compute();
if (fType != null) {
@@ -1097,7 +1097,7 @@ private boolean subtypesIncludeSupertypeOf(IType type) { return false;
}
if (superclassName == null) {
- superclassName = "Object"/*nonNLS*/;
+ superclassName = "Object"; //$NON-NLS-1$
}
int dot = -1;
String simpleSuper = (dot = superclassName.lastIndexOf('.')) > -1 ?
@@ -1133,24 +1133,24 @@ private boolean subtypesIncludeSupertypeOf(IType type) { */
public String toString() {
StringBuffer buffer = new StringBuffer();
- buffer.append("Focus: "/*nonNLS*/);
- buffer.append(fType == null ? "<NONE>"/*nonNLS*/ : fType.getFullyQualifiedName());
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("Focus: "); //$NON-NLS-1$
+ buffer.append(fType == null ? "<NONE>" : fType.getFullyQualifiedName()); //$NON-NLS-1$
+ buffer.append("\n"); //$NON-NLS-1$
if (exists()) {
if (fType != null) {
- buffer.append("Super types:\n"/*nonNLS*/);
+ buffer.append("Super types:\n"); //$NON-NLS-1$
toString(buffer, fType, 1, true);
- buffer.append("Sub types:\n"/*nonNLS*/);
+ buffer.append("Sub types:\n"); //$NON-NLS-1$
toString(buffer, fType, 1, false);
} else {
- buffer.append("Sub types of root classes:\n"/*nonNLS*/);
+ buffer.append("Sub types of root classes:\n"); //$NON-NLS-1$
IType[] roots= getRootClasses();
for (int i= 0; i < roots.length; i++) {
toString(buffer, roots[i], 1, false);
}
}
} else {
- buffer.append("(Hierarchy became stale)"/*nonNLS*/);
+ buffer.append("(Hierarchy became stale)"); //$NON-NLS-1$
}
return buffer.toString();
}
@@ -1161,7 +1161,7 @@ public String toString() { */
private void toString(StringBuffer buffer, IType type, int indent, boolean ascendant) {
for (int i= 0; i < indent; i++) {
- buffer.append(" "/*nonNLS*/);
+ buffer.append(" "); //$NON-NLS-1$
}
buffer.append(type.getFullyQualifiedName());
buffer.append('\n');
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java index b7454d9e55..4b6b41e6bd 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java @@ -22,11 +22,11 @@ public CompilationUnit(char[] contents, char[] filename) { fFileName = filename;
String file = new String(filename);
- int start = file.lastIndexOf("/"/*nonNLS*/) + 1;
- if (start == 0 || start < file.lastIndexOf("\\"/*nonNLS*/))
- start = file.lastIndexOf("\\"/*nonNLS*/) + 1;
+ int start = file.lastIndexOf("/") + 1; //$NON-NLS-1$
+ if (start == 0 || start < file.lastIndexOf("\\")) //$NON-NLS-1$
+ start = file.lastIndexOf("\\") + 1; //$NON-NLS-1$
- int end = file.lastIndexOf("."/*nonNLS*/);
+ int end = file.lastIndexOf("."); //$NON-NLS-1$
if (end == -1)
end = file.length();
@@ -42,6 +42,6 @@ public char[] getMainTypeName() { return fMainTypeName;
}
public String toString() {
- return "CompilationUnit["/*nonNLS*/ + new String(fFileName) + "]"/*nonNLS*/;
+ return "CompilationUnit[" + new String(fFileName) + "]"; //$NON-NLS-2$ //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java index 421510efea..e7da005cdf 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java @@ -33,7 +33,7 @@ class DOMCompilationUnit extends DOMNode implements IDOMCompilationUnit { * Creates a new empty COMPILATION_UNIT document fragment.
*/
DOMCompilationUnit() {
- fHeader=""/*nonNLS*/;
+ fHeader=""; //$NON-NLS-1$
}
/**
* Creates a new COMPILATION_UNIT on the given range of the document.
@@ -47,7 +47,7 @@ DOMCompilationUnit() { */
DOMCompilationUnit(char[] document, int[] sourceRange) {
super(document, sourceRange, null, new int[]{-1, -1});
- fHeader = ""/*nonNLS*/;
+ fHeader = ""; //$NON-NLS-1$
}
/**
* @see DOMNode#appendContents(CharArrayBuffer)
@@ -75,7 +75,7 @@ public IJavaElement getJavaElement(IJavaElement parent) throws IllegalArgumentEx if (parent.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
return ((IPackageFragment)parent).getCompilationUnit(getName());
} else {
- throw new IllegalArgumentException(Util.bind("element.illegalParent"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.illegalParent")); //$NON-NLS-1$
}
}
/**
@@ -102,7 +102,7 @@ public String getName() { topLevelType= firstType;
}
if (topLevelType != null) {
- return topLevelType.getName() + ".java"/*nonNLS*/;
+ return topLevelType.getName() + ".java"; //$NON-NLS-1$
} else {
return null;
}
@@ -174,6 +174,6 @@ protected void shareContents(DOMNode node) { * @see IDOMNode#toString()
*/
public String toString() {
- return "COMPILATION_UNIT: "/*nonNLS*/ + getName();
+ return "COMPILATION_UNIT: " + getName(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMField.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMField.java index e9d22f5c3a..d6e1b1a010 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMField.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMField.java @@ -229,7 +229,7 @@ protected void becomeDetailed() throws DOMException { DOMBuilder builder = new DOMBuilder();
IDOMField[] details= builder.createFields(source.toCharArray());
if (details.length == 0) {
- throw new DOMException(Util.bind("dom.cannotDetail"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.cannotDetail")); //$NON-NLS-1$
} else {
node= this;
for (int i= 0; i < details.length; i++) {
@@ -316,7 +316,7 @@ public IJavaElement getJavaElement(IJavaElement parent) throws IllegalArgumentEx if (parent.getElementType() == IJavaElement.TYPE) {
return ((IType)parent).getField(getName());
} else {
- throw new IllegalArgumentException(Util.bind("element.illegalParent"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.illegalParent")); //$NON-NLS-1$
}
}
/**
@@ -561,7 +561,7 @@ protected void setIsVariableDeclarator(boolean isVariableDeclarator) { */
public void setName(String name) throws IllegalArgumentException {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("element.nullName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.nullName")); //$NON-NLS-1$
} else {
super.setName(name);
setTypeAltered(true);
@@ -572,7 +572,7 @@ public void setName(String name) throws IllegalArgumentException { */
public void setType(String typeName) throws IllegalArgumentException {
if (typeName == null) {
- throw new IllegalArgumentException(Util.bind("element.nullType"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.nullType")); //$NON-NLS-1$
}
becomeDetailed();
expand();
@@ -603,6 +603,6 @@ protected void shareContents(DOMNode node) { * @see IDOMNode#toString()
*/
public String toString() {
- return "FIELD: "/*nonNLS*/ + getName();
+ return "FIELD: " + getName(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMImport.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMImport.java index 5a9baf69fb..a966e74095 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMImport.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMImport.java @@ -27,7 +27,7 @@ class DOMImport extends DOMNode implements IDOMImport { * Creates a new empty IMPORT node.
*/
DOMImport() {
- fName = "java.lang.*"/*nonNLS*/;
+ fName = "java.lang.*"; //$NON-NLS-1$
setMask(MASK_DETAILED_SOURCE_INDEXES, true);
}
/**
@@ -78,7 +78,7 @@ DOMImport(char[] document, int[] sourceRange, String name, boolean onDemand) { protected void appendFragmentedContents(CharArrayBuffer buffer) {
if (fNameRange[0] < 0) {
buffer
- .append("import "/*nonNLS*/)
+ .append("import ") //$NON-NLS-1$
.append(fName)
.append(';')
.append(JavaModelManager.LINE_SEPARATOR);
@@ -112,7 +112,7 @@ public IJavaElement getJavaElement(IJavaElement parent) throws IllegalArgumentEx if (parent.getElementType() == IJavaElement.COMPILATION_UNIT) {
return ((ICompilationUnit)parent).getImport(getName());
} else {
- throw new IllegalArgumentException(Util.bind("element.illegalParent"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.illegalParent")); //$NON-NLS-1$
}
}
/**
@@ -138,16 +138,16 @@ protected DOMNode newDOMNode() { */
public void setName(String name) {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("element.nullName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.nullName")); //$NON-NLS-1$
}
becomeDetailed();
super.setName(name);
- fOnDemand = name.endsWith(".*"/*nonNLS*/);
+ fOnDemand = name.endsWith(".*"); //$NON-NLS-1$
}
/**
* @see IDOMNode#toString()
*/
public String toString() {
- return "IMPORT: "/*nonNLS*/ + getName();
+ return "IMPORT: " + getName(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java index 0a1e6a2a44..86a735a075 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java @@ -102,7 +102,7 @@ protected void appendMemberBodyContents(CharArrayBuffer buffer) { .append(getBody())
.append(fDocument, fBodyRange[1] + 1, fSourceRange[1] - fBodyRange[1]);
} else {
- buffer.append("{}"/*nonNLS*/).append(JavaModelManager.LINE_SEPARATOR);
+ buffer.append("{}").append(JavaModelManager.LINE_SEPARATOR); //$NON-NLS-1$
}
}
/**
@@ -156,7 +156,7 @@ public IJavaElement getJavaElement(IJavaElement parent) throws IllegalArgumentEx }
return ((IType) parent).getInitializer(count);
} else {
- throw new IllegalArgumentException(Util.bind("element.illegalParent"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.illegalParent")); //$NON-NLS-1$
}
}
/**
@@ -219,6 +219,6 @@ protected void shareContents(DOMNode node) { * @see IDOMNode#toString()
*/
public String toString() {
- return "INITIALIZER"/*nonNLS*/;
+ return "INITIALIZER"; //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMember.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMember.java index 76e25ee0b8..09596aecc7 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMember.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMember.java @@ -281,7 +281,7 @@ public void setComment(String comment) { /* see 1FVIJAH */
if (comment != null) {
String commentString = new String(comment);
- if (commentString.indexOf("@deprecated"/*nonNLS*/) >= 0) {
+ if (commentString.indexOf("@deprecated") >= 0) { //$NON-NLS-1$
fFlags= fFlags | IConstants.AccDeprecated;
return;
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java index 921ef4cf5a..59c20e4f61 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java @@ -226,7 +226,7 @@ DOMMethod(char[] document, int[] sourceRange, String name, int[] nameRange, int */
public void addException(String name) throws IllegalArgumentException {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("dom.nullExceptionType"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.nullExceptionType")); //$NON-NLS-1$
}
if (fExceptions == null) {
fExceptions= new String[1];
@@ -241,10 +241,10 @@ public void addException(String name) throws IllegalArgumentException { */
public void addParameter(String type, String name) throws IllegalArgumentException {
if (type == null) {
- throw new IllegalArgumentException(Util.bind("dom.nullTypeParameter"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.nullTypeParameter")); //$NON-NLS-1$
}
if (name == null) {
- throw new IllegalArgumentException(Util.bind("dom.nullNameParameter"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.nullNameParameter")); //$NON-NLS-1$
}
if (fParameterNames == null) {
fParameterNames= new String[1];
@@ -306,7 +306,7 @@ protected void appendMemberDeclarationContents(CharArrayBuffer buffer) { if (fExceptionRange[0] >= 0) {
buffer.append(fDocument, start, fExceptionRange[0] - start);
} else {
- buffer.append(" throws "/*nonNLS*/);
+ buffer.append(" throws "); //$NON-NLS-1$
}
// add exception list
if (fExceptionList != null) {
@@ -414,7 +414,7 @@ public IJavaElement getJavaElement(IJavaElement parent) throws IllegalArgumentEx }
return ((IType)parent).getMethod(name, sigs);
} else {
- throw new IllegalArgumentException(Util.bind("element.illegalParent"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.illegalParent")); //$NON-NLS-1$
}
}
/**
@@ -573,7 +573,7 @@ public void setBody(String body) { fBody= body;
setHasBody(body != null);
if (!hasBody()) {
- fBody= ";"/*nonNLS*/+JavaModelManager.LINE_SEPARATOR;
+ fBody= ";"+JavaModelManager.LINE_SEPARATOR; //$NON-NLS-1$
}
}
/**
@@ -615,7 +615,7 @@ public void setExceptions(String[] names) { */
public void setName(String name) {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("element.nullName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.nullName")); //$NON-NLS-1$
} else {
super.setName(name);
}
@@ -631,17 +631,17 @@ public void setParameters(String[] types, String[] names) throws IllegalArgument fParameterNames= null;
fParameterList= new char[] {'(',')'};
} else {
- throw new IllegalArgumentException(Util.bind("dom.mismatchArgNamesAndTypes"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.mismatchArgNamesAndTypes")); //$NON-NLS-1$
}
} else if (names.length != types.length) {
- throw new IllegalArgumentException(Util.bind("dom.mismatchArgNamesAndTypes"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.mismatchArgNamesAndTypes")); //$NON-NLS-1$
} else if (names.length == 0) {
setParameters(null, null);
} else {
fParameterNames= names;
fParameterTypes= types;
CharArrayBuffer parametersBuffer = new CharArrayBuffer();
- parametersBuffer.append("("/*nonNLS*/);
+ parametersBuffer.append("("); //$NON-NLS-1$
char[] comma = new char[] {',', ' '};
for (int i = 0; i < names.length; i++) {
if (i > 0) {
@@ -662,7 +662,7 @@ public void setParameters(String[] types, String[] names) throws IllegalArgument */
public void setReturnType(String name) throws IllegalArgumentException {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("dom.nullReturnType"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.nullReturnType")); //$NON-NLS-1$
}
becomeDetailed();
fragment();
@@ -705,9 +705,9 @@ protected void shareContents(DOMNode node) { */
public String toString() {
if (isConstructor()) {
- return "CONSTRUCTOR"/*nonNLS*/;
+ return "CONSTRUCTOR"; //$NON-NLS-1$
} else {
- return "METHOD: "/*nonNLS*/ + getName();
+ return "METHOD: " + getName(); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMNode.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMNode.java index 660f13c795..aa6ca79618 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMNode.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMNode.java @@ -331,23 +331,23 @@ protected abstract void appendFragmentedContents(CharArrayBuffer buffer); void basicAddChild(IDOMNode child) throws IllegalArgumentException, DOMException {
// verify child may be added
if (!canHaveChildren()) {
- throw new DOMException(Util.bind("dom.unableAddChild"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.unableAddChild")); //$NON-NLS-1$
}
if (child == null) {
- throw new IllegalArgumentException(Util.bind("dom.addNullChild"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.addNullChild")); //$NON-NLS-1$
}
if (!isAllowableChild(child)) {
- throw new DOMException(Util.bind("dom.addIncompatibleChild"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.addIncompatibleChild")); //$NON-NLS-1$
}
if (child.getParent() != null) {
- throw new DOMException(Util.bind("dom.addChildWithParent"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.addChildWithParent")); //$NON-NLS-1$
}
/* NOTE: To test if the child is an ancestor of this node, we
* need only test if the root of this node is the child (the child
* is already a root since we have just guarenteed it has no parent).
*/
if (child == getRoot()) {
- throw new DOMException(Util.bind("dom.addAncestorAsChild"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.addAncestorAsChild")); //$NON-NLS-1$
}
DOMNode node= (DOMNode)child;
@@ -379,7 +379,7 @@ protected void becomeDetailed() throws DOMException { if (!isDetailed()) {
DOMNode detailed= getDetailedNode();
if (detailed == null) {
- throw new DOMException(Util.bind("dom.cannotDetail"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.cannotDetail")); //$NON-NLS-1$
}
if (detailed != this) {
shareContents(detailed);
@@ -652,23 +652,23 @@ public int getStartPosition() { public void insertSibling(IDOMNode sibling) throws IllegalArgumentException, DOMException {
// verify sibling may be added
if (sibling == null) {
- throw new IllegalArgumentException(Util.bind("dom.addNullSibling"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.addNullSibling")); //$NON-NLS-1$
}
if (fParent == null) {
- throw new DOMException(Util.bind("dom.addSiblingBeforeRoot"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.addSiblingBeforeRoot")); //$NON-NLS-1$
}
if (!fParent.isAllowableChild(sibling)) {
- throw new DOMException(Util.bind("dom.addIncompatibleSibling"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.addIncompatibleSibling")); //$NON-NLS-1$
}
if (sibling.getParent() != null) {
- throw new DOMException(Util.bind("dom.addSiblingWithParent"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.addSiblingWithParent")); //$NON-NLS-1$
}
/* NOTE: To test if the sibling is an ancestor of this node, we
* need only test if the root of this node is the child (the sibling
* is already a root since we have just guaranteed it has no parent).
*/
if (sibling == getRoot()) {
- throw new DOMException(Util.bind("dom.addAncestorAsSibling"/*nonNLS*/));
+ throw new DOMException(Util.bind("dom.addAncestorAsSibling")); //$NON-NLS-1$
}
DOMNode node= (DOMNode)sibling;
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java index dec2d57e07..87c7be8865 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java @@ -70,7 +70,7 @@ DOMPackage(char[] document, int[] sourceRange, String name, int[] nameRange) { protected void appendFragmentedContents(CharArrayBuffer buffer) {
if (fNameRange[0] < 0) {
buffer
- .append("package "/*nonNLS*/)
+ .append("package ") //$NON-NLS-1$
.append(fName)
.append(';')
.append(JavaModelManager.LINE_SEPARATOR);
@@ -104,7 +104,7 @@ public IJavaElement getJavaElement(IJavaElement parent) throws IllegalArgumentEx if (parent.getElementType() == IJavaElement.COMPILATION_UNIT) {
return ((ICompilationUnit)parent).getPackageDeclaration(getName());
} else {
- throw new IllegalArgumentException(Util.bind("element.illegalParent"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.illegalParent")); //$NON-NLS-1$
}
}
/**
@@ -130,6 +130,6 @@ public void setName(String name) { * @see IDOMNode#toString()
*/
public String toString() {
- return "PACKAGE: "/*nonNLS*/ + getName();
+ return "PACKAGE: " + getName(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMType.java index f1132242f7..320560e948 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMType.java @@ -226,7 +226,7 @@ DOMType(char[] document, int[] sourceRange, String name, int[] nameRange, int fl */
public void addSuperInterface(String name) throws IllegalArgumentException {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("dom.addNullInterface"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.addNullInterface")); //$NON-NLS-1$
}
if (fSuperInterfaces == null) {
fSuperInterfaces= new String[1];
@@ -264,7 +264,7 @@ protected void appendMemberDeclarationContents(CharArrayBuffer buffer) { if (getMask(MASK_TYPE_HAS_SUPERCLASS)) {
hasSuperclass = true;
if (fExtendsRange[0] < 0) {
- buffer.append(" extends "/*nonNLS*/);
+ buffer.append(" extends "); //$NON-NLS-1$
} else {
buffer.append(fDocument, fExtendsRange[0], fExtendsRange[1] + 1 - fExtendsRange[0]);
}
@@ -277,7 +277,7 @@ protected void appendMemberDeclarationContents(CharArrayBuffer buffer) { if (getMask(MASK_TYPE_HAS_INTERFACES)) {
hasInterfaces = true;
if (fImplementsRange[0] < 0) {
- buffer.append(" implements "/*nonNLS*/);
+ buffer.append(" implements "); //$NON-NLS-1$
} else {
buffer.append(fDocument, fImplementsRange[0], fImplementsRange[1] + 1 - fImplementsRange[0]);
}
@@ -307,7 +307,7 @@ protected void appendMemberDeclarationContents(CharArrayBuffer buffer) { } else {
if (getMask(MASK_TYPE_HAS_INTERFACES)) {
if (fExtendsRange[0] < 0) {
- buffer.append(" extends "/*nonNLS*/);
+ buffer.append(" extends "); //$NON-NLS-1$
} else {
buffer.append(fDocument, fExtendsRange[0], fExtendsRange[1] + 1 - fExtendsRange[0]);
}
@@ -377,7 +377,7 @@ public IJavaElement getJavaElement(IJavaElement parent) throws IllegalArgumentEx } else if (parent.getElementType() == IJavaElement.COMPILATION_UNIT) {
return ((ICompilationUnit)parent).getType(getName());
} else {
- throw new IllegalArgumentException(Util.bind("element.illegalParent"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.illegalParent")); //$NON-NLS-1$
}
}
/**
@@ -527,9 +527,9 @@ public void setClass(boolean b) { fragment();
setMask(MASK_TYPE_IS_CLASS, b);
if (b) {
- fTypeKeyword= "class"/*nonNLS*/;
+ fTypeKeyword= "class"; //$NON-NLS-1$
} else {
- fTypeKeyword= "interface"/*nonNLS*/;
+ fTypeKeyword= "interface"; //$NON-NLS-1$
setSuperclass(null);
}
}
@@ -556,7 +556,7 @@ void setCloseBodyRangeStart(int start) { */
public void setName(String name) throws IllegalArgumentException {
if (name == null) {
- throw new IllegalArgumentException(Util.bind("element.nullName"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("element.nullName")); //$NON-NLS-1$
}
super.setName(name);
Enumeration children= getChildren();
@@ -588,7 +588,7 @@ public void setSuperclass(String superclassName) { public void setSuperInterfaces(String[] names) {
becomeDetailed();
if (names == null) {
- throw new IllegalArgumentException(Util.bind("dom.nullInterfaces"/*nonNLS*/));
+ throw new IllegalArgumentException(Util.bind("dom.nullInterfaces")); //$NON-NLS-1$
}
fragment();
fSuperInterfaces= names;
@@ -601,7 +601,7 @@ public void setSuperInterfaces(String[] names) { CharArrayBuffer buffer = new CharArrayBuffer();
for (int i = 0; i < names.length; i++) {
if (i > 0) {
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", "); //$NON-NLS-1$
}
buffer.append(names[i]);
}
@@ -636,6 +636,6 @@ protected void shareContents(DOMNode node) { * @see IDOMNode#toString()
*/
public String toString() {
- return "TYPE: "/*nonNLS*/ + getName();
+ return "TYPE: " + getName(); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java index 49830eb364..214c053afe 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java @@ -27,7 +27,7 @@ public void acceptImport(int declarationStart, int declarationEnd, char[] name, String importName = new String(name);
/** name is set to contain the '*' */
if (onDemand) {
- importName+=".*"/*nonNLS*/;
+ importName+=".*"; //$NON-NLS-1$
}
fNode= new DOMImport(fDocument, sourceRange, importName, onDemand);
addChild(fNode);
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/lookup/ReferenceInfo.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/lookup/ReferenceInfo.java index 6a73282029..8e5fd4b26f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/lookup/ReferenceInfo.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/lookup/ReferenceInfo.java @@ -53,12 +53,12 @@ public char[][] getNames() { * For debugging only
*/
public String toString() {
- StringBuffer buf = new StringBuffer("ReferenceInfo("/*nonNLS*/);
+ StringBuffer buf = new StringBuffer("ReferenceInfo("); //$NON-NLS-1$
for (int i = 0; i < fNames.length; i++) {
buf.append(fNames[i]);
- buf.append(" "/*nonNLS*/);
+ buf.append(" "); //$NON-NLS-1$
}
- buf.append(")"/*nonNLS*/);
+ buf.append(")"); //$NON-NLS-1$
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/AnonymousFileSource.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/AnonymousFileSource.java index e846e1ac14..eaf8532740 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/AnonymousFileSource.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/AnonymousFileSource.java @@ -19,7 +19,7 @@ public AnonymousFileSource(File directory) { if (!directory.exists()) {
directory.mkdirs();
} else if (!directory.isDirectory()) {
- throw new IllegalArgumentException("Directory arguments should be a directory."/*nonNLS*/);
+ throw new IllegalArgumentException("Directory arguments should be a directory."); //$NON-NLS-1$
}
fDirectory = directory;
}
@@ -30,7 +30,7 @@ public AnonymousFileSource(File directory) { synchronized public RandomAccessFile allocateAnonymousFile() throws IOException {
File file = getAnonymousFile();
- return new RandomAccessFile(file, "rw"/*nonNLS*/);
+ return new RandomAccessFile(file, "rw"); //$NON-NLS-1$
}
/**
* Returns a URL on a newly allocated file with the given initial content.
@@ -38,17 +38,17 @@ synchronized public RandomAccessFile allocateAnonymousFile() throws IOException */
synchronized public URL allocateAnonymousURL(byte[] bytes) throws IOException {
try {
- byte hasharray[] = java.security.MessageDigest.getInstance("SHA"/*nonNLS*/).digest(bytes);
+ byte hasharray[] = java.security.MessageDigest.getInstance("SHA").digest(bytes); //$NON-NLS-1$
StringBuffer sb = new StringBuffer();
for (int i = 0; i < hasharray.length; i++) {
sb.append(Character.forDigit((int)((hasharray[i] >> 4) & 0x0F), 16));
sb.append(Character.forDigit((int)(hasharray[i] & 0x0F), 16));
}
- sb.append(".jnk"/*nonNLS*/);
+ sb.append(".jnk"); //$NON-NLS-1$
String fileName = sb.toString();
File file = fileForName(fileName);
if (!file.exists()) {
- RandomAccessFile raf = new RandomAccessFile(file, "rw"/*nonNLS*/);
+ RandomAccessFile raf = new RandomAccessFile(file, "rw"); //$NON-NLS-1$
raf.write(bytes);
raf.close();
}
@@ -64,7 +64,7 @@ synchronized public URL allocateAnonymousURL(byte[] bytes) throws IOException { static public URL convertFileToURL(File file) {
try {
String path = file.getCanonicalPath().replace(java.io.File.separatorChar, '/');
- return new URL("file"/*nonNLS*/, ""/*nonNLS*/, "/"/*nonNLS*/ + path);
+ return new URL("file", "", "/" + path); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
catch (IOException ioe) {
throw new Error();
@@ -121,7 +121,7 @@ synchronized public String getAnonymousFileName(long l) { sb.append(Character.forDigit((int)(l % 36), 36));
l /= 36;
}
- sb.append(".jnk"/*nonNLS*/);
+ sb.append(".jnk"); //$NON-NLS-1$
return sb.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DiskCache.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DiskCache.java index 7213985e80..ad02b6f058 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DiskCache.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DiskCache.java @@ -171,9 +171,9 @@ public class DiskCache { EntryCache fEntryCache;
- static final String CONTENTS_FILE_NAME = "contents"/*nonNLS*/;
- static final String TEMP_CONTENTS_FILE_NAME = "tempcont"/*nonNLS*/;
- static final String CONTENTS_VERSION = "DiskCache.V1.0"/*nonNLS*/;
+ static final String CONTENTS_FILE_NAME = "contents"; //$NON-NLS-1$
+ static final String TEMP_CONTENTS_FILE_NAME = "tempcont"; //$NON-NLS-1$
+ static final String CONTENTS_VERSION = "DiskCache.V1.0"; //$NON-NLS-1$
/**
* Set to true when cache is modified, cleared when saved.
@@ -217,7 +217,7 @@ public DiskCache(File directory, int spaceLimit) { */
public OutputStream add(final String key, int size, byte[] extraInfo) throws IOException {
if (size > fSpaceLimit*1024) {
- throw new IOException("Entry size greater than cache size"/*nonNLS*/);
+ throw new IOException("Entry size greater than cache size"); //$NON-NLS-1$
}
final File file;
OutputStream output;
@@ -518,7 +518,7 @@ public int getNumberOfFilesToBeDeleted() { int spaceUsed = in.readInt(); /* Ignored -- updated as entries are read */
int numEntries = in.readInt();
if (!sig.equals(CONTENTS_VERSION)) {
- throw new IOException(Util.bind("file.badFormat"/*nonNLS*/));
+ throw new IOException(Util.bind("file.badFormat")); //$NON-NLS-1$
}
/* Read to a temp. array of entries. The entries are in most- to
@@ -736,7 +736,7 @@ public synchronized void removeAll(Vector keys) { }
}
};
- fPeriodicSaveThread.setName("DiskCache periodic save"/*nonNLS*/);
+ fPeriodicSaveThread.setName("DiskCache periodic save"); //$NON-NLS-1$
fPeriodicSaveThread.start();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Dumper.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Dumper.java index 2f61613f59..bc32cd26f9 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Dumper.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Dumper.java @@ -62,30 +62,30 @@ public void dump(int[] val, int maxPerLine) { if (!oneLine) {
++fTabLevel;
}
- fWriter.print("["/*nonNLS*/);
+ fWriter.print("["); //$NON-NLS-1$
for (int i = 0; i < len; ++i) {
if (!oneLine) {
if ((i % maxPerLine) == 0) {
fWriter.println();
tabIfNeeded();
fWriter.print(i);
- fWriter.print(": "/*nonNLS*/);
+ fWriter.print(": "); //$NON-NLS-1$
}
}
fWriter.print(val[i]);
if (i + 1 < len) {
- fWriter.print(", "/*nonNLS*/);
+ fWriter.print(", "); //$NON-NLS-1$
}
}
if (oneLine) {
- fWriter.print("]"/*nonNLS*/);
+ fWriter.print("]"); //$NON-NLS-1$
fWriter.println();
}
else {
fWriter.println();
--fTabLevel;
tabIfNeeded();
- fWriter.print("]"/*nonNLS*/);
+ fWriter.print("]"); //$NON-NLS-1$
fWriter.println();
}
}
@@ -94,7 +94,7 @@ public void dump(int[] val, int maxPerLine) { */
public void dump(Object[] val) {
int len = val.length;
- fWriter.print("["/*nonNLS*/);
+ fWriter.print("["); //$NON-NLS-1$
if (len > 0) {
fWriter.println();
++fTabLevel;
@@ -104,7 +104,7 @@ public void dump(Object[] val) { --fTabLevel;
tabIfNeeded();
}
- fWriter.println("]"/*nonNLS*/);
+ fWriter.println("]"); //$NON-NLS-1$
}
/**
* Dumps the given array.
@@ -116,20 +116,20 @@ public void dump(String[] val, int maxPerLine) { if (!oneLine) {
++fTabLevel;
}
- fWriter.print("["/*nonNLS*/);
+ fWriter.print("["); //$NON-NLS-1$
boolean newLine = !oneLine;
for (int i = 0; i < len; ++i) {
if (newLine) {
fWriter.println();
tabIfNeeded();
}
- fWriter.print("\""/*nonNLS*/ + val[i] + "\""/*nonNLS*/);
+ fWriter.print("\"" + val[i] + "\""); //$NON-NLS-1$ //$NON-NLS-2$
if (i + 1 < len) {
- fWriter.print(", "/*nonNLS*/);
+ fWriter.print(", "); //$NON-NLS-1$
}
newLine = (i != 0 && (i % maxPerLine) == 0);
}
- fWriter.print("]"/*nonNLS*/);
+ fWriter.print("]"); //$NON-NLS-1$
if (oneLine || newLine) {
fWriter.println();
}
@@ -144,18 +144,18 @@ public void dump(Object val) { tabIfNeeded();
if (val instanceof IDumpable) {
IDumpable dumpable = (IDumpable) val;
- fWriter.println(classNameFor(val) + " {"/*nonNLS*/);
+ fWriter.println(classNameFor(val) + " {"); //$NON-NLS-1$
int originalLevel = fTabLevel;
++fTabLevel;
try {
dumpable.dump(this);
}
catch (Throwable t) {
- fWriter.println("*ERR*"/*nonNLS*/);
+ fWriter.println("*ERR*"); //$NON-NLS-1$
}
fTabLevel = originalLevel;
tabIfNeeded();
- fWriter.println("}"/*nonNLS*/);
+ fWriter.println("}"); //$NON-NLS-1$
}
else {
fWriter.println(val);
@@ -211,7 +211,7 @@ public void dump(String name, Object val) { */
public void dump(String name, String val) {
prefix(name);
- fWriter.println(val == null ? "null"/*nonNLS*/ : "\""/*nonNLS*/ + val + "\""/*nonNLS*/);
+ fWriter.println(val == null ? "null" : "\"" + val + "\""); //$NON-NLS-1$ //$NON-NLS-3$ //$NON-NLS-2$
}
/**
* Dumps the given value, with the given name as a prefix.
@@ -264,7 +264,7 @@ public void outdent() { void prefix(String name) {
tabIfNeeded();
fWriter.print(name);
- fWriter.print(": "/*nonNLS*/);
+ fWriter.print(": "); //$NON-NLS-1$
}
/**
* Print an object directly, without a newline.
@@ -289,7 +289,7 @@ public void println(Object obj) { */
void tabIfNeeded() {
for (int i = 0; i < fTabLevel; ++i) {
- fWriter.print(" "/*nonNLS*/);
+ fWriter.print(" "); //$NON-NLS-1$
}
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LRUCache.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LRUCache.java index fbac18a93b..b6b72e4419 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LRUCache.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LRUCache.java @@ -80,7 +80,7 @@ public class LRUCache implements Cloneable { */
public String toString() {
- return "LRUCacheEntry ["/*nonNLS*/ + _fKey + "-->"/*nonNLS*/ + _fValue + "]"/*nonNLS*/;
+ return "LRUCacheEntry [" + _fKey + "-->" + _fValue + "]"; //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -444,7 +444,7 @@ public class LRUCache implements Cloneable { */
public String toString() {
return
- "LRUCache "/*nonNLS*/ + (fCurrentSpace * 100.0 / fSpaceLimit) + "% full\n"/*nonNLS*/ +
+ "LRUCache " + (fCurrentSpace * 100.0 / fSpaceLimit) + "% full\n" + //$NON-NLS-1$ //$NON-NLS-2$
this.toStringContents();
}
/**
@@ -471,9 +471,9 @@ protected String toStringContents() { String toString = sorter.sortedStrings[i];
Object value = this.get(sorter.sortedObjects[i]);
result.append(toString);
- result.append(" -> "/*nonNLS*/);
+ result.append(" -> "); //$NON-NLS-1$
result.append(value);
- result.append("\n"/*nonNLS*/);
+ result.append("\n"); //$NON-NLS-1$
}
return result.toString();
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LookupTable.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LookupTable.java index 74888e9e6b..777bc912f7 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LookupTable.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LookupTable.java @@ -62,7 +62,7 @@ public class LookupTable extends Dictionary implements Cloneable { entry = null;
return next;
}
- throw new NoSuchElementException("LookupTable Enumerator"/*nonNLS*/);
+ throw new NoSuchElementException("LookupTable Enumerator"); //$NON-NLS-1$
}
}
/**
@@ -94,10 +94,10 @@ public class LookupTable extends Dictionary implements Cloneable { */
public LookupTable(int initialCapacity, float loadFactor) {
if (initialCapacity < 0)
- throw new IllegalArgumentException("Illegal Capacity: "/*nonNLS*/+
+ throw new IllegalArgumentException("Illegal Capacity: "+ //$NON-NLS-1$
initialCapacity);
if (loadFactor <= 0)
- throw new IllegalArgumentException("Illegal Load: "/*nonNLS*/+loadFactor);
+ throw new IllegalArgumentException("Illegal Load: "+loadFactor); //$NON-NLS-1$
if (initialCapacity==0)
initialCapacity = 1;
@@ -428,27 +428,27 @@ public class LookupTable extends Dictionary implements Cloneable { for (int i = 0; i < keys.length; ++i) {
if (keys[i] == null) {
if (values[i] != null) {
- System.err.println("LookupTable sanity check in "/*nonNLS*/ + where + ": key is null, but value isn't at index "/*nonNLS*/ + i);
+ System.err.println("LookupTable sanity check in " + where + ": key is null, but value isn't at index " + i); //$NON-NLS-2$ //$NON-NLS-1$
throw new Error();
}
}
else {
if (values[i] == null) {
- System.err.println("LookupTable sanity check in "/*nonNLS*/ + where + ": value is null, but key isn't at index "/*nonNLS*/ + i);
+ System.err.println("LookupTable sanity check in " + where + ": value is null, but key isn't at index " + i); //$NON-NLS-2$ //$NON-NLS-1$
throw new Error();
}
else {
++n;
Object value = get(keys[i]);
if (value == null || value != values[i]) {
- System.err.println("LookupTable sanity check in "/*nonNLS*/ + where + ": key doesn't hash to proper value: "/*nonNLS*/ + keys[i]);
+ System.err.println("LookupTable sanity check in " + where + ": key doesn't hash to proper value: " + keys[i]); //$NON-NLS-2$ //$NON-NLS-1$
throw new Error();
}
}
}
}
if (n != count) {
- System.err.println("LookupTable sanity check in "/*nonNLS*/ + where + ": count is "/*nonNLS*/ + count + " but there are "/*nonNLS*/ + n + " entries"/*nonNLS*/);
+ System.err.println("LookupTable sanity check in " + where + ": count is " + count + " but there are " + n + " entries"); //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
throw new Error();
}
}
@@ -473,7 +473,7 @@ public class LookupTable extends Dictionary implements Cloneable { */
public synchronized String toString() {
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{"); //$NON-NLS-1$
boolean first = true;
for (int i = 0, max = keys.length; i < max; i++) {
if (keys[i] != null) {
@@ -481,18 +481,18 @@ public class LookupTable extends Dictionary implements Cloneable { first = false;
}
else {
- buf.append(", "/*nonNLS*/);
+ buf.append(", "); //$NON-NLS-1$
}
if (buf.length() > 1000) {
- buf.append("..."/*nonNLS*/);
+ buf.append("..."); //$NON-NLS-1$
break;
}
else {
- buf.append(keys[i]).append("="/*nonNLS*/).append(values[i]);
+ buf.append(keys[i]).append("=").append(values[i]); //$NON-NLS-1$
}
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}"); //$NON-NLS-1$
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringHashtableOfInt.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringHashtableOfInt.java index 6846b44865..356e552868 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringHashtableOfInt.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringHashtableOfInt.java @@ -117,9 +117,9 @@ public String toString() { String key = this.keyTable[i];
if (key != null) {
buffer.append(key);
- buffer.append(" -> "/*nonNLS*/);
+ buffer.append(" -> "); //$NON-NLS-1$
buffer.append(this.valueTable[i]);
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n"); //$NON-NLS-1$
}
}
return buffer.toString();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringMatcher.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringMatcher.java index 3d161d9018..33492d8b22 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringMatcher.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringMatcher.java @@ -229,9 +229,9 @@ public class StringMatcher { * @param p, a String object that is a simple regular expression with ‘*’ and/or ‘?’
*/
private void parseWildCards() {
- if(fPattern.startsWith("*"/*nonNLS*/))
+ if(fPattern.startsWith("*")) //$NON-NLS-1$
fHasLeadingStar = true;
- if(fPattern.endsWith("*"/*nonNLS*/)) {
+ if(fPattern.endsWith("*")) { //$NON-NLS-1$
/* make sure it's not an escaped wildcard */
if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
fHasTrailingStar = true;
|