diff options
10 files changed, 39 insertions, 66 deletions
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Messages.properties b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Messages.properties index b1ee8462f0..c625ee7812 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Messages.properties +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Messages.properties @@ -74,18 +74,11 @@ build.analyzing = Analyzing {0} build.preparingBuild = Preparing for build
build.incompatibleParameterTypes = Incompatible parameter types.
build.compiling = Compiling {0}
-build.compilingContent = Compiling content of {0}
-build.cloneException = Unexpected clone exception in DependencyGraph.clone().
-build.errorDeletingNode = Attempt to delete unknown node type from dependency graph.
-build.graphCorrupt = Internal Error: the dependency graph is corrupt, do a full build to workaround error.
-build.unknownNode = Unknown kind of node.
-build.unknownIndictment = Unexpected kind of indictment.
build.readingDelta = Reading resource change information for : {0}
build.completed = Java build completed
build.builderName = Java Builder
-build.noEqualityForNodes = Equality not defined for dependency graph nodes
+build.compilingContent = Compiling content of {0}
build.scrubbingOutput = Scrubbing output folder
-build.lazyBuildDisabled = Lazy building has been disabled.
build.duplicateType = Type {0} already provided by {1}
build.errorParsingBinary = Error parsing class file for {0}
build.packageMismatch = Package declaration does not match folder. Expected folder is {0}.
@@ -100,9 +93,6 @@ build.oneProblemFound = {0} problem found build.problemsFound = {0} problems found
build.oneProblemFixed = {0} problem fixed
build.problemsFixed = {0} problems fixed
-build.invalidStates = Invalid states
-build.sanityCheck = Sanity check
-build.noState = No current state
build.cannotRestoreState = Failed to restore state
build.packageName = package {0}
build.defaultPackageName = default package for {0}
@@ -110,13 +100,6 @@ build.noPackagePath = Attempt to access packages for non-existent path: {0} build.ambiguousPackage = Didn't get exactly one package for {0}
build.copyingResources = Copying all resources on the classpath
build.updatingResources = Updating resources on the classpath
-build.formatError = Error in format.
-build.unknownHandle = Unknown kind of handle.
-build.nullEntryInPool = Null SourceEntry being added to StateSnapConstantPool.
-build.serializationError = Internal error in state serialization. Expected object missing from constant pool: {0}
-build.unexpectedPoolItem = Unexpected kind of pool item
-build.unexpectedNumberType = Unexpected type of number
-build.unexpectedNode = Unexpected kind of node
### status
status.coreException = Core exception.
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 6c4390dfa4..bb54ba75d5 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 @@ -169,7 +169,7 @@ public void dump(Dumper dumper) { * Make sure equality tests are never carried out on nodes
*/
public boolean equals(Object o) {
- Assert.isTrue(false, Util.bind("build.noEqualityForNodes"/*nonNLS*/));
+ Assert.isTrue(false, "Internal Error - Equality not defined for dependency graph nodes"/*nonNLS*/);
return false;
}
/**
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 0eee5f8d34..453d8b1799 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 @@ -105,7 +105,7 @@ 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, Util.bind("build.lazyBuildDisabled"/*nonNLS*/));
+ Assert.isTrue(false, "Internal Error - Lazy building has been disabled"/*nonNLS*/);
}
/**
* Returns a string describe the builder
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 0fe5c98315..5407ba1f24 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 @@ -99,7 +99,7 @@ class DeltaImpl implements IDelta { fNewState = (StateImpl)newState;
fOldState = (StateImpl)oldState;
} catch (ClassCastException cce) {
- Assert.isTrue(false, Util.bind("build.invalidStates"/*nonNLS*/));
+ Assert.isTrue(false, "Internal Error - Invalid states"/*nonNLS*/);
}
fStatus = CHANGED;
fName = fgImage;
@@ -396,8 +396,6 @@ protected int compareTypes(IType handle) { for (Enumeration e = toRemove.elements(); e.hasMoreElements();) {
pkgs.removeElement(e.nextElement());
}
-
- Assert.isTrue(vInfo.size() == pkgs.size(), Util.bind("build.sanityCheck"/*nonNLS*/));
/* convert info vector to array */
PackageInfo[] infos = new PackageInfo[vInfo.size()];
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 b57eb1c4f8..feeaac13a6 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, Util.bind("build.cloneException"/*nonNLS*/));
+ Assert.isTrue(false, "Unexpected clone exception in DependencyGraph.clone()"/*nonNLS*/);
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, Util.bind("build.errorDeletingNode"/*nonNLS*/));
+ Assert.isTrue(false, "Attempt to delete unknown node type from dependency graph"/*nonNLS*/);
}
return (INode)value;
}
@@ -312,7 +312,7 @@ public Enumeration getJCUNodes() { return getNodeFor((IPath)o, create);
}
else {
- Assert.isTrue(false, Util.bind("build.unknownNode"/*nonNLS*/));
+ Assert.isTrue(false, "Unknown kind of node"/*nonNLS*/);
return null;
}
}
@@ -477,7 +477,7 @@ public Vector getUnusedNamespaceNodes() { * For debugging only -- asserts graph integrity
*/
public void integrityCheck(Dictionary table) {
- String msg = Util.bind("build.graphCorrupt"/*nonNLS*/);
+ String msg = "Internal Error: the dependency graph is corrupt, do a full build to workaround error"/*nonNLS*/;
for (Enumeration e = table.elements(); e.hasMoreElements();) {
AbstractNode node = (AbstractNode) e.nextElement();
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 53852daff5..b9040e53ca 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 @@ -71,7 +71,7 @@ public class IndictmentSet { fAbstractMethodTable.put(i.getKey(), i);
break;
default:
- Assert.isTrue(false, Util.bind("build.unknownIndictment"/*nonNLS*/));
+ Assert.isTrue(false, "Internal Error - Unexpected kind of indictment"/*nonNLS*/);
break;
}
}
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 0aef467816..3b894eac78 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 @@ -195,7 +195,7 @@ protected Vector getBuildListeners() { }
public IState getCurrentState() throws NotPresentException {
if (fCurrentState == null) {
- throw new NotPresentException(Util.bind("build.noState"/*nonNLS*/));
+ throw new NotPresentException("Internal Error - No current state"/*nonNLS*/);
}
return fCurrentState;
}
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 5d5f1ade82..7584b6f8fb 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, Util.bind("build.unknownHandle"/*nonNLS*/));
+ Assert.isTrue(false, "Unknown kind of handle"/*nonNLS*/);
}
}
/**
* Add a SourceEntry to the pool.
*/
public void add(SourceEntry entry) {
- Assert.isNotNull(entry, Util.bind("build.nullEntryInPool"/*nonNLS*/));
+ Assert.isNotNull(entry, "Null SourceEntry being added to StateSnapConstantPool"/*nonNLS*/);
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(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
return result;
}
catch (ClassCastException e) {
- throw new IOException(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
}
/**
@@ -192,12 +192,12 @@ public IPackage getPackage(int index) throws IOException { try {
IPackage result = (IPackage)fSet.get(index);
if (result == null) {
- throw new IOException(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
return result;
}
catch (ClassCastException e) {
- throw new IOException(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
}
/**
@@ -207,12 +207,12 @@ public IPath getPath(int index) throws IOException { try {
IPath result = (IPath)fSet.get(index);
if (result == null) {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
}
/**
@@ -222,12 +222,12 @@ public SourceEntry getSourceEntry(int index) throws IOException { try {
SourceEntry result = (SourceEntry)fSet.get(index);
if (result == null) {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
}
/**
@@ -237,12 +237,12 @@ public String getString(int index) throws IOException { try {
String result = (String)fSet.get(index);
if (result == null) {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
}
/**
@@ -263,7 +263,7 @@ public Object getStringOrNumber(int index) throws IOException { return result;
}
else {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
}
/**
@@ -273,12 +273,12 @@ public IType getType(int index) throws IOException { try {
IType result = (IType)fSet.get(index);
if (result == null) {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
return result;
}
catch (ClassCastException e) {
- throw new IOException("build.formatError"/*nonNLS*/);
+ throw new IOException("Error in format"/*nonNLS*/);
}
}
/**
@@ -323,7 +323,7 @@ public int index(Object obj) { return fSet.index(obj);
}
catch (IllegalArgumentException e) {
- throw new IllegalArgumentException(Util.bind("build.serializationError"/*nonNLS*/, obj.toString()));
+ throw new IllegalArgumentException("Internal error in state serialization. Expected object missing from constant pool: "/*nonNLS*/ + obj);
}
}
/**
@@ -397,7 +397,7 @@ private void read(IDevelopmentContext dc, DataInputStream in, StateSnapV5 snap) fSet.put(i, readNumber(in, tag));
break;
default:
- throw new IOException(Util.bind("build.unexpectedPoolItem"/*nonNLS*/));
+ throw new IOException("Unexpected kind of pool item"/*nonNLS*/);
}
}
}
@@ -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(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
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(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
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(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
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(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
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(Util.bind("build.unexpectedPoolItem"/*nonNLS*/));
+ throw new IOException("Unexpected kind of pool item"/*nonNLS*/);
}
}
/**
@@ -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("build.unexpectedNumberType"/*nonNLS*/);
+ throw new IOException("Unexpected type of number"/*nonNLS*/);
}
}
/**
@@ -539,7 +539,7 @@ public void write(DataOutputStream out) throws IOException { writeNumber((Number)obj, out); // tags 12 through 15
}
else {
- Assert.isTrue(false, Util.bind("build.unexpectedPoolItem"/*nonNLS*/));
+ Assert.isTrue(false, "Unexpected kind of pool item"/*nonNLS*/);
}
}
}
@@ -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(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
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, Util.bind("build.unknownHandle"/*nonNLS*/));
+ Assert.isTrue(false, "Unknown kind of handle"/*nonNLS*/);
}
}
/**
@@ -635,7 +635,7 @@ private void writeNumber(Number num, DataOutputStream out) throws IOException { out.writeLong(Double.doubleToLongBits(num.doubleValue()));
}
else {
- Assert.isTrue(false, Util.bind("build.unexpectedNumberType"/*nonNLS*/));
+ Assert.isTrue(false, "Unexpected type of number"/*nonNLS*/);
}
}
}
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 c3eef1d35c..e7f9d4f4fd 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, Util.bind("build.unexpectedNode"/*nonNLS*/));
+ Assert.isTrue(false, "Unexpected kind of node"/*nonNLS*/);
}
// 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(Util.bind("build.formatError"/*nonNLS*/));
+ throw new IOException("Error in format"/*nonNLS*/);
}
/**
* Check that the next section has the given name.
diff --git a/org.eclipse.jdt.core/plugin.jars b/org.eclipse.jdt.core/plugin.jars deleted file mode 100644 index c6ba09bf88..0000000000 --- a/org.eclipse.jdt.core/plugin.jars +++ /dev/null @@ -1,8 +0,0 @@ -jdtcore.jar=\
- Eclipse Java Batch Compiler,\
- Eclipse Java Code Assist,\
- Eclipse Java Formatter,\
- Eclipse Java Compiler,\
- Eclipse Java Evaluation,\
- Eclipse Java Core Search,\
- Eclipse Java Model
|