removing debug and unused code

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
index 247f04cc7dc67ef99963acb75906ec1ac66814bd..76c9dd30001374d05b72a96e80ea0c5bd48fb968 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
@@ -628,10 +628,6 @@ class BcelClassWeaver implements IClassWeaver {
                                }
                                UnresolvedType parameterType2 = methodParamsArray[p];
 
-                               boolean b2 = !parameterType.resolve(w).equals(parameterType2.resolve(w));
-                               if (b != b2) {
-                                       int stop = 1;
-                               }
                                if (b) { // !parameterType.resolve(w).equals(parameterType2.resolve(w))) {
                                        sameParams = false;
                                }
@@ -2109,7 +2105,7 @@ class BcelClassWeaver implements IClassWeaver {
         * 
         * @param donor the method from which we will copy (and adjust frame and jumps) instructions.
         * @param recipient the method the instructions will go into. Used to get the frame size so we can allocate new frame locations
-        *        for locals in donor.
+        *            for locals in donor.
         * @param frameEnv an environment to map from donor frame to recipient frame, initially populated with argument locations.
         * @param fact an instruction factory for recipient
         */
@@ -2785,17 +2781,17 @@ class BcelClassWeaver implements IClassWeaver {
                        if (canMatch(Shadow.ConstructorCall)) {
                                if (i.opcode == Constants.ANEWARRAY) {
                                        // ANEWARRAY arrayInstruction = (ANEWARRAY)i;
-                                       ObjectType arrayType = i.getLoadClassType(clazz.getConstantPool());
+                                       // ObjectType arrayType = i.getLoadClassType(clazz.getConstantPool());
                                        BcelShadow ctorCallShadow = BcelShadow.makeArrayConstructorCall(world, mg, ih, enclosingShadow);
                                        match(ctorCallShadow, shadowAccumulator);
                                } else if (i.opcode == Constants.NEWARRAY) {
                                        // NEWARRAY arrayInstruction = (NEWARRAY)i;
-                                       Type arrayType = i.getType();
+                                       // Type arrayType = i.getType();
                                        BcelShadow ctorCallShadow = BcelShadow.makeArrayConstructorCall(world, mg, ih, enclosingShadow);
                                        match(ctorCallShadow, shadowAccumulator);
                                } else if (i instanceof MULTIANEWARRAY) {
-                                       MULTIANEWARRAY arrayInstruction = (MULTIANEWARRAY) i;
-                                       ObjectType arrayType = arrayInstruction.getLoadClassType(clazz.getConstantPool());
+                                       // MULTIANEWARRAY arrayInstruction = (MULTIANEWARRAY) i;
+                                       // ObjectType arrayType = arrayInstruction.getLoadClassType(clazz.getConstantPool());
                                        BcelShadow ctorCallShadow = BcelShadow.makeArrayConstructorCall(world, mg, ih, enclosingShadow);
                                        match(ctorCallShadow, shadowAccumulator);
                                }

diff --git a/weaver/src/org/aspectj/weaver/model/AsmRelationshipProvider.java b/weaver/src/org/aspectj/weaver/model/AsmRelationshipProvider.java
index 7f88b83553d2afa8703746bf1cb43112aa07c6e7..b8a0c7ef8555c09fa59a589831d21125ef77bbb7 100644 (file)
--- a/weaver/src/org/aspectj/weaver/model/AsmRelationshipProvider.java
+++ b/weaver/src/org/aspectj/weaver/model/AsmRelationshipProvider.java
@@ -727,12 +727,12 @@ public class AsmRelationshipProvider {
                // do it for itds too
                UnresolvedType[] ts = sig.getParameterTypes();
                pe.setParameterNames(Collections.EMPTY_LIST);
-               String[] pnames = sig.getParameterNames();
+               // String[] pnames = sig.getParameterNames();
                if (ts == null) {
                        pe.setParameterSignatures(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
                } else {
                        List paramSigs = new ArrayList();
-                       List paramNames = new ArrayList();
+                       // List paramNames = new ArrayList();
                        for (int i = 0; i < ts.length; i++) {
                                paramSigs.add(ts[i].getSignature().toCharArray());
                                // paramNames.add(pnames[i]);

diff --git a/weaver/testsrc/org/aspectj/weaver/tools/ReadingAttributes.java b/weaver/testsrc/org/aspectj/weaver/tools/ReadingAttributes.java
index 9d5d9cc9421b08dda0a7ca048077a6f4057136af..aff9ba3131d584723026b363e40ee6b1bb87d9a9 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/tools/ReadingAttributes.java
+++ b/weaver/testsrc/org/aspectj/weaver/tools/ReadingAttributes.java
@@ -37,9 +37,9 @@ public class ReadingAttributes extends TestCase {
                        if (attrs[i].getName().endsWith("WeaverState")) {
                                Unknown u = (Unknown) attrs[i];
                                VersionedDataInputStream vdis = new VersionedDataInputStream(new ByteArrayInputStream(u.getBytes()));
-                               WeaverStateInfo wsi = WeaverStateInfo.read(vdis, null);
-                               System.out.println(wsi);
-                               int stop = 1;
+                               // WeaverStateInfo wsi =
+                               WeaverStateInfo.read(vdis, null);
+                               // System.out.println(wsi);
                        }
                }
                // Method[] meths = jc.getMethods();