This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository proguard.
commit d9a4e77305b5056be33acf5b62715c68ee13411a Merge: 93aa57e c49b8e6 Author: Sam Clegg <[email protected]> Date: Fri Oct 9 16:17:49 2009 -0700 Imported Debian patch 4.4-1 README | 2 +- build/README | 34 - build/build.sh | 18 +- build/build.xml | 5 + build/makefile | 4 +- debian/README.Debian | 10 + debian/changelog | 33 + debian/control | 6 +- debian/install | 2 +- debian/links | 1 - debian/rules | 26 +- debian/watch | 2 +- docs/FAQ.html | 2 +- docs/GPL_exception.html | 3 +- docs/acknowledgements.html | 5 +- docs/alternatives.html | 12 +- docs/downloads.html | 47 +- docs/feedback.html | 2 +- docs/index.html | 2 +- docs/license.html | 11 +- docs/main.html | 2 +- docs/manual/ant.html | 75 +- docs/manual/examples.html | 318 ++- docs/manual/gui.html | 6 +- docs/manual/index.html | 2 +- docs/manual/introduction.html | 2 +- docs/manual/limitations.html | 2 +- docs/manual/optimizations.html | 158 ++ docs/manual/refcard.html | 42 +- docs/manual/retrace/examples.html | 2 +- docs/manual/retrace/index.html | 2 +- docs/manual/retrace/introduction.html | 2 +- docs/manual/retrace/usage.html | 87 +- docs/manual/style.css | 6 + docs/manual/troubleshooting.html | 35 +- docs/manual/usage.html | 276 ++- docs/manual/wtk.html | 2 +- docs/quality.html | 2 +- docs/results.html | 2 +- docs/screenshots.html | 2 +- docs/sections.html | 4 + docs/sflogo.png | Bin 1299 -> 469 bytes docs/testimonials.html | 2 +- docs/title.html | 2 +- examples/annotations/examples/Applet.java | 6 +- examples/annotations/examples/Application.java | 6 +- examples/annotations/examples/Bean.java | 6 +- examples/annotations/examples/NativeCallBack.java | 6 +- examples/annotations/lib/annotations.jar | Bin 6123 -> 6123 bytes examples/ant/proguard.xml | 1 + lib/proguard.jar | Bin 0 -> 664512 bytes lib/proguardgui.jar | Bin 0 -> 137516 bytes lib/retrace.jar | Bin 0 -> 6888 bytes proguard.manifest | 1 - proguardgui.manifest | 1 - src/proguard/ArgumentWordReader.java | 2 +- src/proguard/ClassPath.java | 2 +- src/proguard/ClassPathEntry.java | 71 +- src/proguard/ClassSpecification.java | 28 +- src/proguard/ClassSpecificationVisitorFactory.java | 52 +- src/proguard/Configuration.java | 50 +- src/proguard/ConfigurationConstants.java | 6 +- src/proguard/ConfigurationParser.java | 92 +- src/proguard/ConfigurationWriter.java | 105 +- src/proguard/DataEntryReaderFactory.java | 16 +- src/proguard/DataEntryWriterFactory.java | 16 +- src/proguard/DescriptorKeepChecker.java | 6 +- src/proguard/DuplicateClassPrinter.java | 8 +- src/proguard/FileWordReader.java | 2 +- src/proguard/FullyQualifiedClassNameChecker.java | 8 +- src/proguard/GPL.java | 3 +- src/proguard/Initializer.java | 282 +-- src/proguard/InputReader.java | 87 +- ...cification.java => KeepClassSpecification.java} | 35 +- src/proguard/MemberSpecification.java | 2 +- src/proguard/OutputWriter.java | 93 +- src/proguard/ParseException.java | 2 +- src/proguard/ProGuard.java | 4 +- src/proguard/SubclassedClassFilter.java | 2 +- src/proguard/Targeter.java | 4 +- src/proguard/UpToDateChecker.java | 2 +- src/proguard/WordReader.java | 2 +- src/proguard/ant/ClassPathElement.java | 13 +- src/proguard/ant/ClassSpecificationElement.java | 4 +- src/proguard/ant/ConfigurationElement.java | 2 +- src/proguard/ant/ConfigurationTask.java | 142 +- src/proguard/ant/FilterElement.java | 20 +- src/proguard/ant/KeepAttributeElement.java | 70 - src/proguard/ant/KeepSpecificationElement.java | 10 +- src/proguard/ant/MemberSpecificationElement.java | 2 +- src/proguard/ant/ProGuardTask.java | 7 +- src/proguard/classfile/ClassConstants.java | 2 +- src/proguard/classfile/ClassPool.java | 2 +- src/proguard/classfile/Clazz.java | 2 +- src/proguard/classfile/Field.java | 2 +- src/proguard/classfile/LibraryClass.java | 2 +- src/proguard/classfile/LibraryField.java | 2 +- src/proguard/classfile/LibraryMember.java | 2 +- src/proguard/classfile/LibraryMethod.java | 2 +- src/proguard/classfile/Member.java | 2 +- src/proguard/classfile/Method.java | 2 +- src/proguard/classfile/ProgramClass.java | 2 +- src/proguard/classfile/ProgramField.java | 2 +- src/proguard/classfile/ProgramMember.java | 2 +- src/proguard/classfile/ProgramMethod.java | 2 +- src/proguard/classfile/VisitorAccepter.java | 2 +- src/proguard/classfile/attribute/Attribute.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 +- .../classfile/attribute/InnerClassesAttribute.java | 2 +- .../classfile/attribute/InnerClassesInfo.java | 2 +- .../classfile/attribute/LineNumberInfo.java | 12 +- .../attribute/LineNumberTableAttribute.java | 2 +- .../classfile/attribute/LocalVariableInfo.java | 27 +- .../attribute/LocalVariableTableAttribute.java | 2 +- .../classfile/attribute/LocalVariableTypeInfo.java | 27 +- .../attribute/LocalVariableTypeTableAttribute.java | 2 +- .../classfile/attribute/SignatureAttribute.java | 2 +- .../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 +- .../RuntimeVisibleAnnotationsAttribute.java | 2 +- ...untimeVisibleParameterAnnotationsAttribute.java | 2 +- .../annotation/visitor/AllAnnotationVisitor.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 +- .../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/AllExceptionInfoVisitor.java} | 17 +- .../attribute/visitor/AttributeNameFilter.java | 2 +- .../attribute/visitor/AttributeVisitor.java | 2 +- .../attribute/visitor/ExceptionInfoVisitor.java | 2 +- .../attribute/visitor/InnerClassesInfoVisitor.java | 2 +- .../attribute/visitor/LineNumberInfoVisitor.java | 2 +- .../visitor/LocalVariableInfoVisitor.java | 2 +- .../visitor/LocalVariableTypeInfoVisitor.java | 2 +- .../attribute/visitor/MultiAttributeVisitor.java | 2 +- .../attribute/visitor/RequiredAttributeFilter.java | 2 +- .../attribute/visitor/StackSizeComputer.java | 4 +- 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 +- src/proguard/classfile/constant/LongConstant.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 | 134 +- .../constant/visitor/AllConstantVisitor.java | 2 +- .../constant/visitor/ConstantVisitor.java | 2 +- .../visitor/ExceptClassConstantFilter.java | 2 +- src/proguard/classfile/editor/AccessFixer.java | 2 +- src/proguard/classfile/editor/AnnotationAdder.java | 69 +- .../editor/AnnotationsAttributeEditor.java | 2 +- src/proguard/classfile/editor/AttributeAdder.java | 85 +- src/proguard/classfile/editor/AttributeSorter.java | 2 +- .../classfile/editor/AttributesEditor.java | 2 +- src/proguard/classfile/editor/ClassEditor.java | 2 +- .../classfile/editor/ClassElementSorter.java | 2 +- .../classfile/editor/ClassMemberSorter.java | 2 +- .../classfile/editor/ClassReferenceFixer.java | 2 +- .../classfile/editor/CodeAttributeComposer.java | 69 +- .../classfile/editor/CodeAttributeEditor.java | 200 +- .../editor/CodeAttributeEditorResetter.java | 2 +- .../classfile/editor/ComparableConstant.java | 2 +- src/proguard/classfile/editor/ConstantAdder.java | 2 +- .../classfile/editor/ConstantPoolEditor.java | 2 +- .../classfile/editor/ConstantPoolRemapper.java | 2 +- .../classfile/editor/ConstantPoolSorter.java | 2 +- .../classfile/editor/ElementValueAdder.java | 3 +- .../classfile/editor/ElementValuesEditor.java | 2 +- src/proguard/classfile/editor/ExceptionAdder.java | 2 +- .../classfile/editor/ExceptionInfoAdder.java | 2 +- .../editor/ExceptionsAttributeEditor.java | 2 +- .../classfile/editor/InstructionAdder.java | 2 +- .../classfile/editor/InstructionWriter.java | 2 +- src/proguard/classfile/editor/InterfaceAdder.java | 2 +- src/proguard/classfile/editor/InterfaceSorter.java | 2 +- .../classfile/editor/InterfacesEditor.java | 2 +- .../classfile/editor/LineNumberInfoAdder.java | 59 + .../editor/LineNumberTableAttributeEditor.java | 67 + .../classfile/editor/LocalVariableInfoAdder.java | 67 + .../editor/LocalVariableTableAttributeEditor.java | 67 + .../editor/LocalVariableTypeInfoAdder.java | 68 + .../LocalVariableTypeTableAttributeEditor.java | 68 + src/proguard/classfile/editor/MemberAdder.java | 4 +- .../classfile/editor/MemberReferenceFixer.java | 6 +- .../classfile/editor/MethodInvocationFixer.java | 2 +- .../classfile/editor/NamedAttributeDeleter.java | 2 +- .../ParameterAnnotationsAttributeEditor.java | 71 + .../classfile/editor/StackSizeUpdater.java | 2 +- src/proguard/classfile/editor/SubclassAdder.java | 2 +- src/proguard/classfile/editor/SubclassToAdder.java | 2 +- src/proguard/classfile/editor/VariableCleaner.java | 135 ++ src/proguard/classfile/editor/VariableEditor.java | 2 +- .../classfile/editor/VariableRemapper.java | 2 +- .../classfile/editor/VariableSizeUpdater.java | 2 +- .../classfile/instruction/BranchInstruction.java | 2 +- .../classfile/instruction/ConstantInstruction.java | 2 +- .../classfile/instruction/Instruction.java | 4 +- .../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 | 21 +- .../instruction/visitor/AllInstructionVisitor.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 | 6 +- src/proguard/classfile/io/RuntimeDataInput.java | 2 +- src/proguard/classfile/io/RuntimeDataOutput.java | 2 +- src/proguard/classfile/util/AccessUtil.java | 2 +- .../classfile/util/ClassReferenceInitializer.java | 88 +- .../util/ClassSubHierarchyInitializer.java | 2 +- .../util/ClassSuperHierarchyInitializer.java | 10 +- src/proguard/classfile/util/ClassUtil.java | 2 +- .../classfile/util/DescriptorClassEnumeration.java | 20 +- .../util/DynamicClassReferenceInitializer.java | 19 +- .../util/DynamicMemberReferenceInitializer.java | 62 +- .../classfile/util/ExternalTypeEnumeration.java | 2 +- .../classfile/util/InstructionSequenceMatcher.java | 26 +- .../classfile/util/InternalTypeEnumeration.java | 2 +- 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 | 89 + src/proguard/classfile/util/StringSharer.java | 2 +- src/proguard/classfile/util/WarningPrinter.java | 72 +- .../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 | 2 +- src/proguard/classfile/visitor/ClassCollector.java | 2 +- src/proguard/classfile/visitor/ClassCounter.java | 2 +- .../visitor/ClassForNameClassVisitor.java | 2 +- .../classfile/visitor/ClassHierarchyTraveler.java | 2 +- .../classfile/visitor/ClassNameFilter.java | 19 +- .../classfile/visitor/ClassPoolFiller.java | 2 +- .../classfile/visitor/ClassPoolVisitor.java | 2 +- .../classfile/visitor/ClassPresenceFilter.java | 2 +- src/proguard/classfile/visitor/ClassPrinter.java | 17 +- .../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 +- .../classfile/visitor/ExceptClassFilter.java | 2 +- .../classfile/visitor/ExceptClassesFilter.java | 2 +- .../classfile/visitor/ExceptionCounter.java | 2 +- .../visitor/ExceptionExcludedOffsetFilter.java | 4 +- ...r.java => ExceptionHandlerConstantVisitor.java} | 28 +- ...angeFilter.java => ExceptionHandlerFilter.java} | 24 +- .../classfile/visitor/ExceptionOffsetFilter.java | 4 +- .../classfile/visitor/ExceptionRangeFilter.java | 2 +- .../visitor/ImplementedClassConstantFilter.java | 2 +- .../classfile/visitor/ImplementedClassFilter.java | 2 +- .../visitor/ImplementingClassConstantFilter.java | 2 +- .../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 +- .../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/ProgramClassFilter.java | 2 +- .../classfile/visitor/ProgramMemberFilter.java | 2 +- .../classfile/visitor/ReferencedClassVisitor.java | 5 +- .../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 | 6 +- src/proguard/evaluation/BranchUnit.java | 2 +- src/proguard/evaluation/InvocationUnit.java | 2 +- src/proguard/evaluation/Processor.java | 2 +- src/proguard/evaluation/Stack.java | 2 +- src/proguard/evaluation/TracedStack.java | 2 +- src/proguard/evaluation/TracedVariables.java | 2 +- src/proguard/evaluation/Variables.java | 2 +- src/proguard/evaluation/value/Category1Value.java | 2 +- src/proguard/evaluation/value/Category2Value.java | 2 +- src/proguard/evaluation/value/ComparisonValue.java | 4 +- .../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 +- src/proguard/evaluation/value/DoubleValue.java | 2 +- src/proguard/evaluation/value/FloatValue.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/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 +- src/proguard/evaluation/value/ReferenceValue.java | 4 +- .../evaluation/value/SpecificDoubleValue.java | 2 +- .../evaluation/value/SpecificFloatValue.java | 2 +- .../evaluation/value/SpecificIntegerValue.java | 2 +- .../evaluation/value/SpecificLongValue.java | 2 +- .../evaluation/value/SpecificValueFactory.java | 2 +- src/proguard/evaluation/value/TopValue.java | 2 +- .../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 | 2 +- src/proguard/evaluation/value/ValueFactory.java | 2 +- src/proguard/gui/ClassPathPanel.java | 15 +- src/proguard/gui/ClassSpecificationDialog.java | 34 +- src/proguard/gui/ClassSpecificationsPanel.java | 2 +- src/proguard/gui/ExtensionFileFilter.java | 2 +- src/proguard/gui/FilterBuilder.java | 208 ++ src/proguard/gui/FilterDialog.java | 45 +- src/proguard/gui/GUIResources.java | 2 +- src/proguard/gui/GUIResources.properties | 210 +- src/proguard/gui/KeepSpecificationsPanel.java | 8 +- src/proguard/gui/ListPanel.java | 2 +- src/proguard/gui/MemberSpecificationDialog.java | 8 +- src/proguard/gui/MemberSpecificationsPanel.java | 2 +- src/proguard/gui/MessageDialogRunnable.java | 18 +- src/proguard/gui/OptimizationsDialog.java | 251 ++ src/proguard/gui/ProGuardGUI.java | 270 ++- src/proguard/gui/ProGuardRunnable.java | 2 +- src/proguard/gui/ReTraceRunnable.java | 5 +- src/proguard/gui/SwingUtil.java | 6 +- src/proguard/gui/TabbedPane.java | 19 +- src/proguard/gui/TextAreaOutputStream.java | 14 +- 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 | 8 +- 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/gui/vtitle.gif | Bin 26541 -> 0 bytes src/proguard/gui/vtitle.png | Bin 0 -> 23313 bytes src/proguard/io/CascadingDataEntryWriter.java | 12 +- src/proguard/io/ClassFilter.java | 25 +- src/proguard/io/ClassReader.java | 5 +- src/proguard/io/ClassRewriter.java | 2 +- src/proguard/io/DataEntry.java | 11 +- src/proguard/io/DataEntryCopier.java | 31 +- ...ryReader.java => DataEntryDirectoryFilter.java} | 24 +- src/proguard/io/DataEntryFilter.java | 2 +- src/proguard/io/DataEntryNameFilter.java | 2 +- ...aEntryRenamer.java => DataEntryObfuscator.java} | 52 +- src/proguard/io/DataEntryParentFilter.java | 2 +- src/proguard/io/DataEntryPump.java | 2 +- src/proguard/io/DataEntryReader.java | 2 +- src/proguard/io/DataEntryRenamer.java | 113 +- src/proguard/io/DataEntryRewriter.java | 58 +- src/proguard/io/DataEntryWriter.java | 10 +- .../io/{ClassFilter.java => DirectoryFilter.java} | 38 +- src/proguard/io/DirectoryPump.java | 9 +- src/proguard/io/DirectoryWriter.java | 28 +- src/proguard/io/FileDataEntry.java | 8 +- src/proguard/io/FilteredDataEntryReader.java | 2 +- src/proguard/io/FilteredDataEntryWriter.java | 15 +- src/proguard/io/Finisher.java | 2 +- src/proguard/io/JarReader.java | 13 +- src/proguard/io/JarWriter.java | 108 +- src/proguard/io/ManifestRewriter.java | 216 ++ src/proguard/io/NameFilter.java | 83 + src/proguard/io/ParentDataEntryWriter.java | 9 +- src/proguard/io/RenamedDataEntry.java | 8 +- src/proguard/io/ZipDataEntry.java | 21 +- src/proguard/obfuscate/AttributeShrinker.java | 2 +- src/proguard/obfuscate/AttributeUsageMarker.java | 2 +- src/proguard/obfuscate/ClassObfuscator.java | 145 +- src/proguard/obfuscate/ClassRenamer.java | 2 +- src/proguard/obfuscate/DictionaryNameFactory.java | 2 +- src/proguard/obfuscate/MapCleaner.java | 2 +- src/proguard/obfuscate/MappingKeeper.java | 23 +- src/proguard/obfuscate/MappingPrinter.java | 2 +- src/proguard/obfuscate/MappingProcessor.java | 23 +- src/proguard/obfuscate/MappingReader.java | 67 +- src/proguard/obfuscate/MemberNameCleaner.java | 2 +- src/proguard/obfuscate/MemberNameCollector.java | 2 +- .../obfuscate/MemberNameConflictFixer.java | 5 +- src/proguard/obfuscate/MemberObfuscator.java | 2 +- .../obfuscate/MemberSpecialNameFilter.java | 2 +- src/proguard/obfuscate/MultiMappingProcessor.java | 8 +- src/proguard/obfuscate/NameAndTypeShrinker.java | 2 +- src/proguard/obfuscate/NameAndTypeUsageMarker.java | 2 +- src/proguard/obfuscate/NameFactory.java | 2 +- src/proguard/obfuscate/NameFactoryResetter.java | 2 +- src/proguard/obfuscate/NameMarker.java | 2 +- .../{NameFactory.java => NumericNameFactory.java} | 29 +- src/proguard/obfuscate/Obfuscator.java | 97 +- src/proguard/obfuscate/SimpleNameFactory.java | 2 +- src/proguard/obfuscate/SourceFileRenamer.java | 8 +- src/proguard/obfuscate/SpecialNameFactory.java | 2 +- src/proguard/obfuscate/Utf8Shrinker.java | 2 +- src/proguard/obfuscate/Utf8UsageMarker.java | 2 +- src/proguard/optimize/ChangedCodePrinter.java | 2 +- src/proguard/optimize/ConstantMemberFilter.java | 4 +- src/proguard/optimize/ConstantParameterFilter.java | 79 + .../optimize/DuplicateInitializerFixer.java | 2 +- .../DuplicateInitializerInvocationFixer.java | 2 +- src/proguard/optimize/KeepMarker.java | 2 +- .../optimize/MemberDescriptorSpecializer.java | 2 +- .../optimize/MethodDescriptorShrinker.java | 17 +- src/proguard/optimize/MethodStaticizer.java | 2 +- .../optimize/OptimizationInfoMemberFilter.java | 2 +- src/proguard/optimize/Optimizer.java | 978 +++++--- src/proguard/optimize/ParameterShrinker.java | 40 +- src/proguard/optimize/TailRecursionSimplifier.java | 10 +- src/proguard/optimize/WriteOnlyFieldFilter.java | 2 +- ...tionSimplifier.java => EvaluationShrinker.java} | 1128 ++------- .../optimize/evaluation/EvaluationSimplifier.java | 2564 ++++---------------- .../optimize/evaluation/LivenessAnalyzer.java | 8 +- .../optimize/evaluation/LoadingInvocationUnit.java | 88 +- .../optimize/evaluation/PartialEvaluator.java | 555 +++-- .../optimize/evaluation/StoringInvocationUnit.java | 62 +- .../optimize/evaluation/TracedBranchUnit.java | 2 +- .../optimize/evaluation/VariableOptimizer.java | 33 +- src/proguard/optimize/info/AccessMethodMarker.java | 2 +- .../optimize/info/BackwardBranchMarker.java | 2 +- .../optimize/info/CatchExceptionMarker.java | 2 +- ...{DotClassFilter.java => CaughtClassFilter.java} | 14 +- ...tionClassFilter.java => CaughtClassMarker.java} | 33 +- .../optimize/info/ClassOptimizationInfo.java | 26 +- .../optimize/info/ClassOptimizationInfoSetter.java | 2 +- src/proguard/optimize/info/DotClassFilter.java | 2 +- src/proguard/optimize/info/DotClassMarker.java | 4 +- .../optimize/info/ExceptionInstructionChecker.java | 2 +- .../optimize/info/FieldOptimizationInfo.java | 2 +- .../optimize/info/InstanceofClassFilter.java | 2 +- .../optimize/info/InstanceofClassMarker.java | 4 +- .../optimize/info/InstantiationClassFilter.java | 2 +- .../optimize/info/InstantiationClassMarker.java | 4 +- .../info/MemberOptimizationInfoSetter.java | 2 +- .../optimize/info/MethodInvocationMarker.java | 2 +- .../optimize/info/MethodOptimizationInfo.java | 31 +- .../optimize/info/NoSideEffectMethodMarker.java | 2 +- .../optimize/info/NonPrivateMemberMarker.java | 2 +- .../PackageVisibleMemberContainingClassMarker.java | 4 +- .../PackageVisibleMemberInvokingClassMarker.java | 4 +- .../optimize/info/ParameterUsageMarker.java | 170 +- .../optimize/info/ReadWriteFieldMarker.java | 6 +- .../info/SideEffectInstructionChecker.java | 2 +- .../optimize/info/SideEffectMethodMarker.java | 2 +- .../optimize/info/SuperInvocationMarker.java | 2 +- .../optimize/info/VariableUsageMarker.java | 2 +- .../optimize/peephole/BranchTargetFinder.java | 2 +- src/proguard/optimize/peephole/ClassFinalizer.java | 63 +- src/proguard/optimize/peephole/ClassMerger.java | 58 +- .../optimize/peephole/GotoCommonCodeReplacer.java | 8 +- .../optimize/peephole/GotoGotoReplacer.java | 2 +- .../optimize/peephole/GotoReturnReplacer.java | 2 +- .../optimize/peephole/HorizontalClassMerger.java | 2 +- .../peephole/InstructionSequenceConstants.java | 255 +- .../peephole/InstructionSequenceReplacer.java | 2 +- .../peephole/InstructionSequencesReplacer.java | 2 +- .../optimize/peephole/LoadStoreRemover.java | 123 - .../optimize/peephole/MemberPrivatizer.java | 33 +- .../{ClassFinalizer.java => MethodFinalizer.java} | 54 +- src/proguard/optimize/peephole/MethodInliner.java | 15 +- src/proguard/optimize/peephole/NopRemover.java | 2 +- .../optimize/peephole/PeepholeOptimizer.java | 2 +- src/proguard/optimize/peephole/PushPopRemover.java | 168 -- .../optimize/peephole/ReachableCodeMarker.java | 2 +- .../RetargetedInnerClassAttributeRemover.java | 2 +- .../optimize/peephole/StoreLoadReplacer.java | 141 -- .../optimize/peephole/TargetClassChanger.java | 2 +- .../optimize/peephole/UnreachableCodeRemover.java | 2 +- .../peephole/UnreachableExceptionRemover.java | 2 +- .../optimize/peephole/VariableShrinker.java | 4 +- .../optimize/peephole/VerticalClassMerger.java | 2 +- src/proguard/preverify/CodePreverifier.java | 38 +- src/proguard/preverify/CodeSubroutineInliner.java | 42 +- src/proguard/preverify/Preverifier.java | 2 +- src/proguard/preverify/SubroutineInliner.java | 2 +- src/proguard/retrace/ReTrace.java | 664 ++++- src/proguard/retrace/StackTrace.java | 178 -- src/proguard/retrace/StackTraceItem.java | 291 --- src/proguard/shrink/AnnotationUsageMarker.java | 2 +- src/proguard/shrink/ClassShrinker.java | 2 +- src/proguard/shrink/InnerUsageMarker.java | 2 +- src/proguard/shrink/InterfaceUsageMarker.java | 2 +- src/proguard/shrink/ShortestUsageMark.java | 2 +- src/proguard/shrink/ShortestUsageMarker.java | 2 +- src/proguard/shrink/ShortestUsagePrinter.java | 2 +- src/proguard/shrink/Shrinker.java | 2 +- src/proguard/shrink/UsageMarker.java | 2 +- 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/ClassNameParser.java | 2 +- .../util/{NotMatcher.java => ConstantMatcher.java} | 20 +- 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 | 14 +- src/proguard/util/ListUtil.java | 100 +- src/proguard/util/NameParser.java | 2 +- src/proguard/util/NotMatcher.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 +- 620 files changed, 8696 insertions(+), 6982 deletions(-) diff --cc debian/README.Debian index 0000000,0000000..0b85340 new file mode 100644 --- /dev/null +++ b/debian/README.Debian @@@ -1,0 -1,0 +1,10 @@@ ++We are now using the upstream ant build.xml for building proguard. This adds ++the classes for ant task in proguard.jar file itself. Hence there is no ++separate ant-proguard.jar now. ++ ++Ant upstream authors recommend using classpath attribute for optional ant tasks ++which in this case is the proguard task.[1] Hence the symlink to the proguard ++jar files in ant's lib directory has been removed. ++[1] http://ant.apache.org/manual/install.html#optionalTasks ++ ++ -- Onkar Shinde <[email protected]> Fri, 04 Sep 2009 10:28:58 +0530 diff --cc debian/changelog index 08e2fa5,0000000..d5a7f03 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,77 -1,0 +1,110 @@@ ++proguard (4.4-1) unstable; urgency=low ++ ++ [ Onkar Shinde ] ++ * Merge from Ubuntu. (Closes: #534029, #548810) ++ ++ [ Sam Clegg ] ++ * Thanks Onkar for the above fixes! ++ * New upstream release ++ ++ -- Sam Clegg <[email protected]> Fri, 09 Oct 2009 16:17:49 -0700 ++ ++proguard (4.3-1ubuntu1) karmic; urgency=low ++ ++ * Use upstream ant build script. Fixes FTBFS. ++ * debian/control ++ - Add build dependency default-jdk. Remove gcj-4.3, fastjar. ++ - Set runtime dependency to 'default-jre | java2-runtime'. ++ - Update standard version to 3.8.3. No change needed. ++ * debian/rules ++ - Refresh to use upstream ant build script with help of cdbs ant class. ++ * debian/install ++ - Remove ant-proguard.jar. Add retrace.jar ++ * debian/README.Debian ++ - Add notes about using ant task. ++ * debian/links ++ - Remove. Explained in README.Debian. ++ * debian/*.manifest ++ - Delete. Not needed anymore. ++ * debian/watch ++ - User better regular expression. ++ ++ -- Onkar Shinde <[email protected]> Fri, 04 Sep 2009 09:50:26 +0530 ++ +proguard (4.3-1) unstable; urgency=low + + * New upstream release + * Bump standards version to 3.8.1 + * Remove build-depend on jikes (use javac instead) + + -- Sam Clegg <[email protected]> Wed, 20 May 2009 08:21:13 +0100 + +proguard (4.2-1) unstable; urgency=low + + * New upstream release + * Fix build of ant task (Closes: #459829) + Thanks to Hans van Kranenburg <[email protected]> + + -- Sam Clegg <[email protected]> Thu, 15 May 2008 10:39:48 +0100 + +proguard (4.1-1) unstable; urgency=low + + * New upstream release + * fix watch file. Closes: #450042 + + -- Sam Clegg <[email protected]> Thu, 03 Jan 2008 00:18:30 +0000 + +proguard (3.9-1) unstable; urgency=low + + * New upstream release + * Bump standard version to 3.7.2. + * Add ant task jar file. Closes: #423009 + * Fix file names in jar files. Closes: #435808 + + -- Sam Clegg <[email protected]> Mon, 06 Aug 2007 10:34:24 +0100 + +proguard (3.7-1) unstable; urgency=low + + * New upstream release + * debian/control: make Arch: all (Closes: #360115) + * use "$@" rather then $* in shell startup scripts (Closes: #364962) + + -- Sam Clegg <[email protected]> Sat, 13 Jan 2007 12:27:45 +0000 + +proguard (3.4-1) unstable; urgency=low + + * New upstream release (Closes: #338355) + * debian/control: bump standards version + * debian/copyright: update FSF address + * increase java stack size for proguard and proguardgui + + -- Sam Clegg <[email protected]> Sun, 13 Nov 2005 09:42:59 +0000 + +proguard (3.3.2-1) unstable; urgency=low + + * New upstream release + * Build-Depend on ant rather than libant-java (Closes: #326434) + + -- Sam Clegg <[email protected]> Sun, 4 Sep 2005 14:59:21 +0100 + +proguard (3.2-3) unstable; urgency=low + + * debian/rules: fix FTBFS (Closes: #312024) + * debian/control: fix FTBFS by added Build-Depend on fastjar + - Thanks to Regis Boudin <[email protected]> + + -- Sam Clegg <[email protected]> Fri, 17 Jun 2005 14:25:24 +0100 + +proguard (3.2-2) unstable; urgency=low + + * fix java executable name in proguard and proguardgui shell + scripts (Closes: #311966) + + -- Sam Clegg <[email protected]> Sat, 4 Jun 2005 21:17:01 +0100 + +proguard (3.2-1) unstable; urgency=low + + * Initial Release (Closes: #310044). + + -- Sam Clegg <[email protected]> Thu, 2 Jun 2005 17:01:06 +0100 + diff --cc debian/control index bb6a8ac,0000000..cd5b24f mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,17 -1,0 +1,17 @@@ +Source: proguard +Section: devel +Priority: optional +Maintainer: Sam Clegg <[email protected]> - Build-Depends: debhelper (>= 7.0.15), cdbs, gcj-4.3, ant, fastjar - Standards-Version: 3.8.1 ++Build-Depends: debhelper (>= 7.0.15), cdbs, default-jdk, ant ++Standards-Version: 3.8.3 + +Package: proguard +Architecture: all - Depends: ${misc:Depends}, kaffe | java-virtual-machine ++Depends: ${misc:Depends}, default-jre | java2-runtime +Description: java class file shrinker, optimizer, and obfuscator + ProGuard is a free Java class file shrinker, optimizer, and + obfuscator. It can detect and remove unused classes, fields, + methods, and attributes. It can then optimize bytecode and remove + unused instructions. Finally, it can rename the remaining classes, + fields, and methods using short meaningless names. The resulting jars + are smaller and harder to reverse-engineer. diff --cc debian/install index d8be591,0000000..bd76304 mode 100644,000000..100644 --- a/debian/install +++ b/debian/install @@@ -1,5 -1,0 +1,5 @@@ +lib/proguard.jar /usr/share/java +lib/proguardgui.jar /usr/share/java - lib/ant-proguard.jar /usr/share/java ++lib/retrace.jar /usr/share/java +proguard /usr/bin +proguardgui /usr/bin diff --cc debian/rules index fac72c2,0000000..56ed3ff mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,28 -1,0 +1,12 @@@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + - include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk ++include /usr/share/cdbs/1/class/ant.mk + - JAVA_COMPILER=javac - JAR=jar - ANTJAR=/usr/share/ant/lib/ant.jar - - build: - mkdir -p build - mkdir -p lib - ${JAVA_COMPILER} -d build/retrace -sourcepath src src/proguard/retrace/ReTrace.java - ${JAVA_COMPILER} -d build/proguard -sourcepath src src/proguard/ProGuard.java - ${JAVA_COMPILER} -d build/proguardgui -cp build/proguard -sourcepath src src/proguard/gui/ProGuardGUI.java - ${JAVA_COMPILER} -d build/proguardtask -sourcepath src -cp ${ANTJAR} src/proguard/ant/ProGuardTask.java src/proguard/ProGuard.java - ${JAR} cfm lib/proguard.jar proguard.manifest -C build/proguard proguard - ${JAR} cfm lib/proguardgui.jar proguardgui.manifest -C build/proguardgui proguard - ${JAR} cfm lib/ant-proguard.jar proguard.manifest -C build/proguardtask proguard - cd src && ${JAR} uf ../lib/proguardgui.jar proguard/gui/vtitle.gif proguard/gui/arrow.gif proguard/gui/default.pro proguard/gui/GUIResources.properties proguard/gui/boilerplate.pro - cd src && ${JAR} uf ../lib/ant-proguard.jar proguard/ant/task.properties - - clean:: - rm -rf build/ - rm -rf lib/ ++JAVA_HOME := /usr/lib/jvm/default-java ++DEB_ANT_BUILDFILE := build/build.xml ++DEB_ANT_BUILD_TARGET := basic anttask ++DEB_ANT_ARGS := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 diff --cc debian/watch index f81904e,0000000..3e2392b mode 100644,000000..100644 --- a/debian/watch +++ b/debian/watch @@@ -1,3 -1,0 +1,3 @@@ +version=3 + - http://sf.net/proguard/proguard([0-9.]*)\.tar\.gz ++http://sf.net/proguard/proguard([\d\.]+)\.tar\.gz -- 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
