Upgrade from Progaurd 4.4 to 4.7.

Change-Id: Ie185d0be411a80cc6a330cafa8547252a7dc1d9c

You can find the changelog here
http://proguard.sourceforge.net/#downloads.html

1 files changed, 40 insertions, 9 deletions

diff --git a/src/proguard/classfile/editor/MemberAdder.java b/src/proguard/classfile/editor/MemberAdder.java
index 5f939bb..7791e3b 100644
--- a/src/proguard/classfile/editor/MemberAdder.java
+++ b/src/proguard/classfile/editor/MemberAdder.java
@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2011 Eric Lafortune (eric@graphics.cornell.edu)
  *
  * 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
@@ -26,8 +26,9 @@ import proguard.classfile.util.SimplifiedVisitor;
 import proguard.classfile.visitor.MemberVisitor;
 
 /**
- * This ConstantVisitor adds all class members that it visits to the given
- * target class.
+ * This MemberVisitor copies all class members that it visits to the given
+ * target class. Their visitor info is set to the class members from which they
+ * were copied.
  *
  * @author Eric Lafortune
  */
@@ -45,8 +46,9 @@ implements   MemberVisitor
     private static final Attribute[] EMPTY_ATTRIBUTES = new Attribute[0];
 
 
-    private final ProgramClass targetClass;
-//    private final boolean      addFields;
+    private final ProgramClass  targetClass;
+//  private final boolean       addFields;
+    private final MemberVisitor extraMemberVisitor;
 
     private final ConstantAdder      constantAdder;
     private final ClassEditor        classEditor;
@@ -59,13 +61,30 @@ implements   MemberVisitor
      * @param targetClass the class to which all visited class members will be
      *                    added.
      */
+    public MemberAdder(ProgramClass targetClass)
+    {
+        this(targetClass, null);
+    }
+
+
+    /**
+     * Creates a new MemberAdder that will copy methods into the given target
+     * class.
+     * @param targetClass        the class to which all visited class members
+     *                           will be added.
+     * @param extraMemberVisitor an optional member visitor that visits each
+     *                           new member right after it has been added. This
+     *                           allows changing the visitor info, for instance.
+     */
 //     * @param addFields   specifies whether fields should be added, or fused
 //     *                    with the present fields.
-    public MemberAdder(ProgramClass targetClass)//),
-//                       boolean      addFields)
+    public MemberAdder(ProgramClass  targetClass,
+//                     boolean       addFields,
+                       MemberVisitor extraMemberVisitor)
     {
-        this.targetClass = targetClass;
-//        this.addFields   = addFields;
+        this.targetClass        = targetClass;
+//      this.addFields          = addFields;
+        this.extraMemberVisitor = extraMemberVisitor;
 
         constantAdder      = new ConstantAdder(targetClass);
         classEditor        = new ClassEditor(targetClass);
@@ -150,6 +169,12 @@ implements   MemberVisitor
 
         // Add the completed field.
         classEditor.addField(newProgramField);
+
+        // Visit the newly added field, if necessary.
+        if (extraMemberVisitor != null)
+        {
+            extraMemberVisitor.visitProgramField(targetClass, newProgramField);
+        }
     }
 
 
@@ -240,6 +265,12 @@ implements   MemberVisitor
 
         // Add the completed method.
         classEditor.addMethod(newProgramMethod);
+
+        // Visit the newly added method, if necessary.
+        if (extraMemberVisitor != null)
+        {
+            extraMemberVisitor.visitProgramMethod(targetClass, newProgramMethod);
+        }
     }