~ubuntu-branches/ubuntu/gutsy/proguard/gutsy

Viewing changes to src/proguard/classfile/editor/MethodInvocationFixer.java

Committer: Bazaar Package Importer
Author(s): Sam Clegg
Date: 2007-01-13 12:27:45 UTC
mfrom: (1.1.2 upstream)
Revision ID: james.westby@ubuntu.com-20070113122745-9nq3v1qcdr02o8xd

Tags: 3.7-1

http://bugs.debian.org/360115

http://bugs.debian.org/364962

* New upstream release
* debian/control: make Arch: all (Closes: #360115)
* use "$@" rather then $* in shell startup scripts (Closes: #364962)

files added:
debian/docs

docs/favicon.ico

src/proguard/DuplicateClassFilePrinter.java

src/proguard/Initializer.java

src/proguard/InputReader.java

src/proguard/OutputWriter.java

src/proguard/classfile/editor/InstructionWriter.java

src/proguard/classfile/util/WarningPrinter.java

src/proguard/classfile/visitor/ClassFilePresenceFilter.java

src/proguard/classfile/visitor/ClassFileVersionCounter.java

src/proguard/classfile/visitor/ClassForNameClassFileVisitor.java

src/proguard/classfile/visitor/DotClassClassFileVisitor.java

src/proguard/classfile/visitor/MemberInfoClassFileAccessFilter.java

files modified:
README

debian/changelog

debian/control

docs/FAQ.html

docs/GPL_exception.html

docs/acknowledgements.html

docs/alternatives.html

docs/downloads.html

docs/feedback.html

docs/index.html

docs/license.html

docs/main.html

docs/manual/ant.html

docs/manual/examples.html

docs/manual/gui.html

docs/manual/index.html

docs/manual/introduction.html

docs/manual/limitations.html

docs/manual/refcard.html

docs/manual/retrace/examples.html

docs/manual/retrace/index.html

docs/manual/retrace/introduction.html

docs/manual/retrace/usage.html

docs/manual/style.css

docs/manual/troubleshooting.html

docs/manual/usage.html

docs/manual/wtk.html

docs/quality.html

docs/results.html

docs/screenshots.html

docs/style.css

docs/testimonials.html

docs/title.html

examples/ant/applets.xml

examples/ant/applications1.xml

examples/ant/applications2.xml

examples/ant/applications3.xml

examples/ant/library.xml

examples/ant/servlets.xml

examples/applets.pro

examples/applications.pro

examples/library.pro

examples/servlets.pro

proguard

proguardgui

src/proguard/ArgumentWordReader.java

src/proguard/ClassMemberSpecification.java

src/proguard/ClassPath.java

src/proguard/ClassPathEntry.java

src/proguard/ClassSpecification.java

src/proguard/ClassSpecificationVisitorFactory.java

src/proguard/Configuration.java

src/proguard/ConfigurationConstants.java

src/proguard/ConfigurationParser.java

src/proguard/ConfigurationWriter.java

src/proguard/DataEntryReaderFactory.java

src/proguard/DataEntryWriterFactory.java

src/proguard/FileWordReader.java

src/proguard/GPL.java

src/proguard/ParseException.java

src/proguard/ProGuard.java

src/proguard/SubclassedClassFileFilter.java

src/proguard/WordReader.java

src/proguard/ant/ClassMemberSpecificationElement.java

src/proguard/ant/ClassPathElement.java

src/proguard/ant/ClassSpecificationElement.java

src/proguard/ant/ConfigurationElement.java

src/proguard/ant/ConfigurationTask.java

src/proguard/ant/KeepAttributeElement.java

src/proguard/ant/ProGuardTask.java

src/proguard/classfile/ClassConstants.java

src/proguard/classfile/ClassCpInfo.java

src/proguard/classfile/ClassFile.java

src/proguard/classfile/ClassPool.java

src/proguard/classfile/CpInfo.java

src/proguard/classfile/DoubleCpInfo.java

src/proguard/classfile/FieldInfo.java

src/proguard/classfile/FieldrefCpInfo.java

src/proguard/classfile/FloatCpInfo.java

src/proguard/classfile/IntegerCpInfo.java

src/proguard/classfile/InterfaceMethodrefCpInfo.java

src/proguard/classfile/LibraryClassFile.java

src/proguard/classfile/LibraryFieldInfo.java

src/proguard/classfile/LibraryMemberInfo.java

src/proguard/classfile/LibraryMethodInfo.java

src/proguard/classfile/LongCpInfo.java

src/proguard/classfile/MemberInfo.java

src/proguard/classfile/MethodInfo.java

src/proguard/classfile/MethodrefCpInfo.java

src/proguard/classfile/NameAndTypeCpInfo.java

src/proguard/classfile/ProgramClassFile.java

src/proguard/classfile/ProgramFieldInfo.java

src/proguard/classfile/ProgramMemberInfo.java

src/proguard/classfile/ProgramMethodInfo.java

src/proguard/classfile/RefCpInfo.java

src/proguard/classfile/StringCpInfo.java

src/proguard/classfile/Utf8CpInfo.java

src/proguard/classfile/VisitorAccepter.java

src/proguard/classfile/attribute/AttrInfo.java

src/proguard/classfile/attribute/AttrInfoVisitor.java

src/proguard/classfile/attribute/CodeAttrInfo.java

src/proguard/classfile/attribute/DeprecatedAttrInfo.java

src/proguard/classfile/attribute/EnclosingMethodAttrInfo.java

src/proguard/classfile/attribute/ExceptionInfo.java

src/proguard/classfile/attribute/ExceptionInfoVisitor.java

src/proguard/classfile/attribute/ExceptionsAttrInfo.java

src/proguard/classfile/attribute/InnerClassesAttrInfo.java

src/proguard/classfile/attribute/InnerClassesInfo.java

src/proguard/classfile/attribute/InnerClassesInfoVisitor.java

src/proguard/classfile/attribute/LibraryAttrInfo.java

src/proguard/classfile/attribute/LineNumberInfo.java

src/proguard/classfile/attribute/LineNumberTableAttrInfo.java

src/proguard/classfile/attribute/LocalVariableInfo.java

src/proguard/classfile/attribute/LocalVariableInfoVisitor.java

src/proguard/classfile/attribute/LocalVariableTableAttrInfo.java

src/proguard/classfile/attribute/LocalVariableTypeInfo.java

src/proguard/classfile/attribute/LocalVariableTypeInfoVisitor.java

src/proguard/classfile/attribute/LocalVariableTypeTableAttrInfo.java

src/proguard/classfile/attribute/MultiAttrInfoVisitor.java

src/proguard/classfile/attribute/SignatureAttrInfo.java

src/proguard/classfile/attribute/SourceDirAttrInfo.java

src/proguard/classfile/attribute/SourceFileAttrInfo.java

src/proguard/classfile/attribute/SyntheticAttrInfo.java

src/proguard/classfile/attribute/UnknownAttrInfo.java

src/proguard/classfile/attribute/annotation/Annotation.java

src/proguard/classfile/attribute/annotation/AnnotationDefaultAttrInfo.java

src/proguard/classfile/attribute/annotation/AnnotationElementValue.java

src/proguard/classfile/attribute/annotation/AnnotationVisitor.java

src/proguard/classfile/attribute/annotation/ArrayElementValue.java

src/proguard/classfile/attribute/annotation/ClassElementValue.java

src/proguard/classfile/attribute/annotation/ConstantElementValue.java

src/proguard/classfile/attribute/annotation/ElementValue.java

src/proguard/classfile/attribute/annotation/ElementValueVisitor.java

src/proguard/classfile/attribute/annotation/EnumConstantElementValue.java

src/proguard/classfile/attribute/annotation/RuntimeAnnotationsAttrInfo.java

src/proguard/classfile/attribute/annotation/RuntimeInvisibleAnnotationsAttrInfo.java

src/proguard/classfile/attribute/annotation/RuntimeInvisibleParameterAnnotationsAttrInfo.java

src/proguard/classfile/attribute/annotation/RuntimeParameterAnnotationsAttrInfo.java

src/proguard/classfile/attribute/annotation/RuntimeVisibleAnnotationsAttrInfo.java

src/proguard/classfile/attribute/annotation/RuntimeVisibleParameterAnnotationsAttrInfo.java

src/proguard/classfile/editor/ClassFileReferenceFixer.java

src/proguard/classfile/editor/CodeAttrInfoEditor.java

src/proguard/classfile/editor/CodeAttrInfoEditorResetter.java

src/proguard/classfile/editor/ComparableCpInfo.java

src/proguard/classfile/editor/ConstantPoolEditor.java

src/proguard/classfile/editor/ConstantPoolRemapper.java

src/proguard/classfile/editor/ConstantPoolSorter.java

src/proguard/classfile/editor/MemberReferenceFixer.java

src/proguard/classfile/editor/MethodInvocationFixer.java

src/proguard/classfile/editor/StackSizeUpdater.java

src/proguard/classfile/editor/VariableEditor.java

src/proguard/classfile/editor/VariableRemapper.java

src/proguard/classfile/instruction/BranchInstruction.java

src/proguard/classfile/instruction/CpInstruction.java

src/proguard/classfile/instruction/Instruction.java

src/proguard/classfile/instruction/InstructionCounter.java

src/proguard/classfile/instruction/InstructionFactory.java

src/proguard/classfile/instruction/InstructionVisitor.java

src/proguard/classfile/instruction/LookUpSwitchInstruction.java

src/proguard/classfile/instruction/MultiInstructionVisitor.java

src/proguard/classfile/instruction/SimpleInstruction.java

src/proguard/classfile/instruction/TableSwitchInstruction.java

src/proguard/classfile/instruction/VariableInstruction.java

src/proguard/classfile/util/AccessUtil.java

src/proguard/classfile/util/ClassFileClassForNameReferenceInitializer.java

src/proguard/classfile/util/ClassFileHierarchyInitializer.java

src/proguard/classfile/util/ClassFileReferenceInitializer.java

src/proguard/classfile/util/ClassForNameChecker.java

src/proguard/classfile/util/ClassNewInstanceChecker.java

src/proguard/classfile/util/ClassUtil.java

src/proguard/classfile/util/DescriptorClassEnumeration.java

src/proguard/classfile/util/ExternalTypeEnumeration.java

src/proguard/classfile/util/InternalTypeEnumeration.java

src/proguard/classfile/util/MemberFinder.java

src/proguard/classfile/util/MethodInfoLinker.java

src/proguard/classfile/visitor/AllClassFileVisitor.java

src/proguard/classfile/visitor/AllCpInfoVisitor.java

src/proguard/classfile/visitor/AllFieldVisitor.java

src/proguard/classfile/visitor/AllMemberInfoVisitor.java

src/proguard/classfile/visitor/AllMethodVisitor.java

src/proguard/classfile/visitor/BottomClassFileFilter.java

src/proguard/classfile/visitor/ClassCounter.java

src/proguard/classfile/visitor/ClassFileAccessFilter.java

src/proguard/classfile/visitor/ClassFileCleaner.java

src/proguard/classfile/visitor/ClassFileHierarchyTraveler.java

src/proguard/classfile/visitor/ClassFileMemberInfoVisitor.java

src/proguard/classfile/visitor/ClassFileNameFilter.java

src/proguard/classfile/visitor/ClassFilePrinter.java

src/proguard/classfile/visitor/ClassFileVisitor.java

src/proguard/classfile/visitor/ClassPoolFiller.java

src/proguard/classfile/visitor/ClassPoolVisitor.java

src/proguard/classfile/visitor/ConcreteClassFileDownTraveler.java

src/proguard/classfile/visitor/CpInfoVisitor.java

src/proguard/classfile/visitor/LibraryClassFileFilter.java

src/proguard/classfile/visitor/LibraryMemberInfoFilter.java

src/proguard/classfile/visitor/LineNumberInfoVisitor.java

src/proguard/classfile/visitor/MemberCounter.java

src/proguard/classfile/visitor/MemberInfoAccessFilter.java

src/proguard/classfile/visitor/MemberInfoDescriptorFilter.java

src/proguard/classfile/visitor/MemberInfoNameFilter.java

src/proguard/classfile/visitor/MemberInfoVisitor.java

src/proguard/classfile/visitor/MethodImplementationFilter.java

src/proguard/classfile/visitor/MethodImplementationTraveler.java

src/proguard/classfile/visitor/MultiClassFileVisitor.java

src/proguard/classfile/visitor/MultiMemberInfoVisitor.java

src/proguard/classfile/visitor/NamedClassFileVisitor.java

src/proguard/classfile/visitor/NamedFieldVisitor.java

src/proguard/classfile/visitor/NamedMethodVisitor.java

src/proguard/classfile/visitor/ProgramClassFileFilter.java

src/proguard/classfile/visitor/ProgramMemberInfoFilter.java

src/proguard/classfile/visitor/ReferencedClassFileVisitor.java

src/proguard/classfile/visitor/SimpleClassFilePrinter.java

src/proguard/classfile/visitor/VariableClassFileVisitor.java

src/proguard/classfile/visitor/VariableMemberInfoVisitor.java

src/proguard/gui/ClassMemberSpecificationDialog.java

src/proguard/gui/ClassMemberSpecificationsPanel.java

src/proguard/gui/ClassPathPanel.java

src/proguard/gui/ClassSpecificationDialog.java

src/proguard/gui/ClassSpecificationsPanel.java

src/proguard/gui/ExtensionFileFilter.java

src/proguard/gui/FilterDialog.java

src/proguard/gui/GUIResources.java

src/proguard/gui/GUIResources.properties

src/proguard/gui/ListPanel.java

src/proguard/gui/MessageDialogRunnable.java

src/proguard/gui/ProGuardGUI.java

src/proguard/gui/ProGuardRunnable.java

src/proguard/gui/ReTraceRunnable.java

src/proguard/gui/SwingUtil.java

src/proguard/gui/TabbedPane.java

src/proguard/gui/TextAreaOutputStream.java

src/proguard/gui/boilerplate.pro

src/proguard/gui/default.pro

src/proguard/gui/splash/BufferedSprite.java

src/proguard/gui/splash/CircleSprite.java

src/proguard/gui/splash/ClipSprite.java

src/proguard/gui/splash/CompositeSprite.java

src/proguard/gui/splash/ImageSprite.java

src/proguard/gui/splash/LinearColor.java

src/proguard/gui/splash/LinearDouble.java

src/proguard/gui/splash/LinearInt.java

src/proguard/gui/splash/LinearTiming.java

src/proguard/gui/splash/OverrideGraphics2D.java

src/proguard/gui/splash/RectangleSprite.java

src/proguard/gui/splash/SawToothTiming.java

src/proguard/gui/splash/ShadowedSprite.java

src/proguard/gui/splash/SineTiming.java

src/proguard/gui/splash/SmoothTiming.java

src/proguard/gui/splash/SplashPanel.java

src/proguard/gui/splash/Sprite.java

src/proguard/gui/splash/TextSprite.java

src/proguard/gui/splash/TimeSwitchSprite.java

src/proguard/gui/splash/Timing.java

src/proguard/gui/splash/TypeWriterString.java

src/proguard/gui/splash/VariableColor.java

src/proguard/gui/splash/VariableDouble.java

src/proguard/gui/splash/VariableFont.java

src/proguard/gui/splash/VariableInt.java

src/proguard/gui/splash/VariableSizeFont.java

src/proguard/gui/splash/VariableString.java

src/proguard/io/CascadingDataEntryWriter.java

src/proguard/io/ClassFileFilter.java

src/proguard/io/ClassFileReader.java

src/proguard/io/ClassFileRewriter.java

src/proguard/io/DataEntry.java

src/proguard/io/DataEntryCopier.java

src/proguard/io/DataEntryPump.java

src/proguard/io/DataEntryReader.java

src/proguard/io/DataEntryWriter.java

src/proguard/io/DirectoryPump.java

src/proguard/io/DirectoryWriter.java

src/proguard/io/FileDataEntry.java

src/proguard/io/FilteredDataEntryReader.java

src/proguard/io/FilteredDataEntryWriter.java

src/proguard/io/Finisher.java

src/proguard/io/JarReader.java

src/proguard/io/JarWriter.java

src/proguard/io/ParentDataEntryWriter.java

src/proguard/io/RenamedDataEntry.java

src/proguard/io/ZipDataEntry.java

src/proguard/obfuscate/AttributeShrinker.java

src/proguard/obfuscate/AttributeUsageMarker.java

src/proguard/obfuscate/ClassFileObfuscator.java

src/proguard/obfuscate/ClassFileOpener.java

src/proguard/obfuscate/ClassFileRenamer.java

src/proguard/obfuscate/DictionaryNameFactory.java

src/proguard/obfuscate/MapCleaner.java

src/proguard/obfuscate/MappingKeeper.java

src/proguard/obfuscate/MappingPrinter.java

src/proguard/obfuscate/MappingProcessor.java

src/proguard/obfuscate/MappingReader.java

src/proguard/obfuscate/MemberInfoNameCleaner.java

src/proguard/obfuscate/MemberInfoNameCollector.java

src/proguard/obfuscate/MemberInfoNameConflictFilter.java

src/proguard/obfuscate/MemberInfoObfuscator.java

src/proguard/obfuscate/MemberInfoSpecialNameFilter.java

src/proguard/obfuscate/MultiMappingProcessor.java

src/proguard/obfuscate/NameAndTypeShrinker.java

src/proguard/obfuscate/NameAndTypeUsageMarker.java

src/proguard/obfuscate/NameFactory.java

src/proguard/obfuscate/NameFactoryResetter.java

src/proguard/obfuscate/NameMarker.java

src/proguard/obfuscate/Obfuscator.java

src/proguard/obfuscate/SimpleNameFactory.java

src/proguard/obfuscate/SourceFileRenamer.java

src/proguard/obfuscate/SpecialNameFactory.java

src/proguard/obfuscate/Utf8Shrinker.java

src/proguard/obfuscate/Utf8UsageMarker.java

src/proguard/optimize/ChangedCodePrinter.java

src/proguard/optimize/KeepMarker.java

src/proguard/optimize/MethodOptimizationInfo.java

src/proguard/optimize/MethodOptimizationInfoSetter.java

src/proguard/optimize/NoSideEffectMethodMarker.java

src/proguard/optimize/NonPrivateMethodMarker.java

src/proguard/optimize/Optimizer.java

src/proguard/optimize/ParameterShrinker.java

src/proguard/optimize/ParameterUsageMarker.java

src/proguard/optimize/SideEffectInstructionChecker.java

src/proguard/optimize/SideEffectMethodMarker.java

src/proguard/optimize/VariableUsageMarker.java

src/proguard/optimize/WriteOnlyFieldFilter.java

src/proguard/optimize/WriteOnlyFieldMarker.java

src/proguard/optimize/evaluation/BranchUnit.java

src/proguard/optimize/evaluation/EvaluationSimplifier.java

src/proguard/optimize/evaluation/PartialEvaluator.java

src/proguard/optimize/evaluation/Processor.java

src/proguard/optimize/evaluation/Stack.java

src/proguard/optimize/evaluation/TracedBranchUnit.java

src/proguard/optimize/evaluation/TracedStack.java

src/proguard/optimize/evaluation/TracedVariables.java

src/proguard/optimize/evaluation/UnusedParameterCleaner.java

src/proguard/optimize/evaluation/Variables.java

src/proguard/optimize/evaluation/value/Category1Value.java

src/proguard/optimize/evaluation/value/Category2Value.java

src/proguard/optimize/evaluation/value/DoubleValue.java

src/proguard/optimize/evaluation/value/DoubleValueFactory.java

src/proguard/optimize/evaluation/value/FloatValue.java

src/proguard/optimize/evaluation/value/FloatValueFactory.java

src/proguard/optimize/evaluation/value/InstructionOffsetValue.java

src/proguard/optimize/evaluation/value/InstructionOffsetValueFactory.java

src/proguard/optimize/evaluation/value/IntegerValue.java

src/proguard/optimize/evaluation/value/IntegerValueFactory.java

src/proguard/optimize/evaluation/value/LongValue.java

src/proguard/optimize/evaluation/value/LongValueFactory.java

src/proguard/optimize/evaluation/value/ReferenceValue.java

src/proguard/optimize/evaluation/value/ReferenceValueFactory.java

src/proguard/optimize/evaluation/value/SpecificArrayReferenceValue.java

src/proguard/optimize/evaluation/value/SpecificDoubleValue.java

src/proguard/optimize/evaluation/value/SpecificFloatValue.java

src/proguard/optimize/evaluation/value/SpecificIntegerValue.java

src/proguard/optimize/evaluation/value/SpecificLongValue.java

src/proguard/optimize/evaluation/value/SpecificReferenceValue.java

src/proguard/optimize/evaluation/value/Value.java

src/proguard/optimize/evaluation/value/ValueFactory.java

src/proguard/optimize/peephole/BranchTargetFinder.java

src/proguard/optimize/peephole/ClassFileFinalizer.java

src/proguard/optimize/peephole/GetterSetterInliner.java

src/proguard/optimize/peephole/GotoCommonCodeReplacer.java

src/proguard/optimize/peephole/GotoGotoReplacer.java

src/proguard/optimize/peephole/GotoReturnReplacer.java

src/proguard/optimize/peephole/LoadStoreRemover.java

src/proguard/optimize/peephole/MethodPrivatizer.java

src/proguard/optimize/peephole/NopRemover.java

src/proguard/optimize/peephole/PushPopRemover.java

src/proguard/optimize/peephole/SingleImplementationFixer.java

src/proguard/optimize/peephole/SingleImplementationInliner.java

src/proguard/optimize/peephole/SingleImplementationMarker.java

src/proguard/optimize/peephole/StoreLoadReplacer.java

src/proguard/retrace/ReTrace.java

src/proguard/retrace/StackTrace.java

src/proguard/retrace/StackTraceItem.java

src/proguard/shrink/ClassFileShrinker.java

src/proguard/shrink/InnerUsageMarker.java

src/proguard/shrink/InterfaceUsageMarker.java

src/proguard/shrink/ShortestUsageMark.java

src/proguard/shrink/ShortestUsageMarker.java

src/proguard/shrink/ShortestUsagePrinter.java

src/proguard/shrink/Shrinker.java

src/proguard/shrink/UsageMarker.java

src/proguard/shrink/UsagePrinter.java

src/proguard/shrink/UsedClassFileFilter.java

src/proguard/util/BasicListMatcher.java

src/proguard/util/BasicMatcher.java

src/proguard/util/ClassNameListMatcher.java

src/proguard/util/ClassNameMatcher.java

src/proguard/util/ExtensionMatcher.java

src/proguard/util/FileNameListMatcher.java

src/proguard/util/FileNameMatcher.java

src/proguard/util/ListUtil.java

src/proguard/wtk/ProGuardObfuscator.java

Show diffs side-by-side

added added

removed removed

src/proguard/classfile/editor/MethodInvocationFixer.java

/* $Id: MethodInvocationFixer.java,v 1.4 2005/08/13 21:01:04 eric Exp $

/* $Id: MethodInvocationFixer.java,v 1.4.2.2 2006/03/28 22:03:59 eric Exp $

* ProGuard -- shrinking, optimization, and obfuscation of Java class files.

* This program is free software; you can redistribute it and/or modify it

* under the terms of the GNU General Public License as published by the Free

212

213

public void visitClassCpInfo(ClassFile classFile, ClassCpInfo classCpInfo)

214

{

215

// Check if this class entry refers to an interface class.

216

ClassFile referencedClassFile = classCpInfo.referencedClassFile;

217

if (referencedClassFile != null)

218

{

219

isInterfaceMethod = (referencedClassFile.getAccessFlags() & ClassConstants.INTERNAL_ACC_INTERFACE) != 0;

215

// Check if this class entry is an array type.

216

if (ClassUtil.isInternalArrayType(classCpInfo.getName(classFile)))

217

{

218

isInterfaceMethod = false;

219

}

220

else

221

{

222

// Check if this class entry refers to an interface class.

223

ClassFile referencedClassFile = classCpInfo.referencedClassFile;

224

if (referencedClassFile != null)

225

{

226

isInterfaceMethod = (referencedClassFile.getAccessFlags() & ClassConstants.INTERNAL_ACC_INTERFACE) != 0;

227

}

220

228

}

221

229

}

222

230

Older »