You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by to...@apache.org on 2008/05/01 05:14:38 UTC
svn commit: r652421 [1/6] - in
/harmony/enhanced/classlib/branches/java6/modules:
beans/src/main/java/java/beans/
beans/src/main/java/org/apache/harmony/beans/editors/
beans/src/test/java/org/apache/harmony/beans/tests/java/beans/
imageio/src/main/java...
Author: tonywu
Date: Wed Apr 30 20:14:31 2008
New Revision: 652421
URL: http://svn.apache.org/viewvc?rev=652421&view=rev
Log:
Merge updates from classlib trunk@651568 since r646189
Added:
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/SchemaParser.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/SchemaParser.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapSchemaContextTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapSchemaContextTest.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/DisconnectResponse.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/DisconnectResponse.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTimeoutExceptionTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTimeoutExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.golden.ser
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/AbstractMethodErrorTest.golden.ser
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/SocketTimeoutExceptionTest.golden.ser
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/net/SocketTimeoutExceptionTest.golden.ser
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/RunCodec.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/RunCodec.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/Archive.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Archive.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/BandSet.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BandSet.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/FileBands.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/FileBands.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/IMatcher.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IMatcher.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/Pack200Exception.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Pack200Exception.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationsAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationsAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstantNumber.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstantNumber.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPDouble.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPDouble.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPField.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPField.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPFieldRef.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPFieldRef.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPFloat.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPFloat.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInteger.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInteger.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPLong.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPLong.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMethod.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMethod.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMethodRef.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMethodRef.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFile.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFile.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CodeAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CodeAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantPoolEntry.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantPoolEntry.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantValueAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantValueAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionsAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionsAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/OperandManager.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/OperandManager.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200Adapter.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200Adapter.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ArchiveTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ArchiveTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CPUTF8Test.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CPUTF8Test.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassVersionTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassVersionTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CodeAttributeTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CodeAttributeTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/HelloWorld.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/HelloWorld.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ICTupleTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ICTupleTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentConstantPoolTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentConstantPoolTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentUtilsTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentUtilsTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/
- copied from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ByteCodeTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ByteCodeTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/HelloWorldJavap.out
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/HelloWorldJavap.out
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/sqlJavap.out
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/sqlJavap.out
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetCachedRowSetTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetCachedRowSetTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetJoinTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetJoinTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetOtherTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetOtherTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetResultSetTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetResultSetTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetWebRowSetTest.java
- copied unchanged from r652071, harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetWebRowSetTest.java
Removed:
harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapSchemaContextImplTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/ois.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/oos.c
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/
Modified:
harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java
harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java
harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java
harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/ImageIO.java
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/nls/messages.properties
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ExtendedOp.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapContextImpl.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapMessage.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapSchemaContextImpl.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/UnsolicitedNotificationImpl.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/asn1/ASN1LdapFilter.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ldapURLContext.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/FilterTest.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextImplTest.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextServerMockedTest.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/BindResponse.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/MockLdapServer.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectInputStream.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectOutputStream.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectStreamClass.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectStreamField.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/NegCacheElement.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/NegativeCache.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ArrayList.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/GregorianCalendar.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/FileURLConnectionTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ReaderTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/EnumTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/IllegalArgumentExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/IllegalStateExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/RuntimeExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/UnsupportedOperationExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketImplTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketPermissionTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URITest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractSequentialListTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CalendarTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessorImpl.c
harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/messages.properties
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetReader.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetWriter.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/FilteredRowSetImpl.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/JoinRowSetImpl.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/WebRowSetImpl.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetGetTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetImplTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetStreamTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetTestCase.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/FilteredRowSetTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JdbcRowSetTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/JoinRowSetTestCase.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/WebRowSetTest.java
harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/XmlReaderTest.java
harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java?rev=652421&r1=652420&r2=652421&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java Wed Apr 30 20:14:31 2008
@@ -47,6 +47,22 @@
private static final String SUFFIX_LISTEN = "Listener"; //$NON-NLS-1$
+ private static final String STR_NORMAL = "normal"; //$NON-NLS-1$
+
+ private static final String STR_INDEXED = "indexed"; //$NON-NLS-1$
+
+ private static final String STR_VALID = "valid"; //$NON-NLS-1$
+
+ private static final String STR_INVALID = "invalid"; //$NON-NLS-1$
+
+ private static final String STR_PROPERTY_TYPE = "PropertyType"; //$NON-NLS-1$
+
+ private static final String STR_IS_CONSTRAINED = "isConstrained"; //$NON-NLS-1$
+
+ private static final String STR_SETTERS = "setters"; //$NON-NLS-1$
+
+ private static final String STR_GETTERS = "getters"; //$NON-NLS-1$
+
private boolean explicitMethods = false;
private boolean explicitProperties = false;
@@ -276,7 +292,8 @@
// Sub is PropertyDescriptor
if (subIndexedType == null) {
// Same property type
- if (subType.getName().equals(superType.getName())) {
+ if (subType != null &&
+ subType.getName().equals(superType.getName())) {
if ((subGet == null) && (superGet != null)) {
subDesc.setReadMethod(superGet);
}
@@ -481,8 +498,6 @@
* Introspects the supplied class and returns a list of the public methods
* of the class
*
- * @param beanClass -
- * the class
* @return An array of MethodDescriptors with the public methods. null if
* there are no public methods
*/
@@ -533,8 +548,8 @@
* Introspects the supplied class and returns a list of the Properties of
* the class
*
- * @param beanClass -
- * the Class
+ * @param stopClass -
+ * the to introspecting at
* @return The list of Properties as an array of PropertyDescriptors
* @throws IntrospectionException
*/
@@ -557,6 +572,9 @@
introspectSet(theMethods[i].getMethod(), propertyTable);
}
+ // fix possible getter & setter collisions
+ fixGetSet(propertyTable);
+
// If there are listener methods, should be bound.
MethodDescriptor[] allMethods = introspectMethods(true);
if (stopClass != null) {
@@ -586,17 +604,17 @@
if (table == null) {
continue;
}
- String normalTag = (String) table.get("normal"); //$NON-NLS-1$
- String indexedTag = (String) table.get("indexed"); //$NON-NLS-1$
+ String normalTag = (String) table.get(STR_NORMAL);
+ String indexedTag = (String) table.get(STR_INDEXED);
if ((normalTag == null) && (indexedTag == null)) {
continue;
}
- Method get = (Method) table.get("normalget"); //$NON-NLS-1$
- Method set = (Method) table.get("normalset"); //$NON-NLS-1$
- Method indexedGet = (Method) table.get("indexedget"); //$NON-NLS-1$
- Method indexedSet = (Method) table.get("indexedset"); //$NON-NLS-1$
+ Method get = (Method) table.get(STR_NORMAL + PREFIX_GET);
+ Method set = (Method) table.get(STR_NORMAL + PREFIX_SET);
+ Method indexedGet = (Method) table.get(STR_INDEXED + PREFIX_GET);
+ Method indexedSet = (Method) table.get(STR_INDEXED + PREFIX_SET);
PropertyDescriptor propertyDesc = null;
if (indexedTag == null) {
@@ -619,7 +637,7 @@
} else {
propertyDesc.setBound(false);
}
- if (table.get("isConstrained") == Boolean.TRUE) { //$NON-NLS-1$
+ if (table.get(STR_IS_CONSTRAINED) == Boolean.TRUE) { //$NON-NLS-1$
propertyDesc.setConstrained(true);
}
propertyList.add(propertyDesc);
@@ -659,13 +677,20 @@
@SuppressWarnings("unchecked")
private static void introspectGet(Method theMethod,
HashMap<String, HashMap> propertyTable) {
- String methodName = theMethod.getName();
- if (methodName == null) {
+
+ String methodName = theMethod.getName();
+ int prefixLength = 0;
+ String propertyName;
+ Class propertyType;
+ Class[] paramTypes;
+ HashMap table;
+ ArrayList<Method> getters;
+
+ if (methodName == null) {
return;
}
- int prefixLength = 0;
- if (methodName.startsWith(PREFIX_GET)) {
+ if (methodName.startsWith(PREFIX_GET)) {
prefixLength = PREFIX_GET.length();
}
@@ -677,153 +702,325 @@
return;
}
- String propertyName = decapitalize(methodName.substring(prefixLength));
- // validate property name
+ propertyName = decapitalize(methodName.substring(prefixLength));
+
+ // validate property name
if (!isValidProperty(propertyName)) {
return;
}
- Class propertyType = theMethod.getReturnType();
+ // validate return type
+ propertyType = theMethod.getReturnType();
- // check return type getMethod
- if (propertyType.getName().equals(Void.TYPE.getName())) {
- return;
- }
+ if (propertyType == null || propertyType == void.class) {
+ return;
+ }
// isXXX return boolean
if (prefixLength == 2) {
- if (!propertyType.getName().equals(Boolean.TYPE.getName())) {
+ if (!(propertyType == boolean.class)) {
return;
}
}
- // indexed get method
- Class[] paramTypes = theMethod.getParameterTypes();
-
- if (paramTypes.length > 1) {
+ // validate parameter types
+ paramTypes = theMethod.getParameterTypes();
+ if (paramTypes.length > 1 ||
+ (paramTypes.length == 1 && paramTypes[0] != int.class)) {
return;
}
- String tag = "normal"; //$NON-NLS-1$
-
- if (paramTypes.length == 1) {
- if (paramTypes[0].getName().equals(Integer.TYPE.getName())) {
- tag = "indexed"; //$NON-NLS-1$
- } else {
- return;
- }
+ //
- }
-
- HashMap table = propertyTable.get(propertyName);
+ table = propertyTable.get(propertyName);
if (table == null) {
table = new HashMap();
propertyTable.put(propertyName, table);
}
- // the "get" propertyType is conflict with "set" propertyType
- Class oldPropertyType = (Class) table.get(tag + "PropertyType"); //$NON-NLS-1$
- if ((oldPropertyType != null)
- && (!oldPropertyType.getName().equals(propertyType.getName()))) {
- table.put(tag, "invalid"); //$NON-NLS-1$
- table.remove(tag + "set"); //$NON-NLS-1$
- } else {
- table.put(tag, "valid"); //$NON-NLS-1$
- }
-
- table.put(tag + "PropertyType", propertyType); //$NON-NLS-1$
+ getters = (ArrayList<Method>) table.get(STR_GETTERS);
+ if (getters == null) {
+ getters = new ArrayList<Method>();
+ table.put(STR_GETTERS, getters);
+ }
- // According to the spec "is" method should be used prior to "get"
- if (prefixLength == 3) {
- if (!table.containsKey(tag + "get")) { //$NON-NLS-1$
- table.put(tag + "get", theMethod); //$NON-NLS-1$
- }
- } else {
- table.put(tag + "get", theMethod); //$NON-NLS-1$
- }
- }
+ // add current method as a valid getter
+ getters.add(theMethod);
+ }
@SuppressWarnings("unchecked")
private static void introspectSet(Method theMethod,
HashMap<String, HashMap> propertyTable) {
- String methodName = theMethod.getName();
- if (methodName == null) {
- return;
- }
- int prefixLength = 0;
- if (methodName.startsWith(PREFIX_SET)) {
- prefixLength = PREFIX_GET.length();
- }
+ String methodName = theMethod.getName();
+ String propertyName;
+ Class returnType;
+ Class[] paramTypes;
- if (prefixLength == 0) {
+ if (methodName == null || !methodName.startsWith(PREFIX_SET)) {
return;
}
- String propertyName = decapitalize(methodName.substring(prefixLength));
+ propertyName = decapitalize(methodName.substring(
+ PREFIX_SET.length()));
// validate property name
if (!isValidProperty(propertyName)) {
return;
}
- Class returnType = theMethod.getReturnType();
+ // validate return type
+ returnType = theMethod.getReturnType();
- if (!returnType.getName().equals(Void.TYPE.getName())) {
+// if (!returnType.getName().equals(Void.TYPE.getName())) {
+ if (!(returnType == void.class)) {
return;
}
- // indexed get method
- Class[] paramTypes = theMethod.getParameterTypes();
+ // validate param types
+ paramTypes = theMethod.getParameterTypes();
- if ((paramTypes.length == 0) || (paramTypes.length > 2)) {
+ if (paramTypes.length == 0 || paramTypes.length > 2 ||
+ (paramTypes.length == 2 && paramTypes[0] != int.class)) {
return;
}
- String tag = "normal"; //$NON-NLS-1$
-
- Class propertyType = paramTypes[0];
-
- if (paramTypes.length == 2) {
- if (paramTypes[0].getName().equals(Integer.TYPE.getName())) {
- tag = "indexed"; //$NON-NLS-1$
- propertyType = paramTypes[1];
- } else {
- return;
- }
- }
+ //
HashMap table = propertyTable.get(propertyName);
if (table == null) {
table = new HashMap();
+ propertyTable.put(propertyName, table);
}
- Class oldPropertyType = (Class) table.get(tag + "PropertyType"); //$NON-NLS-1$
- if ((oldPropertyType != null)
- && (!oldPropertyType.getName().equals(propertyType.getName()))) {
- table.put(tag, "invalid"); //$NON-NLS-1$
- return;
+ ArrayList<Method> setters = (ArrayList<Method>) table.get(STR_SETTERS);
+ if (setters == null) {
+ setters = new ArrayList<Method>();
+ table.put(STR_SETTERS, setters);
}
- table.put(tag, "valid"); //$NON-NLS-1$
- table.put(tag + "set", theMethod); //$NON-NLS-1$
- table.put(tag + "PropertyType", propertyType); //$NON-NLS-1$
-
// handle constrained
Class[] exceptions = theMethod.getExceptionTypes();
for (Class e : exceptions) {
if (e.equals(PropertyVetoException.class)) {
- table.put("isConstrained", Boolean.TRUE); //$NON-NLS-1$
+ table.put(STR_IS_CONSTRAINED, Boolean.TRUE); //$NON-NLS-1$
+ }
+ }
+
+ // add new setter
+ setters.add(theMethod);
+ }
+
+ /**
+ * Checks and fixs all cases when several incompatible checkers /
+ * getters were specified for single property.
+ * @param propertyTable
+ * @throws IntrospectionException
+ */
+ private void fixGetSet(HashMap<String, HashMap> propertyTable)
+ throws IntrospectionException {
+
+ if (propertyTable == null) {
+ return;
+ }
+
+ for (String key : propertyTable.keySet()) {
+ HashMap<String, Object> table = propertyTable.get(key);
+ ArrayList<Method> getters = (ArrayList<Method>) table.get(STR_GETTERS);
+ ArrayList<Method> setters = (ArrayList<Method>) table.get(STR_SETTERS);
+
+ Method normalGetter = null;
+ Method indexedGetter = null;
+ Method normalSetter = null;
+ Method indexedSetter = null;
+
+ Class normalPropType = null;
+ Class indexedPropType = null;
+
+ if (getters == null) {
+ getters = new ArrayList<Method>();
+ }
+
+ if (setters == null) {
+ setters = new ArrayList<Method>();
+ }
+
+ // retrieve getters
+ for (Method getter: getters) {
+ // checks if it's a normal getter
+ if (getter.getParameterTypes() == null ||
+ getter.getParameterTypes().length == 0) {
+ // normal getter found
+ if (normalGetter == null ||
+ getter.getName().startsWith(PREFIX_IS)) {
+ normalGetter = getter;
+ }
+ }
+
+ // checks if it's an indexed getter
+ if (getter.getParameterTypes() != null &&
+ getter.getParameterTypes().length == 1 &&
+ getter.getParameterTypes()[0] == int.class) {
+ // indexed getter found
+ if (indexedGetter == null ||
+ getter.getName().startsWith(PREFIX_IS)) {
+ indexedGetter = getter;
+ }
+ }
+ }
+
+ // retrieve normal setter
+ if (normalGetter != null) {
+ // Now we will try to look for normal setter of the same type.
+ Class propertyType = normalGetter.getReturnType();
+
+ for (Method setter: setters) {
+ if (setter.getParameterTypes().length == 1 &&
+ propertyType.equals(setter.getParameterTypes()[0]))
+ {
+ normalSetter = setter;
+ break;
+ }
+ }
+ } else {
+ // Normal getter wasn't defined. Let's look for the last
+ // defined setter
+
+ for (Method setter: setters) {
+ if (setter.getParameterTypes().length == 1) {
+ normalSetter = setter;
+ }
+ }
}
+
+ // retrieve indexed setter
+ if (indexedGetter != null) {
+ // Now we will try to look for indexed setter of the same type.
+ Class propertyType = indexedGetter.getReturnType();
+
+ for (Method setter: setters) {
+ if (setter.getParameterTypes().length == 2 &&
+ setter.getParameterTypes()[0] == int.class &&
+ propertyType.equals(setter.getParameterTypes()[1]))
+ {
+ indexedSetter = setter;
+ break;
+ }
+ }
+ } else {
+ // Indexed getter wasn't defined. Let's look for the last
+ // defined indexed setter
+
+ for (Method setter: setters) {
+ if (setter.getParameterTypes().length == 2 &&
+ setter.getParameterTypes()[0] == int.class) {
+ indexedSetter = setter;
+ }
+ }
+ }
+
+ // determine property type
+ if (normalGetter != null) {
+ normalPropType = normalGetter.getReturnType();
+ } else if (normalSetter != null) {
+ normalPropType = normalSetter.getParameterTypes()[0];
+ }
+
+ // determine indexed getter/setter type
+ if (indexedGetter != null) {
+ indexedPropType = indexedGetter.getReturnType();
+ } else if (indexedSetter != null) {
+ indexedPropType = indexedSetter.getParameterTypes()[1];
+ }
+
+ // convert array-typed normal getters to indexed getters
+ if (normalGetter != null && normalGetter.getReturnType().isArray())
+ {
+
+ }
+
+ // RULES
+ // These rules were created after performing extensive black-box
+ // testing of RI
+
+ // RULE1
+ // Both normal getter and setter of the same type were defined;
+ // no indexed getter/setter *PAIR* of the other type defined
+ if (normalGetter != null && normalSetter != null &&
+ (indexedGetter == null || indexedSetter == null) &&
+ normalPropType != indexedPropType) {
+// String tag = normalPropType.isArray() ?
+// STR_INDEXED : STR_NORMAL;
+ String tag = STR_NORMAL;
+
+ table.put(tag, STR_VALID);
+ table.put(tag + PREFIX_GET, normalGetter);
+ table.put(tag + PREFIX_SET, normalSetter);
+ table.put(tag + STR_PROPERTY_TYPE, normalPropType);
+ continue;
+ }
+
+ // RULE2
+ // normal getter and/or setter was defined; no indexed
+ // getters & setters defined
+ if ((normalGetter != null || normalSetter != null) &&
+ indexedGetter == null && indexedSetter == null) {
+// String tag = normalPropType.isArray() ?
+// STR_INDEXED : STR_NORMAL;
+ String tag = STR_NORMAL;
+
+ table.put(tag, STR_VALID);
+ table.put(tag + PREFIX_GET, normalGetter);
+ table.put(tag + PREFIX_SET, normalSetter);
+ table.put(tag + STR_PROPERTY_TYPE, normalPropType);
+ continue;
+ }
+
+ // RULE3
+ // mix of normal / indexed getters and setters are defined. Types
+ // are compatible
+ if ((normalGetter != null || normalSetter != null) &&
+ (indexedGetter != null || indexedSetter != null) &&
+ normalPropType.isArray() &&
+ normalPropType.getComponentType() == indexedPropType) {
+ table.put(STR_NORMAL, STR_VALID);
+ table.put(STR_NORMAL + PREFIX_GET, normalGetter);
+ table.put(STR_NORMAL + PREFIX_SET, normalSetter);
+ table.put(STR_NORMAL + STR_PROPERTY_TYPE, normalPropType);
+
+ table.put(STR_INDEXED, STR_VALID);
+ table.put(STR_INDEXED + PREFIX_GET, indexedGetter);
+ table.put(STR_INDEXED + PREFIX_SET, indexedSetter);
+ table.put(STR_INDEXED + STR_PROPERTY_TYPE, indexedPropType);
+
+ continue;
+ }
+
+ // RULE4
+ // no normal normal getter / setter.
+ // Only indexed getter and/or setter is given
+ // no normal setters / getters defined
+ if (normalSetter == null && normalGetter == null &&
+ (indexedGetter != null || indexedSetter != null)) {
+ table.put(STR_INDEXED, STR_VALID);
+ table.put(STR_INDEXED + PREFIX_GET, indexedGetter);
+ table.put(STR_INDEXED + PREFIX_SET, indexedSetter);
+ table.put(STR_INDEXED + STR_PROPERTY_TYPE,
+ indexedPropType);
+ continue;
+ }
+
+ // default rule - invalid property
+ table.put(STR_NORMAL, STR_INVALID);
+ table.put(STR_INDEXED, STR_INVALID);
}
- propertyTable.put(propertyName, table);
+
}
/**
* Introspects the supplied Bean class and returns a list of the Events of
* the class
*
- * @param beanClass
* @return the events
* @throws IntrospectionException
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java?rev=652421&r1=652420&r2=652421&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java Wed Apr 30 20:14:31 2008
@@ -42,7 +42,9 @@
*/
public class XMLEncoder extends Encoder {
- /*
+ private static int DEADLOCK_THRESHOLD = 7;
+
+ /*
* Every object written by the encoder has a record.
*/
private static class Record {
@@ -813,7 +815,41 @@
rec.stats.add(stat);
}
- /**
+ /**
+ * Imperfect attempt to detect a dead loop. This works with specific
+ * patterns that can be found in our AWT implementaiton.
+ * See HARMONY-5707 for details.
+ *
+ * @param value the object to check dupes for
+ * @return true if a dead loop detected; false otherwise
+ * FIXME
+ */
+ private boolean checkDeadLoop(Object value) {
+ int n = 0;
+ Object obj = value;
+
+ while (obj != null) {
+ Record rec = (Record) records.get(obj);
+
+ if (rec != null && rec.exp != null) {
+ obj = rec.exp.getTarget();
+ } else {
+ break;
+ }
+
+ if (obj != null && value.equals(obj)) {
+ n++;
+
+ if (n >= DEADLOCK_THRESHOLD) {
+ //System.out.println("Dead loop hit!");
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
* Sets the owner of this encoder.
*
* @param owner
@@ -833,7 +869,8 @@
writingObject = true;
// get expression value
Object oldValue = null;
- try {
+
+ try {
oldValue = oldExp.getValue();
} catch (Exception e) {
getExceptionListener()
@@ -853,7 +890,12 @@
recordExpression(oldValue, oldExp);
}
- super.writeExpression(oldExp);
+ // try to detect if we run into a dead loop
+ if (checkDeadLoop(oldValue)) {
+ return;
+ }
+
+ super.writeExpression(oldExp);
writingObject = oldWritingObject;
}
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java?rev=652421&r1=652420&r2=652421&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java Wed Apr 30 20:14:31 2008
@@ -42,6 +42,15 @@
}
@Override
+ public String getAsText() {
+ Object value = getValue();
+ if (value == null) {
+ return null;
+ }
+ return Boolean.TRUE.equals(value) ? "True" : "False"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ @Override
public String getJavaInitializationString() {
return getValueAsString();
}
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java?rev=652421&r1=652420&r2=652421&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java Wed Apr 30 20:14:31 2008
@@ -2331,4 +2331,254 @@
assertFalse(pd.getName().equals("invisible"));
}
}
+
+ /**
+ * Tests tricky cases when several conflicting set/get methods are defined.
+ * All these tests pass on RI.
+ * This is a regression test for HARMONY-5675
+ * @throws IntrospectionException
+ */
+ public void test5675() throws IntrospectionException {
+ BeanInfo bInfo;
+
+ for (Class clz: new Class[] {TstBean5675.class, TstBean5675_2.class}) {
+
+ bInfo = Introspector.getBeanInfo(clz);
+
+ for (PropertyDescriptor desc: bInfo.getPropertyDescriptors()) {
+
+ if (desc.getName().equals("prop1")) {
+ assertNotNull("invalid get method", desc.getReadMethod());
+ assertEquals("get method has invalid return type",
+ Integer.class, desc.getReadMethod().getReturnType());
+ assertNotNull("invalid set method", desc.getWriteMethod());
+ assertEquals("invalid set method",
+ "setProp1", desc.getWriteMethod().getName());
+ assertNotNull("set method don't have any parameters",
+ desc.getWriteMethod().getParameterTypes());
+ assertEquals("set method has invalid parameters",
+ Integer.class,
+ desc.getWriteMethod().getParameterTypes()[0]);
+ }
+ }
+ }
+
+ for (Class clz : new Class[] {TstBean5675_3.class, TstBean5675_5.class,
+ TstBean5675_6.class}) {
+
+ bInfo = Introspector.getBeanInfo(clz);
+
+ for (PropertyDescriptor desc: bInfo.getPropertyDescriptors()) {
+
+ if (desc.getName().equals("prop1")) {
+ assertNull("Non-null get method", desc.getReadMethod());
+ assertNull("Non-null set method", desc.getWriteMethod());
+ }
+ }
+ }
+
+ bInfo = Introspector.getBeanInfo(TstBean5675_4.class);
+ for (PropertyDescriptor desc: bInfo.getPropertyDescriptors()) {
+
+ if (desc.getName().equals("prop1")) {
+ assertNotNull("invalid get method", desc.getReadMethod());
+ assertEquals("get method has invalid return type",
+ Integer.class, desc.getReadMethod().getReturnType());
+ assertNull("Non-null set method", desc.getWriteMethod());
+ }
+ }
+
+ bInfo = Introspector.getBeanInfo(TstBean5675_7.class);
+ for (PropertyDescriptor desc: bInfo.getPropertyDescriptors()) {
+
+ if (desc.getName().equals("prop1")) {
+ assertNull("Non-null get method", desc.getReadMethod());
+ assertEquals("invalid set method",
+ "setProp1", desc.getWriteMethod().getName());
+ assertNotNull("set method don't have any parameters",
+ desc.getWriteMethod().getParameterTypes());
+ assertEquals("set method has invalid parameters",
+ Integer.class,
+ desc.getWriteMethod().getParameterTypes()[0]);
+ }
+ }
+
+ bInfo = Introspector.getBeanInfo(TstBean5675_8.class);
+ for (PropertyDescriptor desc: bInfo.getPropertyDescriptors()) {
+
+ if (desc.getName().equals("prop1")) {
+ assertNotNull("invalid get method", desc.getReadMethod());
+ assertEquals("get method has invalid return type",
+ Integer[].class, desc.getReadMethod().getReturnType());
+ assertNull("Non-null set method", desc.getWriteMethod());
+ }
+ }
+
+ bInfo = Introspector.getBeanInfo(TstBean5675_9.class);
+ for (PropertyDescriptor desc: bInfo.getPropertyDescriptors()) {
+
+ if (desc.getName().equals("prop1")) {
+ assertNull("Non-null get method", desc.getReadMethod());
+ assertNotNull("invalid set method", desc.getWriteMethod());
+ assertEquals("invalid set method",
+ "setProp1", desc.getWriteMethod().getName());
+ assertNotNull("set method don't have any parameters",
+ desc.getWriteMethod().getParameterTypes());
+ assertEquals("set method has invalid parameters",
+ Integer[].class,
+ desc.getWriteMethod().getParameterTypes()[0]);
+ }
+ }
+
+ bInfo = Introspector.getBeanInfo(TstBean5675_10.class);
+ for (PropertyDescriptor desc: bInfo.getPropertyDescriptors()) {
+
+ if (desc.getName().equals("prop1")) {
+ assertNotNull("invalid get method", desc.getReadMethod());
+ assertEquals("get method has invalid return type",
+ Integer[].class, desc.getReadMethod().getReturnType());
+ assertNotNull("invalid set method", desc.getWriteMethod());
+ assertEquals("invalid set method",
+ "setProp1", desc.getWriteMethod().getName());
+ assertNotNull("set method don't have any parameters",
+ desc.getWriteMethod().getParameterTypes());
+ assertEquals("set method has invalid parameters",
+ Integer[].class,
+ desc.getWriteMethod().getParameterTypes()[0]);
+ }
+ }
+
+ }
+
+ class TstBean5675 {
+
+ public void setProp1(String uri) {}
+
+ public void setProp1(Integer i) {}
+
+
+ public Integer getProp1() {
+ return null;
+ }
+
+ }
+
+
+ class TstBean5675_2 {
+
+ public Integer getProp1() {
+ return null;
+ }
+
+ public String getProp1(int n) {
+ return null;
+ }
+
+ public void setProp1(Integer val) {}
+
+
+ }
+
+ class TstBean5675_3 {
+
+ public String getProp1(int n) {
+ return null;
+ }
+
+ public void setProp1(int n, String uri) {}
+
+ public void setProp1(Integer i) {}
+
+ public Integer getProp1() {
+ return null;
+ }
+
+ }
+
+ class TstBean5675_4 {
+
+ public void setProp1(String val) {}
+
+ public Integer getProp1() {
+ return null;
+ }
+
+ }
+
+ class TstBean5675_5 {
+
+ public Integer getProp1() {
+ return null;
+ }
+
+// public void setProp1(Integer val) {}
+
+ public String getProp1(int n) {
+ return null;
+ }
+
+ public void setProp1(int n, String uri) {}
+
+
+ }
+
+ class TstBean5675_6 {
+
+ public Integer getProp1() {
+ return null;
+ }
+
+// public void setProp1(Integer val) {}
+//
+// public String getProp1(int n) {
+// return null;
+// }
+
+ public void setProp1(int n, String uri) {}
+
+
+ }
+
+ class TstBean5675_7 {
+ public void setProp1(String val) {}
+ public void setProp1(Integer val) {}
+ }
+
+ class TstBean5675_8 {
+ public Integer[] getProp1() {
+ return null;
+ }
+
+ //public void setProp1(Integer[] val) {}
+
+ public Integer getProp1(int n) {
+ return null;
+ }
+
+ public void setProp1(int n, Integer val) {}
+ }
+
+ class TstBean5675_9 {
+ public void setProp1(Integer[] val) {}
+
+ public Integer getProp1(int n) {
+ return null;
+ }
+
+ }
+
+ class TstBean5675_10 {
+ public Integer[] getProp1() {
+ return null;
+ }
+
+ public void setProp1(Integer[] val) {}
+
+ public Integer getProp1(int n) {
+ return null;
+ }
+
+ public void setProp1(int n, Integer val) {}
+ }
+
}