This is an automated email from the git hooks/post-receive script. komal-guest pushed a commit to branch master in repository proguard.
commit ffa97890f09fc2e122c8e2740e2ff9e8dba0e1cc Merge: 2c0720c a585bd2 Author: Komal Sukhani <[email protected]> Date: Mon Jul 27 22:24:11 2015 +0530 Merge tag 'upstream/5.2.1' Upstream version 5.2.1 README | 16 +- {build => buildscripts}/README | 4 +- {build => buildscripts}/build.properties | 0 {build => buildscripts}/build.sh | 9 +- {build => buildscripts}/build.xml | 11 +- {build => buildscripts}/makefile | 20 +- {build => buildscripts}/maven/ant/pom.xml | 2 +- {build => buildscripts}/maven/base/pom.xml | 2 +- {build => buildscripts}/maven/gradle/pom.xml | 14 +- {build => buildscripts}/maven/gui/pom.xml | 2 +- {build => buildscripts}/maven/pom.xml | 6 +- {build => buildscripts}/maven/retrace/pom.xml | 2 +- {build => buildscripts}/maven/wtk/pom.xml | 2 +- src/proguard/ArgumentWordReader.java | 2 +- src/proguard/AssumeNoSideEffectsChecker.java | 2 +- src/proguard/ClassMemberChecker.java | 2 +- src/proguard/ClassPath.java | 2 +- src/proguard/ClassPathEntry.java | 2 +- src/proguard/ClassSpecification.java | 2 +- src/proguard/ClassSpecificationVisitorFactory.java | 2 +- src/proguard/Configuration.java | 2 +- src/proguard/ConfigurationChecker.java | 2 +- src/proguard/ConfigurationConstants.java | 2 +- src/proguard/ConfigurationParser.java | 2 +- src/proguard/ConfigurationWriter.java | 2 +- src/proguard/DataEntryReaderFactory.java | 2 +- src/proguard/DataEntryWriterFactory.java | 2 +- src/proguard/DescriptorKeepChecker.java | 2 +- src/proguard/DuplicateClassPrinter.java | 2 +- src/proguard/FileWordReader.java | 2 +- src/proguard/FullyQualifiedClassNameChecker.java | 2 +- src/proguard/GPL.java | 2 +- src/proguard/GetAnnotationChecker.java | 2 +- src/proguard/GetEnclosingClassChecker.java | 2 +- src/proguard/GetEnclosingMethodChecker.java | 2 +- src/proguard/GetSignatureChecker.java | 2 +- src/proguard/Initializer.java | 2 +- src/proguard/InputReader.java | 2 +- src/proguard/KeepClassMemberChecker.java | 2 +- src/proguard/KeepClassSpecification.java | 2 +- src/proguard/LibraryKeepChecker.java | 2 +- src/proguard/LineWordReader.java | 2 +- src/proguard/MemberSpecification.java | 2 +- src/proguard/OutputWriter.java | 2 +- src/proguard/ParseException.java | 2 +- src/proguard/ProGuard.java | 35 +- src/proguard/SeedPrinter.java | 2 +- src/proguard/SubclassedClassFilter.java | 2 +- src/proguard/Targeter.java | 2 +- src/proguard/UpToDateChecker.java | 2 +- src/proguard/WordReader.java | 2 +- src/proguard/ant/ClassPathElement.java | 2 +- src/proguard/ant/ClassSpecificationElement.java | 2 +- src/proguard/ant/ConfigurationElement.java | 2 +- src/proguard/ant/ConfigurationTask.java | 2 +- src/proguard/ant/FilterElement.java | 2 +- src/proguard/ant/KeepSpecificationElement.java | 2 +- src/proguard/ant/MemberSpecificationElement.java | 2 +- src/proguard/ant/ProGuardTask.java | 2 +- src/proguard/classfile/ClassConstants.java | 60 +- src/proguard/classfile/ClassPool.java | 2 +- src/proguard/classfile/Clazz.java | 7 +- src/proguard/classfile/Field.java | 2 +- src/proguard/classfile/JavaConstants.java | 2 +- src/proguard/classfile/LibraryClass.java | 7 +- src/proguard/classfile/LibraryField.java | 2 +- src/proguard/classfile/LibraryMember.java | 2 +- src/proguard/classfile/LibraryMethod.java | 12 +- src/proguard/classfile/Member.java | 2 +- src/proguard/classfile/Method.java | 2 +- src/proguard/classfile/ProgramClass.java | 16 +- src/proguard/classfile/ProgramField.java | 2 +- src/proguard/classfile/ProgramMember.java | 2 +- src/proguard/classfile/ProgramMethod.java | 12 +- src/proguard/classfile/VisitorAccepter.java | 2 +- src/proguard/classfile/attribute/Attribute.java | 2 +- .../classfile/attribute/BootstrapMethodInfo.java | 2 +- .../attribute/BootstrapMethodsAttribute.java | 2 +- .../classfile/attribute/CodeAttribute.java | 2 +- .../attribute/ConstantValueAttribute.java | 2 +- .../classfile/attribute/DeprecatedAttribute.java | 2 +- .../attribute/EnclosingMethodAttribute.java | 2 +- .../classfile/attribute/ExceptionInfo.java | 2 +- .../classfile/attribute/ExceptionsAttribute.java | 2 +- ...eAttribute.java => ExtendedLineNumberInfo.java} | 35 +- .../classfile/attribute/InnerClassesAttribute.java | 2 +- .../classfile/attribute/InnerClassesInfo.java | 2 +- .../classfile/attribute/LineNumberInfo.java | 13 +- .../attribute/LineNumberTableAttribute.java | 74 ++- .../classfile/attribute/LocalVariableInfo.java | 2 +- .../attribute/LocalVariableTableAttribute.java | 2 +- .../classfile/attribute/LocalVariableTypeInfo.java | 2 +- .../attribute/LocalVariableTypeTableAttribute.java | 2 +- .../attribute/MethodParametersAttribute.java | 2 +- .../classfile/attribute/ParameterInfo.java | 4 +- .../classfile/attribute/SignatureAttribute.java | 12 +- .../classfile/attribute/SourceDirAttribute.java | 2 +- .../classfile/attribute/SourceFileAttribute.java | 2 +- .../classfile/attribute/SyntheticAttribute.java | 2 +- .../classfile/attribute/UnknownAttribute.java | 2 +- .../classfile/attribute/annotation/Annotation.java | 2 +- .../annotation/AnnotationDefaultAttribute.java | 2 +- .../annotation/AnnotationElementValue.java | 2 +- .../attribute/annotation/AnnotationsAttribute.java | 2 +- .../attribute/annotation/ArrayElementValue.java | 2 +- .../attribute/annotation/ClassElementValue.java | 2 +- .../attribute/annotation/ConstantElementValue.java | 2 +- .../attribute/annotation/ElementValue.java | 2 +- .../annotation/EnumConstantElementValue.java | 2 +- .../annotation/ParameterAnnotationsAttribute.java | 2 +- .../RuntimeInvisibleAnnotationsAttribute.java | 2 +- ...timeInvisibleParameterAnnotationsAttribute.java | 2 +- .../RuntimeInvisibleTypeAnnotationsAttribute.java | 2 +- .../RuntimeVisibleAnnotationsAttribute.java | 2 +- ...untimeVisibleParameterAnnotationsAttribute.java | 2 +- .../RuntimeVisibleTypeAnnotationsAttribute.java | 2 +- .../attribute/annotation/TypeAnnotation.java | 2 +- .../annotation/TypeAnnotationsAttribute.java | 2 +- .../attribute/annotation/TypePathInfo.java | 2 +- .../annotation/target/CatchTargetInfo.java | 2 +- .../annotation/target/EmptyTargetInfo.java | 2 +- .../target/FormalParameterTargetInfo.java | 2 +- .../target/LocalVariableTargetElement.java | 2 +- .../annotation/target/LocalVariableTargetInfo.java | 2 +- .../annotation/target/OffsetTargetInfo.java | 2 +- .../annotation/target/SuperTypeTargetInfo.java | 2 +- .../attribute/annotation/target/TargetInfo.java | 2 +- .../annotation/target/ThrowsTargetInfo.java | 2 +- .../annotation/target/TypeArgumentTargetInfo.java | 2 +- .../target/TypeParameterBoundTargetInfo.java | 2 +- .../annotation/target/TypeParameterTargetInfo.java | 2 +- .../visitor/LocalVariableTargetElementVisitor.java | 2 +- .../target/visitor/TargetInfoVisitor.java | 2 +- .../annotation/visitor/AllAnnotationVisitor.java | 2 +- .../annotation/visitor/AllElementValueVisitor.java | 2 +- .../annotation/visitor/AnnotatedClassVisitor.java | 2 +- .../visitor/AnnotationToMemberVisitor.java | 2 +- .../annotation/visitor/AnnotationTypeFilter.java | 2 +- .../annotation/visitor/AnnotationVisitor.java | 2 +- .../annotation/visitor/ElementValueVisitor.java | 2 +- .../annotation/visitor/TypeAnnotationVisitor.java | 2 +- .../annotation/visitor/TypePathInfoVisitor.java | 2 +- .../attribute/preverification/DoubleType.java | 2 +- .../attribute/preverification/FloatType.java | 2 +- .../attribute/preverification/FullFrame.java | 2 +- .../attribute/preverification/IntegerType.java | 2 +- .../attribute/preverification/LessZeroFrame.java | 2 +- .../attribute/preverification/LongType.java | 2 +- .../attribute/preverification/MoreZeroFrame.java | 2 +- .../attribute/preverification/NullType.java | 2 +- .../attribute/preverification/ObjectType.java | 2 +- .../attribute/preverification/SameOneFrame.java | 2 +- .../attribute/preverification/SameZeroFrame.java | 2 +- .../preverification/StackMapAttribute.java | 2 +- .../attribute/preverification/StackMapFrame.java | 2 +- .../preverification/StackMapTableAttribute.java | 2 +- .../attribute/preverification/TopType.java | 2 +- .../preverification/UninitializedThisType.java | 2 +- .../preverification/UninitializedType.java | 2 +- .../preverification/VerificationType.java | 2 +- .../preverification/VerificationTypeFactory.java | 2 +- .../visitor/StackMapFrameVisitor.java | 2 +- .../visitor/VerificationTypeVisitor.java | 2 +- .../attribute/visitor/AllAttributeVisitor.java | 2 +- .../visitor/AllBootstrapMethodInfoVisitor.java | 2 +- .../attribute/visitor/AllExceptionInfoVisitor.java | 2 +- .../visitor/AllInnerClassesInfoVisitor.java | 2 +- ...oVisitor.java => AllLineNumberInfoVisitor.java} | 18 +- .../attribute/visitor/AttributeNameFilter.java | 2 +- .../attribute/visitor/AttributeVisitor.java | 2 +- .../visitor/BootstrapMethodInfoVisitor.java | 2 +- .../attribute/visitor/ExceptionInfoVisitor.java | 2 +- .../attribute/visitor/InnerClassesInfoVisitor.java | 2 +- .../attribute/visitor/LineNumberInfoVisitor.java | 2 +- .../attribute/visitor/LineNumberRangeFinder.java | 89 +++ .../visitor/LocalVariableInfoVisitor.java | 2 +- .../visitor/LocalVariableTypeInfoVisitor.java | 2 +- .../attribute/visitor/MultiAttributeVisitor.java | 2 +- .../attribute/visitor/NonEmptyAttributeFilter.java | 2 +- .../attribute/visitor/ParameterInfoVisitor.java | 2 +- .../attribute/visitor/RequiredAttributeFilter.java | 2 +- .../attribute/visitor/StackSizeComputer.java | 2 +- src/proguard/classfile/constant/ClassConstant.java | 2 +- src/proguard/classfile/constant/Constant.java | 2 +- .../classfile/constant/DoubleConstant.java | 2 +- .../classfile/constant/FieldrefConstant.java | 2 +- src/proguard/classfile/constant/FloatConstant.java | 2 +- .../classfile/constant/IntegerConstant.java | 2 +- .../constant/InterfaceMethodrefConstant.java | 2 +- .../classfile/constant/InvokeDynamicConstant.java | 2 +- src/proguard/classfile/constant/LongConstant.java | 2 +- .../classfile/constant/MethodHandleConstant.java | 12 +- .../classfile/constant/MethodTypeConstant.java | 2 +- .../classfile/constant/MethodrefConstant.java | 2 +- .../classfile/constant/NameAndTypeConstant.java | 2 +- src/proguard/classfile/constant/RefConstant.java | 2 +- .../classfile/constant/StringConstant.java | 2 +- src/proguard/classfile/constant/Utf8Constant.java | 2 +- .../constant/visitor/AllConstantVisitor.java | 2 +- .../visitor/BootstrapMethodArgumentVisitor.java} | 36 +- .../visitor/BootstrapMethodHandleTraveler.java | 2 +- .../constant/visitor/ConstantTagFilter.java | 2 +- .../constant/visitor/ConstantVisitor.java | 2 +- .../visitor/ExceptClassConstantFilter.java | 2 +- .../constant/visitor/MethodrefTraveler.java | 2 +- src/proguard/classfile/editor/AccessFixer.java | 2 +- src/proguard/classfile/editor/AnnotationAdder.java | 2 +- .../editor/AnnotationsAttributeEditor.java | 2 +- src/proguard/classfile/editor/AttributeAdder.java | 25 +- src/proguard/classfile/editor/AttributeSorter.java | 2 +- .../classfile/editor/AttributesEditor.java | 2 +- .../classfile/editor/BootstrapMethodInfoAdder.java | 2 +- .../classfile/editor/BootstrapMethodRemapper.java | 10 +- .../editor/BootstrapMethodsAttributeAdder.java | 2 +- .../editor/BootstrapMethodsAttributeEditor.java | 2 +- .../classfile/editor/BridgeMethodFixer.java | 2 +- src/proguard/classfile/editor/ClassEditor.java | 2 +- .../classfile/editor/ClassElementSorter.java | 2 +- .../classfile/editor/ClassMemberSorter.java | 2 +- .../classfile/editor/ClassReferenceFixer.java | 9 +- .../classfile/editor/CodeAttributeComposer.java | 148 ++++- .../classfile/editor/CodeAttributeEditor.java | 10 +- .../editor/CodeAttributeEditorResetter.java | 2 +- .../classfile/editor/ComparableConstant.java | 6 +- src/proguard/classfile/editor/ConstantAdder.java | 2 +- .../classfile/editor/ConstantPoolEditor.java | 2 +- .../classfile/editor/ConstantPoolRemapper.java | 16 +- .../classfile/editor/ConstantPoolShrinker.java | 16 +- .../classfile/editor/ConstantPoolSorter.java | 2 +- .../classfile/editor/ElementValueAdder.java | 2 +- .../classfile/editor/ElementValuesEditor.java | 2 +- src/proguard/classfile/editor/ExceptionAdder.java | 2 +- .../classfile/editor/ExceptionInfoAdder.java | 2 +- .../editor/ExceptionsAttributeEditor.java | 2 +- .../classfile/editor/InnerClassesAccessFixer.java | 2 +- .../classfile/editor/InstructionAdder.java | 2 +- .../classfile/editor/InstructionWriter.java | 2 +- src/proguard/classfile/editor/InterfaceAdder.java | 2 +- .../classfile/editor/InterfaceDeleter.java | 209 +++++++ src/proguard/classfile/editor/InterfaceSorter.java | 195 ++++-- .../classfile/editor/InterfacesEditor.java | 2 +- .../classfile/editor/LineNumberInfoAdder.java | 46 +- .../editor/LineNumberTableAttributeEditor.java | 2 +- .../editor/LineNumberTableAttributeTrimmer.java | 78 +++ .../classfile/editor/LocalVariableInfoAdder.java | 2 +- .../editor/LocalVariableTableAttributeEditor.java | 2 +- .../editor/LocalVariableTypeInfoAdder.java | 2 +- .../LocalVariableTypeTableAttributeEditor.java | 2 +- src/proguard/classfile/editor/MemberAdder.java | 2 +- .../classfile/editor/MemberReferenceFixer.java | 2 +- .../classfile/editor/MethodInvocationFixer.java | 2 +- .../classfile/editor/NameAndTypeShrinker.java | 16 +- .../classfile/editor/NamedAttributeDeleter.java | 2 +- .../ParameterAnnotationsAttributeEditor.java | 2 +- .../classfile/editor/ParameterInfoAdder.java | 2 +- .../classfile/editor/StackSizeUpdater.java | 2 +- src/proguard/classfile/editor/SubclassAdder.java | 2 +- src/proguard/classfile/editor/SubclassToAdder.java | 2 +- src/proguard/classfile/editor/Utf8Shrinker.java | 16 +- src/proguard/classfile/editor/VariableCleaner.java | 2 +- src/proguard/classfile/editor/VariableEditor.java | 2 +- .../classfile/editor/VariableRemapper.java | 2 +- .../classfile/editor/VariableSizeUpdater.java | 2 +- .../classfile/instruction/BranchInstruction.java | 7 +- .../classfile/instruction/ConstantInstruction.java | 2 +- .../classfile/instruction/Instruction.java | 2 +- .../instruction/InstructionConstants.java | 2 +- .../classfile/instruction/InstructionFactory.java | 2 +- .../classfile/instruction/InstructionUtil.java | 2 +- .../instruction/LookUpSwitchInstruction.java | 2 +- .../classfile/instruction/SimpleInstruction.java | 2 +- .../classfile/instruction/SwitchInstruction.java | 2 +- .../instruction/TableSwitchInstruction.java | 2 +- .../classfile/instruction/VariableInstruction.java | 2 +- .../instruction/visitor/AllInstructionVisitor.java | 2 +- .../visitor/InstructionConstantVisitor.java | 2 +- .../instruction/visitor/InstructionCounter.java | 2 +- .../instruction/visitor/InstructionVisitor.java | 2 +- .../visitor/MultiInstructionVisitor.java | 2 +- src/proguard/classfile/io/LibraryClassReader.java | 2 +- src/proguard/classfile/io/ProgramClassReader.java | 2 +- src/proguard/classfile/io/ProgramClassWriter.java | 2 +- src/proguard/classfile/io/RuntimeDataInput.java | 2 +- src/proguard/classfile/io/RuntimeDataOutput.java | 2 +- src/proguard/classfile/package.html | 10 +- src/proguard/classfile/util/AccessUtil.java | 6 +- .../classfile/util/AllParameterVisitor.java | 2 +- .../classfile/util/ClassReferenceInitializer.java | 2 +- .../util/ClassSubHierarchyInitializer.java | 2 +- .../util/ClassSuperHierarchyInitializer.java | 2 +- src/proguard/classfile/util/ClassUtil.java | 2 +- .../classfile/util/DescriptorClassEnumeration.java | 2 +- .../util/DynamicClassReferenceInitializer.java | 2 +- .../util/DynamicMemberReferenceInitializer.java | 2 +- .../util/EnumFieldReferenceInitializer.java | 2 +- .../classfile/util/ExternalTypeEnumeration.java | 2 +- .../classfile/util/InstructionSequenceMatcher.java | 2 +- .../classfile/util/InternalTypeEnumeration.java | 83 ++- src/proguard/classfile/util/MemberFinder.java | 2 +- src/proguard/classfile/util/MethodLinker.java | 2 +- src/proguard/classfile/util/SimplifiedVisitor.java | 2 +- .../classfile/util/StringReferenceInitializer.java | 2 +- src/proguard/classfile/util/StringSharer.java | 2 +- src/proguard/classfile/util/WarningPrinter.java | 2 +- .../classfile/visitor/AllClassVisitor.java | 2 +- .../classfile/visitor/AllFieldVisitor.java | 2 +- .../classfile/visitor/AllMemberVisitor.java | 2 +- .../classfile/visitor/AllMethodVisitor.java | 2 +- .../classfile/visitor/BottomClassFilter.java | 2 +- .../classfile/visitor/ClassAccessFilter.java | 2 +- src/proguard/classfile/visitor/ClassCleaner.java | 53 +- src/proguard/classfile/visitor/ClassCollector.java | 2 +- src/proguard/classfile/visitor/ClassCounter.java | 2 +- .../classfile/visitor/ClassHierarchyTraveler.java | 2 +- .../classfile/visitor/ClassNameFilter.java | 2 +- .../classfile/visitor/ClassPoolFiller.java | 2 +- .../classfile/visitor/ClassPoolVisitor.java | 2 +- .../classfile/visitor/ClassPresenceFilter.java | 2 +- src/proguard/classfile/visitor/ClassPrinter.java | 5 +- .../classfile/visitor/ClassVersionFilter.java | 2 +- .../classfile/visitor/ClassVersionSetter.java | 2 +- src/proguard/classfile/visitor/ClassVisitor.java | 2 +- .../visitor/ConcreteClassDownTraveler.java | 2 +- .../classfile/visitor/DotClassClassVisitor.java | 2 +- .../visitor/DynamicReturnedClassVisitor.java | 2 +- .../classfile/visitor/ExceptClassFilter.java | 2 +- .../classfile/visitor/ExceptClassesFilter.java | 2 +- .../classfile/visitor/ExceptionCounter.java | 2 +- .../visitor/ExceptionExcludedOffsetFilter.java | 2 +- .../visitor/ExceptionHandlerConstantVisitor.java | 2 +- .../classfile/visitor/ExceptionHandlerFilter.java | 2 +- .../classfile/visitor/ExceptionOffsetFilter.java | 2 +- .../classfile/visitor/ExceptionRangeFilter.java | 2 +- .../visitor/ImplementedClassConstantFilter.java | 2 +- .../classfile/visitor/ImplementedClassFilter.java | 2 +- .../visitor/ImplementingClassConstantFilter.java | 2 +- .../visitor/InitializerMethodFilter.java} | 29 +- .../classfile/visitor/LibraryClassFilter.java | 2 +- .../classfile/visitor/LibraryMemberFilter.java | 2 +- .../classfile/visitor/MemberAccessFilter.java | 2 +- .../classfile/visitor/MemberClassAccessFilter.java | 2 +- .../classfile/visitor/MemberCollector.java | 2 +- src/proguard/classfile/visitor/MemberCounter.java | 2 +- .../classfile/visitor/MemberDescriptorFilter.java | 2 +- .../MemberDescriptorReferencedClassVisitor.java | 2 +- .../classfile/visitor/MemberNameFilter.java | 2 +- .../classfile/visitor/MemberToClassVisitor.java | 2 +- src/proguard/classfile/visitor/MemberVisitor.java | 2 +- .../visitor/MethodImplementationFilter.java | 2 +- .../visitor/MethodImplementationTraveler.java | 2 +- .../classfile/visitor/MultiClassPoolVisitor.java | 2 +- .../classfile/visitor/MultiClassVisitor.java | 2 +- .../classfile/visitor/MultiMemberVisitor.java | 2 +- .../classfile/visitor/NamedClassVisitor.java | 2 +- .../classfile/visitor/NamedFieldVisitor.java | 2 +- .../classfile/visitor/NamedMethodVisitor.java | 2 +- .../classfile/visitor/ParameterVisitor.java | 2 +- .../classfile/visitor/ProgramClassFilter.java | 2 +- .../classfile/visitor/ProgramMemberFilter.java | 2 +- .../classfile/visitor/ReferencedClassVisitor.java | 2 +- .../classfile/visitor/ReferencedMemberVisitor.java | 2 +- .../classfile/visitor/SimilarMemberVisitor.java | 2 +- .../classfile/visitor/SimpleClassPrinter.java | 2 +- src/proguard/classfile/visitor/SubclassFilter.java | 2 +- .../classfile/visitor/SubclassTraveler.java | 2 +- .../classfile/visitor/VariableClassVisitor.java | 2 +- .../classfile/visitor/VariableMemberVisitor.java | 2 +- src/proguard/evaluation/BasicBranchUnit.java | 2 +- src/proguard/evaluation/BasicInvocationUnit.java | 30 +- src/proguard/evaluation/BranchUnit.java | 2 +- .../evaluation/ClassConstantValueFactory.java | 2 +- src/proguard/evaluation/ConstantValueFactory.java | 2 +- src/proguard/evaluation/InvocationUnit.java | 2 +- src/proguard/evaluation/Processor.java | 2 +- src/proguard/evaluation/Stack.java | 6 +- src/proguard/evaluation/TracedStack.java | 2 +- src/proguard/evaluation/TracedVariables.java | 2 +- src/proguard/evaluation/Variables.java | 8 +- .../evaluation/value/ArrayReferenceValue.java | 2 +- src/proguard/evaluation/value/Category1Value.java | 2 +- src/proguard/evaluation/value/Category2Value.java | 2 +- src/proguard/evaluation/value/ComparisonValue.java | 2 +- .../evaluation/value/CompositeDoubleValue.java | 2 +- .../evaluation/value/CompositeFloatValue.java | 2 +- .../evaluation/value/CompositeIntegerValue.java | 2 +- .../evaluation/value/CompositeLongValue.java | 2 +- .../evaluation/value/ConvertedByteValue.java | 2 +- .../evaluation/value/ConvertedCharacterValue.java | 2 +- .../evaluation/value/ConvertedDoubleValue.java | 2 +- .../evaluation/value/ConvertedFloatValue.java | 2 +- .../evaluation/value/ConvertedIntegerValue.java | 2 +- .../evaluation/value/ConvertedLongValue.java | 2 +- .../evaluation/value/ConvertedShortValue.java | 2 +- .../value/DetailedArrayReferenceValue.java | 2 +- .../evaluation/value/DetailedValueFactory.java | 2 +- src/proguard/evaluation/value/DoubleValue.java | 2 +- src/proguard/evaluation/value/FloatValue.java | 2 +- .../value/IdentifiedArrayReferenceValue.java | 2 +- .../evaluation/value/IdentifiedDoubleValue.java | 2 +- .../evaluation/value/IdentifiedFloatValue.java | 2 +- .../evaluation/value/IdentifiedIntegerValue.java | 2 +- .../evaluation/value/IdentifiedLongValue.java | 2 +- .../evaluation/value/IdentifiedReferenceValue.java | 2 +- .../evaluation/value/IdentifiedValueFactory.java | 2 +- .../evaluation/value/InitialValueFactory.java | 2 +- .../evaluation/value/InstructionOffsetValue.java | 2 +- src/proguard/evaluation/value/IntegerValue.java | 2 +- src/proguard/evaluation/value/LongValue.java | 2 +- .../evaluation/value/NegatedDoubleValue.java | 2 +- .../evaluation/value/NegatedFloatValue.java | 2 +- .../evaluation/value/NegatedIntegerValue.java | 2 +- .../evaluation/value/NegatedLongValue.java | 2 +- .../evaluation/value/ParticularDoubleValue.java | 2 +- .../evaluation/value/ParticularFloatValue.java | 2 +- .../evaluation/value/ParticularIntegerValue.java | 2 +- .../evaluation/value/ParticularLongValue.java | 2 +- .../evaluation/value/ParticularValueFactory.java | 2 +- src/proguard/evaluation/value/ReferenceValue.java | 2 +- .../evaluation/value/SpecificDoubleValue.java | 2 +- .../evaluation/value/SpecificFloatValue.java | 2 +- .../evaluation/value/SpecificIntegerValue.java | 2 +- .../evaluation/value/SpecificLongValue.java | 2 +- src/proguard/evaluation/value/TopValue.java | 2 +- .../evaluation/value/TypedReferenceValue.java | 6 +- .../evaluation/value/UnknownDoubleValue.java | 2 +- .../evaluation/value/UnknownFloatValue.java | 2 +- .../evaluation/value/UnknownIntegerValue.java | 2 +- .../evaluation/value/UnknownLongValue.java | 2 +- src/proguard/evaluation/value/Value.java | 18 +- src/proguard/evaluation/value/ValueFactory.java | 2 +- src/proguard/gradle/ProGuardTask.java | 2 +- src/proguard/gui/ClassPathPanel.java | 2 +- src/proguard/gui/ClassSpecificationDialog.java | 2 +- src/proguard/gui/ClassSpecificationsPanel.java | 2 +- src/proguard/gui/ExtensionFileFilter.java | 2 +- src/proguard/gui/FilterBuilder.java | 2 +- src/proguard/gui/FilterDialog.java | 2 +- src/proguard/gui/GUIResources.java | 2 +- src/proguard/gui/GUIResources.properties | 10 +- src/proguard/gui/KeepSpecificationsPanel.java | 2 +- src/proguard/gui/ListPanel.java | 2 +- src/proguard/gui/MemberSpecificationDialog.java | 2 +- src/proguard/gui/MemberSpecificationsPanel.java | 2 +- src/proguard/gui/MessageDialogRunnable.java | 2 +- src/proguard/gui/OptimizationsDialog.java | 2 +- src/proguard/gui/ProGuardGUI.java | 2 +- src/proguard/gui/ProGuardRunnable.java | 2 +- src/proguard/gui/ReTraceRunnable.java | 46 +- src/proguard/gui/SwingUtil.java | 2 +- src/proguard/gui/TabbedPane.java | 2 +- src/proguard/gui/TextAreaOutputStream.java | 2 +- ...xtAreaOutputStream.java => TextAreaWriter.java} | 18 +- src/proguard/gui/splash/BufferedSprite.java | 2 +- src/proguard/gui/splash/CircleSprite.java | 2 +- src/proguard/gui/splash/ClipSprite.java | 2 +- src/proguard/gui/splash/ColorSprite.java | 2 +- src/proguard/gui/splash/CompositeSprite.java | 2 +- src/proguard/gui/splash/ConstantColor.java | 2 +- src/proguard/gui/splash/ConstantDouble.java | 2 +- src/proguard/gui/splash/ConstantFont.java | 2 +- src/proguard/gui/splash/ConstantInt.java | 2 +- src/proguard/gui/splash/ConstantString.java | 2 +- src/proguard/gui/splash/ConstantTiming.java | 2 +- src/proguard/gui/splash/FontSprite.java | 2 +- src/proguard/gui/splash/ImageSprite.java | 2 +- src/proguard/gui/splash/LinearColor.java | 2 +- src/proguard/gui/splash/LinearDouble.java | 2 +- src/proguard/gui/splash/LinearInt.java | 2 +- src/proguard/gui/splash/LinearTiming.java | 2 +- src/proguard/gui/splash/OverrideGraphics2D.java | 2 +- src/proguard/gui/splash/RectangleSprite.java | 2 +- src/proguard/gui/splash/SawToothTiming.java | 2 +- src/proguard/gui/splash/ShadowedSprite.java | 2 +- src/proguard/gui/splash/SineTiming.java | 2 +- src/proguard/gui/splash/SmoothTiming.java | 2 +- src/proguard/gui/splash/SplashPanel.java | 2 +- src/proguard/gui/splash/Sprite.java | 2 +- src/proguard/gui/splash/TextSprite.java | 2 +- src/proguard/gui/splash/TimeSwitchSprite.java | 2 +- src/proguard/gui/splash/Timing.java | 2 +- src/proguard/gui/splash/TypeWriterString.java | 2 +- src/proguard/gui/splash/VariableColor.java | 2 +- src/proguard/gui/splash/VariableDouble.java | 2 +- src/proguard/gui/splash/VariableFont.java | 2 +- src/proguard/gui/splash/VariableInt.java | 2 +- src/proguard/gui/splash/VariableSizeFont.java | 2 +- src/proguard/gui/splash/VariableString.java | 2 +- src/proguard/io/CascadingDataEntryWriter.java | 2 +- src/proguard/io/ClassFilter.java | 2 +- src/proguard/io/ClassReader.java | 2 +- src/proguard/io/ClassRewriter.java | 2 +- src/proguard/io/DataEntry.java | 2 +- src/proguard/io/DataEntryClassWriter.java | 2 +- src/proguard/io/DataEntryCopier.java | 2 +- src/proguard/io/DataEntryDirectoryFilter.java | 2 +- src/proguard/io/DataEntryFilter.java | 2 +- src/proguard/io/DataEntryNameFilter.java | 2 +- src/proguard/io/DataEntryObfuscator.java | 2 +- src/proguard/io/DataEntryParentFilter.java | 2 +- src/proguard/io/DataEntryPump.java | 2 +- src/proguard/io/DataEntryReader.java | 2 +- src/proguard/io/DataEntryRenamer.java | 2 +- src/proguard/io/DataEntryRewriter.java | 2 +- src/proguard/io/DataEntryWriter.java | 2 +- src/proguard/io/DirectoryFilter.java | 2 +- src/proguard/io/DirectoryPump.java | 2 +- src/proguard/io/DirectoryWriter.java | 2 +- src/proguard/io/FileDataEntry.java | 2 +- src/proguard/io/FilteredDataEntryReader.java | 2 +- src/proguard/io/FilteredDataEntryWriter.java | 2 +- src/proguard/io/Finisher.java | 2 +- src/proguard/io/JarReader.java | 2 +- src/proguard/io/JarWriter.java | 2 +- src/proguard/io/ManifestRewriter.java | 2 +- src/proguard/io/NameFilter.java | 2 +- src/proguard/io/ParentDataEntryWriter.java | 2 +- src/proguard/io/RenamedDataEntry.java | 2 +- src/proguard/io/ZipDataEntry.java | 2 +- src/proguard/obfuscate/AttributeShrinker.java | 2 +- src/proguard/obfuscate/AttributeUsageMarker.java | 2 +- src/proguard/obfuscate/ClassObfuscator.java | 2 +- src/proguard/obfuscate/ClassRenamer.java | 2 +- src/proguard/obfuscate/DictionaryNameFactory.java | 2 +- src/proguard/obfuscate/MapCleaner.java | 2 +- src/proguard/obfuscate/MappingKeeper.java | 11 +- src/proguard/obfuscate/MappingPrinter.java | 273 +++++++- src/proguard/obfuscate/MappingProcessor.java | 33 +- src/proguard/obfuscate/MappingReader.java | 79 ++- src/proguard/obfuscate/MemberNameCleaner.java | 2 +- src/proguard/obfuscate/MemberNameCollector.java | 2 +- .../obfuscate/MemberNameConflictFixer.java | 2 +- src/proguard/obfuscate/MemberNameFilter.java | 2 +- src/proguard/obfuscate/MemberObfuscator.java | 4 +- .../obfuscate/MemberSpecialNameFilter.java | 2 +- src/proguard/obfuscate/MultiMappingProcessor.java | 13 +- src/proguard/obfuscate/NameFactory.java | 2 +- src/proguard/obfuscate/NameFactoryResetter.java | 2 +- src/proguard/obfuscate/NameMarker.java | 2 +- src/proguard/obfuscate/NumericNameFactory.java | 2 +- src/proguard/obfuscate/Obfuscator.java | 2 +- src/proguard/obfuscate/ParameterNameMarker.java | 2 +- src/proguard/obfuscate/SimpleNameFactory.java | 2 +- src/proguard/obfuscate/SourceFileRenamer.java | 2 +- src/proguard/obfuscate/SpecialNameFactory.java | 2 +- .../optimize/BootstrapMethodArgumentShrinker.java | 2 +- src/proguard/optimize/ChangedCodePrinter.java | 2 +- src/proguard/optimize/ConstantMemberFilter.java | 2 +- src/proguard/optimize/ConstantParameterFilter.java | 2 +- .../optimize/DuplicateInitializerFixer.java | 2 +- .../DuplicateInitializerInvocationFixer.java | 10 +- src/proguard/optimize/KeepMarker.java | 2 +- src/proguard/optimize/KeptClassFilter.java | 2 +- src/proguard/optimize/KeptMemberFilter.java | 2 +- .../optimize/MemberDescriptorSpecializer.java | 2 +- .../optimize/MethodDescriptorShrinker.java | 121 ++-- src/proguard/optimize/MethodStaticizer.java | 2 +- .../optimize/OptimizationInfoMemberFilter.java | 2 +- src/proguard/optimize/Optimizer.java | 23 +- src/proguard/optimize/ParameterShrinker.java | 4 +- src/proguard/optimize/TailRecursionSimplifier.java | 2 +- src/proguard/optimize/WriteOnlyFieldFilter.java | 2 +- .../optimize/evaluation/EvaluationShrinker.java | 8 +- .../optimize/evaluation/EvaluationSimplifier.java | 50 +- .../optimize/evaluation/LivenessAnalyzer.java | 2 +- .../optimize/evaluation/LoadingInvocationUnit.java | 2 +- .../optimize/evaluation/PartialEvaluator.java | 62 +- .../evaluation/SimpleEnumArrayPropagator.java | 2 +- .../evaluation/SimpleEnumClassChecker.java | 2 +- .../evaluation/SimpleEnumClassSimplifier.java | 2 +- .../evaluation/SimpleEnumDescriptorSimplifier.java | 468 ++++++++++---- .../optimize/evaluation/SimpleEnumUseChecker.java | 10 +- .../evaluation/SimpleEnumUseSimplifier.java | 8 +- .../optimize/evaluation/StoringInvocationUnit.java | 2 +- .../optimize/evaluation/TracedBranchUnit.java | 2 +- .../optimize/evaluation/VariableOptimizer.java | 2 +- src/proguard/optimize/info/AccessMethodMarker.java | 2 +- .../optimize/info/BackwardBranchMarker.java | 2 +- .../optimize/info/CatchExceptionMarker.java | 2 +- src/proguard/optimize/info/CaughtClassFilter.java | 2 +- src/proguard/optimize/info/CaughtClassMarker.java | 2 +- .../optimize/info/ClassOptimizationInfo.java | 2 +- .../optimize/info/ClassOptimizationInfoSetter.java | 2 +- src/proguard/optimize/info/DotClassFilter.java | 2 +- src/proguard/optimize/info/DotClassMarker.java | 2 +- .../optimize/info/DynamicInvocationMarker.java | 2 +- .../optimize/info/ExceptionInstructionChecker.java | 2 +- .../optimize/info/FieldOptimizationInfo.java | 2 +- .../optimize/info/InstanceofClassFilter.java | 2 +- .../optimize/info/InstanceofClassMarker.java | 2 +- .../optimize/info/InstantiationClassFilter.java | 2 +- .../optimize/info/InstantiationClassMarker.java | 2 +- .../info/MemberOptimizationInfoSetter.java | 2 +- .../optimize/info/MethodInvocationMarker.java | 2 +- .../optimize/info/MethodOptimizationInfo.java | 2 +- .../optimize/info/NoSideEffectMethodMarker.java | 2 +- .../optimize/info/NonPrivateMemberMarker.java | 2 +- .../PackageVisibleMemberContainingClassMarker.java | 2 +- .../PackageVisibleMemberInvokingClassMarker.java | 2 +- .../optimize/info/ParameterUsageMarker.java | 2 +- .../optimize/info/ReadWriteFieldMarker.java | 2 +- .../info/SideEffectInstructionChecker.java | 87 ++- .../optimize/info/SideEffectMethodFilter.java | 2 +- .../optimize/info/SideEffectMethodMarker.java | 2 +- src/proguard/optimize/info/SimpleEnumFilter.java | 2 +- src/proguard/optimize/info/SimpleEnumMarker.java | 2 +- .../StaticInitializerContainingClassFilter.java | 2 +- .../StaticInitializerContainingClassMarker.java | 2 +- .../optimize/info/SuperInvocationMarker.java | 2 +- .../optimize/info/VariableUsageMarker.java | 2 +- .../optimize/peephole/BranchTargetFinder.java | 2 +- src/proguard/optimize/peephole/ClassFinalizer.java | 2 +- src/proguard/optimize/peephole/ClassMerger.java | 8 +- .../optimize/peephole/GotoCommonCodeReplacer.java | 2 +- .../optimize/peephole/GotoGotoReplacer.java | 2 +- .../optimize/peephole/GotoReturnReplacer.java | 2 +- .../optimize/peephole/HorizontalClassMerger.java | 5 +- .../peephole/InstructionSequenceConstants.java | 2 +- .../peephole/InstructionSequenceReplacer.java | 2 +- .../peephole/InstructionSequencesReplacer.java | 2 +- .../optimize/peephole/LineNumberLinearizer.java | 250 ++++++++ .../optimize/peephole/MemberPrivatizer.java | 2 +- .../optimize/peephole/MethodFinalizer.java | 2 +- src/proguard/optimize/peephole/MethodInliner.java | 93 ++- src/proguard/optimize/peephole/NopRemover.java | 2 +- .../optimize/peephole/PeepholeOptimizer.java | 2 +- .../optimize/peephole/ReachableCodeMarker.java | 2 +- .../RetargetedInnerClassAttributeRemover.java | 2 +- .../optimize/peephole/TargetClassChanger.java | 57 +- .../optimize/peephole/UnreachableCodeRemover.java | 2 +- .../peephole/UnreachableExceptionRemover.java | 2 +- .../optimize/peephole/VariableShrinker.java | 2 +- .../optimize/peephole/VerticalClassMerger.java | 2 +- src/proguard/preverify/CodePreverifier.java | 2 +- src/proguard/preverify/CodeSubroutineInliner.java | 2 +- src/proguard/preverify/Preverifier.java | 2 +- src/proguard/preverify/SubroutineInliner.java | 2 +- src/proguard/retrace/FrameInfo.java | 108 ++++ src/proguard/retrace/FramePattern.java | 303 +++++++++ src/proguard/retrace/FrameRemapper.java | 432 +++++++++++++ src/proguard/retrace/ReTrace.java | 686 ++++----------------- src/proguard/shrink/AnnotationUsageMarker.java | 2 +- src/proguard/shrink/ClassShrinker.java | 242 +++----- src/proguard/shrink/InnerUsageMarker.java | 2 +- src/proguard/shrink/InterfaceUsageMarker.java | 4 +- .../shrink/LocalVariableTypeUsageMarker.java | 5 +- src/proguard/shrink/ShortestUsageMark.java | 2 +- src/proguard/shrink/ShortestUsageMarker.java | 2 +- src/proguard/shrink/ShortestUsagePrinter.java | 2 +- src/proguard/shrink/Shrinker.java | 4 +- src/proguard/shrink/SignatureUsageMarker.java | 120 ---- src/proguard/shrink/UsageMarker.java | 75 ++- src/proguard/shrink/UsagePrinter.java | 2 +- src/proguard/shrink/UsedClassFilter.java | 2 +- src/proguard/shrink/UsedMemberFilter.java | 2 +- src/proguard/util/AndMatcher.java | 2 +- src/proguard/util/ArrayUtil.java | 2 +- src/proguard/util/ClassNameParser.java | 2 +- src/proguard/util/ConstantMatcher.java | 2 +- src/proguard/util/EmptyStringMatcher.java | 2 +- src/proguard/util/ExtensionMatcher.java | 2 +- src/proguard/util/FileNameParser.java | 2 +- src/proguard/util/FixedStringMatcher.java | 2 +- src/proguard/util/ListMatcher.java | 2 +- src/proguard/util/ListParser.java | 2 +- src/proguard/util/ListUtil.java | 2 +- src/proguard/util/NameParser.java | 2 +- src/proguard/util/NotMatcher.java | 2 +- src/proguard/util/ObjectUtil.java | 2 +- src/proguard/util/OrMatcher.java | 2 +- src/proguard/util/SettableMatcher.java | 2 +- src/proguard/util/StringMatcher.java | 2 +- src/proguard/util/StringParser.java | 2 +- src/proguard/util/VariableStringMatcher.java | 2 +- src/proguard/wtk/ProGuardObfuscator.java | 2 +- 674 files changed, 4350 insertions(+), 2141 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/proguard.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
