From d5ed769a565f8a648757fe2c05f619f92bbdebf5 Mon Sep 17 00:00:00 2001 From: "nboyd%atg.com" Date: Tue, 25 Mar 2008 14:32:28 +0000 Subject: [PATCH] More warnings fixed. git-svn-id: svn://10.0.0.236/trunk@248540 18797224-902f-48f8-a5cc-f745e15eee43 --- .../org/mozilla/classfile/ClassFileWriter.java | 2 ++ .../mozilla/javascript/DefiningClassLoader.java | 1 + .../org/mozilla/javascript/FunctionObject.java | 5 +++++ .../src/org/mozilla/javascript/JavaAdapter.java | 2 ++ .../src/org/mozilla/javascript/JavaMembers.java | 5 ++++- .../mozilla/javascript/JavaScriptException.java | 1 + .../rhino/src/org/mozilla/javascript/Kit.java | 2 ++ .../src/org/mozilla/javascript/MemberBox.java | 1 + .../src/org/mozilla/javascript/NativeArray.java | 17 +++++++++++++++++ .../org/mozilla/javascript/NativeJavaClass.java | 9 +++++++++ .../javascript/NativeJavaConstructor.java | 3 +++ .../mozilla/javascript/NativeJavaMethod.java | 4 ++++ .../mozilla/javascript/NativeJavaPackage.java | 11 +++++++++++ .../src/org/mozilla/javascript/Parser.java | 2 -- .../javascript/PolicySecurityController.java | 6 +++++- .../org/mozilla/javascript/ScriptOrFnNode.java | 4 ++-- .../org/mozilla/javascript/SecureCaller.java | 2 +- .../src/org/mozilla/javascript/SpecialRef.java | 4 ++++ .../org/mozilla/javascript/Synchronizer.java | 1 + .../org/mozilla/javascript/optimizer/Block.java | 3 +-- .../mozilla/javascript/optimizer/Codegen.java | 15 ++++++--------- .../javascript/optimizer/DataFlowBitSet.java | 1 + .../javascript/optimizer/OptTransformer.java | 4 +++- .../serialize/ScriptableInputStream.java | 2 ++ .../serialize/ScriptableOutputStream.java | 4 +++- .../src/org/mozilla/javascript/xml/XMLLib.java | 1 + 26 files changed, 92 insertions(+), 20 deletions(-) diff --git a/mozilla/js/rhino/src/org/mozilla/classfile/ClassFileWriter.java b/mozilla/js/rhino/src/org/mozilla/classfile/ClassFileWriter.java index b9c6c96cbb5..2969d923085 100644 --- a/mozilla/js/rhino/src/org/mozilla/classfile/ClassFileWriter.java +++ b/mozilla/js/rhino/src/org/mozilla/classfile/ClassFileWriter.java @@ -3011,6 +3011,7 @@ final class FieldOrMethodRef this.type = type; } + @Override public boolean equals(Object obj) { if (!(obj instanceof FieldOrMethodRef)) { return false; } @@ -3020,6 +3021,7 @@ final class FieldOrMethodRef && type.equals(x.type); } + @Override public int hashCode() { if (hashCode == -1) { diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/DefiningClassLoader.java b/mozilla/js/rhino/src/org/mozilla/javascript/DefiningClassLoader.java index d65336a03fe..9723d9c618c 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/DefiningClassLoader.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/DefiningClassLoader.java @@ -67,6 +67,7 @@ public class DefiningClassLoader extends ClassLoader resolveClass(cl); } + @Override public Class loadClass(String name, boolean resolve) throws ClassNotFoundException { diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/FunctionObject.java b/mozilla/js/rhino/src/org/mozilla/javascript/FunctionObject.java index 58d30657b77..9787b606f37 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/FunctionObject.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/FunctionObject.java @@ -250,6 +250,7 @@ public class FunctionObject extends BaseFunction * (number of parameters of the method, or 1 if the method is a "varargs" * form). */ + @Override public int getArity() { return parmsLength < 0 ? 1 : parmsLength; } @@ -257,10 +258,12 @@ public class FunctionObject extends BaseFunction /** * Return the same value as {@link #getArity()}. */ + @Override public int getLength() { return getArity(); } + @Override public String getFunctionName() { return (functionName == null) ? "" : functionName; @@ -399,6 +402,7 @@ public class FunctionObject extends BaseFunction * @see org.mozilla.javascript.Function#call( * Context, Scriptable, Scriptable, Object[]) */ + @Override public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { @@ -500,6 +504,7 @@ public class FunctionObject extends BaseFunction * Return null to indicate that the call method should be used to create * new objects. */ + @Override public Scriptable createObject(Context cx, Scriptable scope) { if (member.isCtor() || parmsLength == VARARGS_CTOR) { return null; diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/JavaAdapter.java b/mozilla/js/rhino/src/org/mozilla/javascript/JavaAdapter.java index 49119603993..7963751b789 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/JavaAdapter.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/JavaAdapter.java @@ -71,6 +71,7 @@ public final class JavaAdapter implements IdFunctionCall this.names = names; } + @Override public boolean equals(Object obj) { if (!(obj instanceof JavaAdapterSignature)) @@ -97,6 +98,7 @@ public final class JavaAdapter implements IdFunctionCall return true; } + @Override public int hashCode() { return superClass.hashCode() diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/JavaMembers.java b/mozilla/js/rhino/src/org/mozilla/javascript/JavaMembers.java index f9c8e6d8e87..5a0ed07bb9e 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/JavaMembers.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/JavaMembers.java @@ -333,7 +333,7 @@ class JavaMembers { Map map = new HashMap(); discoverAccessibleMethods(clazz, map, includeProtected, includePrivate); - return (Method[])map.values().toArray(new Method[map.size()]); + return map.values().toArray(new Method[map.size()]); } private static void discoverAccessibleMethods(Class clazz, @@ -423,6 +423,7 @@ class JavaMembers this(method.getName(), method.getParameterTypes()); } + @Override public boolean equals(Object o) { if(o instanceof MethodSignature) @@ -433,6 +434,7 @@ class JavaMembers return false; } + @Override public int hashCode() { return name.hashCode() ^ args.length; @@ -896,6 +898,7 @@ class FieldAndMethods extends NativeJavaMethod setPrototype(ScriptableObject.getFunctionPrototype(scope)); } + @Override public Object getDefaultValue(Class hint) { if (hint == ScriptRuntime.FunctionClass) diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java b/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java index 11ebedf3f09..99d696e7951 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java @@ -73,6 +73,7 @@ public class JavaScriptException extends RhinoException this.value = value; } + @Override public String details() { try { diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Kit.java b/mozilla/js/rhino/src/org/mozilla/javascript/Kit.java index 1fc7f22042f..a6d1c63cdea 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/Kit.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/Kit.java @@ -403,6 +403,7 @@ public class Kit this.key2 = key2; } + @Override public boolean equals(Object anotherObj) { if (!(anotherObj instanceof ComplexKey)) @@ -411,6 +412,7 @@ public class Kit return key1.equals(another.key1) && key2.equals(another.key2); } + @Override public int hashCode() { if (hash == 0) { diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/MemberBox.java b/mozilla/js/rhino/src/org/mozilla/javascript/MemberBox.java index 1553b87f254..d9e3cb648ce 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/MemberBox.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/MemberBox.java @@ -147,6 +147,7 @@ final class MemberBox implements Serializable return sb.toString(); } + @Override public String toString() { return memberObject.toString(); diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeArray.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeArray.java index 4add2123697..257ff8a5adc 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeArray.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeArray.java @@ -100,6 +100,7 @@ public class NativeArray extends IdScriptableObject length = array.length; } + @Override public String getClassName() { return "Array"; @@ -109,11 +110,13 @@ public class NativeArray extends IdScriptableObject Id_length = 1, MAX_INSTANCE_ID = 1; + @Override protected int getMaxInstanceId() { return MAX_INSTANCE_ID; } + @Override protected int findInstanceIdInfo(String s) { if (s.equals("length")) { @@ -122,12 +125,14 @@ public class NativeArray extends IdScriptableObject return super.findInstanceIdInfo(s); } + @Override protected String getInstanceIdName(int id) { if (id == Id_length) { return "length"; } return super.getInstanceIdName(id); } + @Override protected Object getInstanceIdValue(int id) { if (id == Id_length) { @@ -136,6 +141,7 @@ public class NativeArray extends IdScriptableObject return super.getInstanceIdValue(id); } + @Override protected void setInstanceIdValue(int id, Object value) { if (id == Id_length) { @@ -144,6 +150,7 @@ public class NativeArray extends IdScriptableObject super.setInstanceIdValue(id, value); } + @Override protected void fillConstructorProperties(IdFunctionObject ctor) { addIdFunctionProperty(ctor, ARRAY_TAG, ConstructorId_join, @@ -183,6 +190,7 @@ public class NativeArray extends IdScriptableObject super.fillConstructorProperties(ctor); } + @Override protected void initPrototypeId(int id) { String s; @@ -214,6 +222,7 @@ public class NativeArray extends IdScriptableObject initPrototypeMethod(ARRAY_TAG, id, s, arity); } + @Override public Object execIdCall(IdFunctionObject f, Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { @@ -316,6 +325,7 @@ public class NativeArray extends IdScriptableObject } } + @Override public Object get(int index, Scriptable start) { if (!denseOnly && isGetterOrSetter(null, index, false)) @@ -325,6 +335,7 @@ public class NativeArray extends IdScriptableObject return super.get(index, start); } + @Override public boolean has(int index, Scriptable start) { if (!denseOnly && isGetterOrSetter(null, index, false)) @@ -352,6 +363,7 @@ public class NativeArray extends IdScriptableObject return -1; } + @Override public void put(String id, Scriptable start, Object value) { super.put(id, start, value); @@ -382,6 +394,7 @@ public class NativeArray extends IdScriptableObject return true; } + @Override public void put(int index, Scriptable start, Object value) { if (start == this && !isSealed() && dense != null && 0 <= index && @@ -412,6 +425,7 @@ public class NativeArray extends IdScriptableObject } } + @Override public void delete(int index) { if (dense != null && 0 <= index && index < dense.length && @@ -423,6 +437,7 @@ public class NativeArray extends IdScriptableObject } } + @Override public Object[] getIds() { Object[] superIds = super.getIds(); @@ -454,6 +469,7 @@ public class NativeArray extends IdScriptableObject return ids; } + @Override public Object getDefaultValue(Class hint) { if (hint == ScriptRuntime.NumberClass) { @@ -1599,6 +1615,7 @@ public class NativeArray extends IdScriptableObject // #string_id_map# + @Override protected int findPrototypeId(String s) { int id; diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaClass.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaClass.java index 7d3191161e9..f72f9e7311a 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaClass.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaClass.java @@ -78,6 +78,7 @@ public class NativeJavaClass extends NativeJavaObject implements Function initMembers(); } + @Override protected void initMembers() { Class cl = (Class)javaObject; members = JavaMembers.lookupClass(parent, cl, cl, false); @@ -85,14 +86,17 @@ public class NativeJavaClass extends NativeJavaObject implements Function = members.getFieldAndMethodsObjects(this, cl, true); } + @Override public String getClassName() { return "JavaClass"; } + @Override public boolean has(String name, Scriptable start) { return members.has(name, true) || javaClassPropertyName.equals(name); } + @Override public Object get(String name, Scriptable start) { // When used as a constructor, ScriptRuntime.newObject() asks // for our prototype to create an object of the correct type. @@ -131,10 +135,12 @@ public class NativeJavaClass extends NativeJavaObject implements Function throw members.reportMemberNotFound(name); } + @Override public void put(String name, Scriptable start, Object value) { members.put(this, name, javaObject, value, true); } + @Override public Object[] getIds() { return members.getIds(true); } @@ -143,6 +149,7 @@ public class NativeJavaClass extends NativeJavaObject implements Function return (Class) super.unwrap(); } + @Override public Object getDefaultValue(Class hint) { if (hint == null || hint == ScriptRuntime.StringClass) return this.toString(); @@ -277,6 +284,7 @@ public class NativeJavaClass extends NativeJavaObject implements Function return cx.getWrapFactory().wrapNewObject(cx, topLevel, instance); } + @Override public String toString() { return "[JavaClass " + getClassObject().getName() + "]"; } @@ -289,6 +297,7 @@ public class NativeJavaClass extends NativeJavaObject implements Function * name conflicts between java.lang.Class's methods and the * static methods exposed by a JavaNativeClass. */ + @Override public boolean hasInstance(Scriptable value) { if (value instanceof Wrapper && diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaConstructor.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaConstructor.java index 530bf81e06c..557aeb5ce65 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaConstructor.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaConstructor.java @@ -65,18 +65,21 @@ public class NativeJavaConstructor extends BaseFunction this.ctor = ctor; } + @Override public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { return NativeJavaClass.constructSpecific(cx, scope, args, ctor); } + @Override public String getFunctionName() { String sig = JavaMembers.liveConnectSignature(ctor.argTypes); return "".concat(sig); } + @Override public String toString() { return "[JavaConstructor " + ctor.getName() + "]"; diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaMethod.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaMethod.java index 972b9a70c0f..b6eaf8b01a3 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaMethod.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaMethod.java @@ -74,6 +74,7 @@ public class NativeJavaMethod extends BaseFunction this(new MemberBox(method), name); } + @Override public String getFunctionName() { return functionName; @@ -117,6 +118,7 @@ public class NativeJavaMethod extends BaseFunction return sig.toString(); } + @Override String decompile(int indent, int flags) { StringBuffer sb = new StringBuffer(); @@ -132,6 +134,7 @@ public class NativeJavaMethod extends BaseFunction return sb.toString(); } + @Override public String toString() { StringBuffer sb = new StringBuffer(); @@ -146,6 +149,7 @@ public class NativeJavaMethod extends BaseFunction return sb.toString(); } + @Override public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaPackage.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaPackage.java index 7ff123d49d6..46caaac9b1f 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaPackage.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaPackage.java @@ -81,30 +81,37 @@ public class NativeJavaPackage extends ScriptableObject Context.getCurrentContext().getApplicationClassLoader()); } + @Override public String getClassName() { return "JavaPackage"; } + @Override public boolean has(String id, Scriptable start) { return true; } + @Override public boolean has(int index, Scriptable start) { return false; } + @Override public void put(String id, Scriptable start, Object value) { // Can't add properties to Java packages. Sorry. } + @Override public void put(int index, Scriptable start, Object value) { throw Context.reportRuntimeError0("msg.pkg.int"); } + @Override public Object get(String id, Scriptable start) { return getPkgProperty(id, start, true); } + @Override public Object get(int index, Scriptable start) { return NOT_FOUND; } @@ -174,14 +181,17 @@ public class NativeJavaPackage extends ScriptableObject return newValue; } + @Override public Object getDefaultValue(Class ignored) { return toString(); } + @Override public String toString() { return "[JavaPackage " + packageName + "]"; } + @Override public boolean equals(Object obj) { if(obj instanceof NativeJavaPackage) { NativeJavaPackage njp = (NativeJavaPackage)obj; @@ -190,6 +200,7 @@ public class NativeJavaPackage extends ScriptableObject return false; } + @Override public int hashCode() { return packageName.hashCode() ^ (classLoader == null ? 0 : classLoader.hashCode()); } diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Parser.java b/mozilla/js/rhino/src/org/mozilla/javascript/Parser.java index 8aada84620f..b4e6852371c 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/Parser.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/Parser.java @@ -1358,8 +1358,6 @@ public class Parser * statement. * @param inFor true if we are currently in the midst of the init * clause of a for. - * @param inStatement true if called in a statement (as opposed to an - * expression) context * @param declType A token value: either VAR, CONST, or LET depending on * context. * @return The parsed statement diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/PolicySecurityController.java b/mozilla/js/rhino/src/org/mozilla/javascript/PolicySecurityController.java index a43210045f6..49cb1248da5 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/PolicySecurityController.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/PolicySecurityController.java @@ -72,6 +72,7 @@ public class PolicySecurityController extends SecurityController callers = new WeakHashMap>>(); + @Override public Class getStaticSecurityDomainClassInternal() { return CodeSource.class; } @@ -98,6 +99,7 @@ public class PolicySecurityController extends SecurityController } } + @Override public GeneratedClassLoader createClassLoader(final ClassLoader parent, final Object securityDomain) { @@ -111,6 +113,7 @@ public class PolicySecurityController extends SecurityController }); } + @Override public Object getDynamicSecurityDomain(Object securityDomain) { // No separate notion of dynamic security domain - just return what was @@ -118,6 +121,7 @@ public class PolicySecurityController extends SecurityController return securityDomain; } + @Override public Object callWithDomain(final Object securityDomain, final Context cx, Callable callable, Scriptable scope, Scriptable thisObj, Object[] args) @@ -143,7 +147,7 @@ public class PolicySecurityController extends SecurityController synchronized (classLoaderMap) { SoftReference ref = classLoaderMap.get(classLoader); if (ref != null) { - caller = (SecureCaller)ref.get(); + caller = ref.get(); } else { caller = null; } diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptOrFnNode.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptOrFnNode.java index 47afa022788..ba08fb403f2 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptOrFnNode.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptOrFnNode.java @@ -176,7 +176,7 @@ public class ScriptOrFnNode extends Node.Scope { // symbol table. Can't just work from symbolTable map since // we need to retain duplicate parameters. for (int i=0; i < symbols.size(); i++) { - Symbol symbol = (Symbol) symbols.get(i); + Symbol symbol = symbols.get(i); if (symbol.containingTable == this) { newSymbols.add(symbol); } @@ -187,7 +187,7 @@ public class ScriptOrFnNode extends Node.Scope { variableNames = new String[symbols.size()]; isConsts = new boolean[symbols.size()]; for (int i=0; i < symbols.size(); i++) { - Symbol symbol = (Symbol) symbols.get(i); + Symbol symbol = symbols.get(i); variableNames[i] = symbol.name; isConsts[i] = symbol.declType == Token.CONST; symbol.index = i; diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/SecureCaller.java b/mozilla/js/rhino/src/org/mozilla/javascript/SecureCaller.java index 60727abaa19..3a252905197 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/SecureCaller.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/SecureCaller.java @@ -98,7 +98,7 @@ public abstract class SecureCaller { SoftReference ref = classLoaderMap.get(classLoader); if (ref != null) { - caller = (SecureCaller)ref.get(); + caller = ref.get(); } else { caller = null; } diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/SpecialRef.java b/mozilla/js/rhino/src/org/mozilla/javascript/SpecialRef.java index b037eaf7e0e..b50b5564aa0 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/SpecialRef.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/SpecialRef.java @@ -81,6 +81,7 @@ class SpecialRef extends Ref return new SpecialRef(target, type, name); } + @Override public Object get(Context cx) { switch (type) { @@ -95,6 +96,7 @@ class SpecialRef extends Ref } } + @Override public Object set(Context cx, Object value) { switch (type) { @@ -132,6 +134,7 @@ class SpecialRef extends Ref } } + @Override public boolean has(Context cx) { if (type == SPECIAL_NONE) { @@ -140,6 +143,7 @@ class SpecialRef extends Ref return true; } + @Override public boolean delete(Context cx) { if (type == SPECIAL_NONE) { diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Synchronizer.java b/mozilla/js/rhino/src/org/mozilla/javascript/Synchronizer.java index f2fca522a15..dbf4cef2a9f 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/Synchronizer.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/Synchronizer.java @@ -71,6 +71,7 @@ public class Synchronizer extends Delegator { /** * @see org.mozilla.javascript.Function#call */ + @Override public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Block.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Block.java index 03216f7b337..0d6f88f9f18 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Block.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Block.java @@ -199,8 +199,7 @@ class Block || (blockEndNodeType == Token.IFEQ) || (blockEndNodeType == Token.GOTO) ) { Node target = ((Node.Jump)blockEndNode).target; - FatBlock branchTargetBlock - = (FatBlock)(theTargetBlocks.get(target)); + FatBlock branchTargetBlock = theTargetBlocks.get(target); target.putProp(Node.TARGETBLOCK_PROP, branchTargetBlock.realBlock); fb.addSuccessor(branchTargetBlock); diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java index 8139735a351..e409509f85c 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java @@ -1805,8 +1805,8 @@ class BodyCodegen if (liveLocals != null) { ArrayList nodes = ((FunctionNode)scriptOrFn).getResumptionPoints(); for (int i = 0; i < nodes.size(); i++) { - Node node = (Node) nodes.get(i); - int[] live = (int [])liveLocals.get(node); + Node node = nodes.get(i); + int[] live = liveLocals.get(node); if (live != null) { cfw.markTableSwitchCase(generatorSwitch, getNextGeneratorState(node)); @@ -1827,8 +1827,7 @@ class BodyCodegen if (finallys != null) { for (Node n: finallys.keySet()) { if (n.getType() == Token.FINALLY) { - FinallyReturnPoint ret = - (FinallyReturnPoint)finallys.get(n); + FinallyReturnPoint ret = finallys.get(n); // the finally will jump here cfw.markLabel(ret.tableLabel, (short)1); @@ -1841,7 +1840,7 @@ class BodyCodegen // generate gotos back to the JSR location cfw.markTableSwitchCase(startSwitch, c); cfw.add(ByteCode.GOTO, - ((Integer)ret.jsrPoints.get(i)).intValue()); + ret.jsrPoints.get(i).intValue()); c++; } } @@ -2160,8 +2159,7 @@ class BodyCodegen cfw.addALoad(finallyRegister); cfw.add(ByteCode.CHECKCAST, "java/lang/Integer"); generateIntegerUnwrap(); - FinallyReturnPoint ret = - (FinallyReturnPoint)finallys.get(node); + FinallyReturnPoint ret = finallys.get(node); ret.tableLabel = cfw.acquireLabel(); cfw.add(ByteCode.GOTO, ret.tableLabel); } else { @@ -3095,8 +3093,7 @@ class BodyCodegen } private void addGotoWithReturn(Node target) { - FinallyReturnPoint ret = - (FinallyReturnPoint)finallys.get(target); + FinallyReturnPoint ret = finallys.get(target); cfw.addLoadConstant(ret.jsrPoints.size()); addGoto(target, ByteCode.GOTO); int retLabel = cfw.acquireLabel(); diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/DataFlowBitSet.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/DataFlowBitSet.java index 607e649a348..e72732d19f6 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/DataFlowBitSet.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/DataFlowBitSet.java @@ -89,6 +89,7 @@ class DataFlowBitSet { itsBits[i] |= b.itsBits[i]; } + @Override public String toString() { StringBuffer sb = new StringBuffer(); diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptTransformer.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptTransformer.java index 28a4b72936c..57f61139edb 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptTransformer.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptTransformer.java @@ -56,11 +56,13 @@ class OptTransformer extends NodeTransformer { this.directCallTargets = directCallTargets; } + @Override protected void visitNew(Node node, ScriptOrFnNode tree) { detectDirectCall(node, tree); super.visitNew(node, tree); } + @Override protected void visitCall(Node node, ScriptOrFnNode tree) { detectDirectCall(node, tree); super.visitCall(node, tree); @@ -106,7 +108,7 @@ class OptTransformer extends NodeTransformer { } if (targetName != null) { OptFunctionNode ofn; - ofn = (OptFunctionNode)possibleDirectCalls.get(targetName); + ofn = possibleDirectCalls.get(targetName); if (ofn != null && argCount == ofn.fnode.getParamCount() && !ofn.fnode.requiresActivation()) diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableInputStream.java b/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableInputStream.java index 13015b01825..efb40b89e65 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableInputStream.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableInputStream.java @@ -75,6 +75,7 @@ public class ScriptableInputStream extends ObjectInputStream { } } + @Override protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { @@ -89,6 +90,7 @@ public class ScriptableInputStream extends ObjectInputStream { return super.resolveClass(desc); } + @Override protected Object resolveObject(Object obj) throws IOException { diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java b/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java index 927f9770e0d..03e93ff7202 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/serialize/ScriptableOutputStream.java @@ -195,9 +195,11 @@ public class ScriptableOutputStream extends ObjectOutputStream { private String name; } + @Override protected Object replaceObject(Object obj) throws IOException { - String name = (String) table.get(obj); + if (false) throw new IOException(); // suppress warning + String name = table.get(obj); if (name == null) return obj; return new PendingLookup(name); diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/xml/XMLLib.java b/mozilla/js/rhino/src/org/mozilla/javascript/xml/XMLLib.java index da57ddf7757..da92dde2cb2 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/xml/XMLLib.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/xml/XMLLib.java @@ -56,6 +56,7 @@ public abstract class XMLLib public static abstract class Factory { public static Factory create(final String className) { return new Factory() { + @Override public String getImplementationClassName() { return className; }