Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/TypeVariableRepository.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/TypeVariableRepository.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/TypeVariableRepository.java (working copy) @@ -17,9 +17,6 @@ package org.apache.harmony.lang.reflect.repository; import java.lang.reflect.TypeVariable; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Constructor; import java.lang.reflect.GenericDeclaration; /** @@ -221,4 +218,4 @@ public static void registerTypeVariable(TypeVariable typeVariable, String typeVariableName, Object startPoint) { TypeVariableCache.insertTypeVariable(typeVariable, -1); } -} \ No newline at end of file +} Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/WildcardTypeRepository.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/WildcardTypeRepository.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/WildcardTypeRepository.java (working copy) @@ -17,9 +17,6 @@ package org.apache.harmony.lang.reflect.repository; import java.lang.reflect.WildcardType; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Constructor; import org.apache.harmony.lang.reflect.parser.*; @@ -281,4 +278,4 @@ public static void registerWildcardType(WildcardType wildcard, InterimWildcardType prsrdWildcardType, String signature, Object startPoint) { WildcardTypeCache.insertWildcardType(wildcard, prsrdWildcardType, signature, startPoint, -1); } -} \ No newline at end of file +} Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/ParameterizedTypeRepository.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/ParameterizedTypeRepository.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/repository/ParameterizedTypeRepository.java (working copy) @@ -17,9 +17,6 @@ package org.apache.harmony.lang.reflect.repository; import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Constructor; import org.apache.harmony.lang.reflect.parser.*; import org.apache.harmony.lang.reflect.support.AuxiliaryFinder; @@ -296,4 +293,4 @@ public static void registerParameterizedType(ParameterizedType parameterizedType, InterimParameterizedType prsrdParameterizedType, String signature, Object startPoint) { ParameterizedTypeCache.insertParameterizedType(parameterizedType, prsrdParameterizedType, signature, startPoint, -1); } -} \ No newline at end of file +} Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/Reflection.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/Reflection.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/Reflection.java (working copy) @@ -36,6 +36,7 @@ return reflectAccessor.copyConstructor(c); } + @SuppressWarnings("unchecked") public static Constructor[] copyConstructors(Constructor[] cs) { Constructor[] ret = new Constructor[cs.length]; for (int i = 0; i < cs.length; i++) { @@ -81,5 +82,4 @@ Method[] superPublic, Method[][] intf, int estimate) { return reflectAccessor.mergePublicMethods(declared, superPublic, intf, estimate); } - } Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/parser/SignatureParserTokenTypes.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/parser/SignatureParserTokenTypes.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/parser/SignatureParserTokenTypes.java (working copy) @@ -19,12 +19,6 @@ package org.apache.harmony.lang.reflect.parser; -import java.util.ArrayList; -import java.io.StringBufferInputStream; -import java.io.IOException; -import java.lang.reflect.GenericSignatureFormatError; -import org.apache.harmony.lang.reflect.parser.*; - /** * @author Serguei S. Zapreyev * @version $Revision: 1.1.2.1 $ Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/parser/SignatureParser.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/parser/SignatureParser.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/parser/SignatureParser.java (working copy) @@ -20,22 +20,14 @@ package org.apache.harmony.lang.reflect.parser; import java.util.ArrayList; -import java.io.StringBufferInputStream; -import java.io.IOException; import java.lang.reflect.GenericSignatureFormatError; -import org.apache.harmony.lang.reflect.parser.*; import antlr.TokenBuffer; import antlr.TokenStreamException; -import antlr.TokenStreamIOException; -import antlr.ANTLRException; -import antlr.LLkParser; import antlr.Token; import antlr.TokenStream; import antlr.RecognitionException; import antlr.NoViableAltException; -import antlr.MismatchedTokenException; -import antlr.SemanticException; import antlr.ParserSharedInputState; import antlr.collections.impl.BitSet; @@ -111,7 +103,6 @@ private String CTPTsignature; // accumulated signature of the current parsered parameterized type, it's used for parameterized types repository private int sigInd; -private int sigLen; private InterimType/*InterimGenericType*/ highLevelType; // the rolled up reference (InterimParameterizedType or InterimClassType) @@ -120,7 +111,6 @@ private int len; private PTStack p1, p2, currentStackElemCopy; private InterimClassType upper; -private char t; ////////////////////////////////////////////////////////////////////////////////////////////////////// private void throwGenericSignatureFormatError() throws GenericSignatureFormatError { @@ -199,7 +189,7 @@ // add the value to the args list of the found stack's element: if(p2.args == null) { - p2.args = new ArrayList(); + p2.args = new ArrayList(); } p2.args.add(ref); @@ -457,7 +447,6 @@ // to be reenterable: CTPTsignature = null; sigInd = 0; - sigLen = 0; currentStackElem = stack; genParamList = null; boundList = null; @@ -1031,7 +1020,6 @@ if (CTPTsignature != null) { CTPTsignature = null; sigInd = 0; - sigLen = 0; } // clean the current stack's element to be ready for new reference parsering: @@ -2716,5 +2704,5 @@ return data; } public static final BitSet _tokenSet_17 = new BitSet(mk_tokenSet_17()); - + } Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryFinder.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryFinder.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryFinder.java (working copy) @@ -23,7 +23,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.TypeVariable; import org.apache.harmony.lang.reflect.parser.InterimParameterizedType; -import org.apache.harmony.lang.reflect.parser.InterimGenericType; import org.apache.harmony.lang.reflect.repository.TypeVariableRepository; import org.apache.harmony.lang.reflect.parser.*; @@ -376,7 +375,6 @@ return res + transform(ini.substring(ind+12)); } else { // range 0x10000 - 0x10FFFF (high-surrogates range = 0xd800-0xdbff; low-surrogates range = 0xdc00-0xdfff; ) , for example: \0ed\0a0\0b5\0ed\0be\0af di3 = ini.substring(ind+10, ind+10+2); // to ommit the following \0 - String di4 = ini.substring(ind+14, ind+14+2); // to ommit the following \0 String di5 = ini.substring(ind+18, ind+18+2); // to ommit the following \0 String di6 = ini.substring(ind+22, ind+22+2); // to ommit the following \0 res = res + new String(new char[]{(char)((((Integer.parseInt(di2, 16)&0xf) + ((Integer.parseInt(di2, 16)&0xf)!=0?1:0))<<16)+((Integer.parseInt(di3, 16)&0x3f)<<10)+((Integer.parseInt(di5, 16)&0xf)<<6)+(Integer.parseInt(di6, 16)&0x3f))}); @@ -440,4 +438,4 @@ return klass; } } -} \ No newline at end of file +} Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryCreator.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryCreator.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryCreator.java (working copy) @@ -17,7 +17,6 @@ package org.apache.harmony.lang.reflect.support; import java.lang.reflect.Type; -import java.lang.reflect.GenericDeclaration; import java.lang.TypeNotPresentException; import java.lang.reflect.ParameterizedType; import java.lang.reflect.WildcardType; @@ -57,7 +56,7 @@ ParameterizedType pType = ParameterizedTypeRepository.findParameterizedType((InterimParameterizedType) nextLayer, startPoint); if (pType == null) { try { - Class genClassDecl = AuxiliaryFinder.findGenericClassDeclarationForParameterizedType((InterimParameterizedType) nextLayer, startPoint); + AuxiliaryFinder.findGenericClassDeclarationForParameterizedType((InterimParameterizedType) nextLayer, startPoint); } catch(Throwable e) { throw new TypeNotPresentException(((InterimParameterizedType) nextLayer).rawType.classTypeName.substring(1).replace('/', '.'), e); } @@ -113,7 +112,7 @@ ParameterizedType pType = ParameterizedTypeRepository.findParameterizedType((InterimParameterizedType) nextppType, startPoint); if (pType == null) { try { - Class genClassDecl = AuxiliaryFinder.findGenericClassDeclarationForParameterizedType((InterimParameterizedType) nextppType, startPoint); + AuxiliaryFinder.findGenericClassDeclarationForParameterizedType((InterimParameterizedType) nextppType, startPoint); } catch(Throwable e) { throw new TypeNotPresentException(((InterimParameterizedType) nextppType).rawType.classTypeName.substring(1).replace('/', '.'), e); } @@ -158,7 +157,7 @@ ParameterizedType cType = ParameterizedTypeRepository.findParameterizedType((InterimParameterizedType) pType, startPoint); if (cType == null) { try { - Class genClassDecl = AuxiliaryFinder.findGenericClassDeclarationForParameterizedType((InterimParameterizedType) pType, startPoint); + AuxiliaryFinder.findGenericClassDeclarationForParameterizedType((InterimParameterizedType) pType, startPoint); } catch(Throwable e) { throw new TypeNotPresentException(((InterimParameterizedType) pType).rawType.classTypeName.substring(1).replace('/', '.'), e); } @@ -219,4 +218,4 @@ } return res; } -} \ No newline at end of file +} Index: vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryLoader.java =================================================================== --- vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryLoader.java (revision 530435) +++ vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/lang/reflect/support/AuxiliaryLoader.java (working copy) @@ -32,7 +32,7 @@ public final class AuxiliaryLoader extends ClassLoader { public static final AuxiliaryLoader ersatzLoader = new AuxiliaryLoader(); - public Class findClass(final String classTypeName) + public Class findClass(final String classTypeName) throws ClassNotFoundException { if (classTypeName.equals("byte")) { return byte.class; @@ -55,17 +55,16 @@ } ClassLoader cl = this.getClass().getClassLoader(); if (cl == null) { - cl = AuxiliaryLoader.this.getSystemClassLoader(); + cl = ClassLoader.getSystemClassLoader(); } try { return cl.loadClass(classTypeName); } catch (Throwable _) { Class c = (Class) AccessController - .doPrivileged(new java.security.PrivilegedAction() { + .doPrivileged(new java.security.PrivilegedAction() { public Object run() { // based on an empiric knowledge - ClassLoader cl = AuxiliaryLoader.this - .getSystemClassLoader(); + ClassLoader cl = ClassLoader.getSystemClassLoader(); try { java.lang.reflect.Method[] ms = cl.getClass() .getDeclaredMethods(); @@ -123,11 +122,11 @@ } public void resolve(final Class c) { - AccessController.doPrivileged(new java.security.PrivilegedAction() { + AccessController.doPrivileged(new java.security.PrivilegedAction() { public Object run() { ClassLoader cl = AuxiliaryLoader.this.getClass().getClassLoader(); if (cl == null) { - cl = AuxiliaryLoader.this.getSystemClassLoader(); + cl = ClassLoader.getSystemClassLoader(); } try { java.lang.reflect.Method[] ms = cl.getClass() @@ -148,4 +147,4 @@ } }); } -} \ No newline at end of file +}