a few inner class cleanups (semantics preserving)

diff --git a/weaver/src/org/aspectj/weaver/Lint.java b/weaver/src/org/aspectj/weaver/Lint.java
index 8872ca7e6ee3b52491a2fcff3f0f95be30c81e00..3b3db4c60c2920ce2a3dc1d5f90e11ac0006b34f 100644 (file)
--- a/weaver/src/org/aspectj/weaver/Lint.java
+++ b/weaver/src/org/aspectj/weaver/Lint.java
@@ -29,8 +29,8 @@ import org.aspectj.bridge.Message;
 import org.aspectj.bridge.MessageUtil;
 
 public class Lint {
-       private Map kinds = new HashMap();
-       private World world;
+       /* private */ Map kinds = new HashMap();
+       /* private */ World world;
 
        public final Kind invalidAbsoluteTypeName =
                new Kind("invalidAbsoluteTypeName", "no match for this type name: {0}");

diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
index a732cf82ca9da80344d778e0100074dd4c7f63a2..ec4b76b2d2801d51f56816a42ebfc977dd3de991 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
@@ -130,7 +130,7 @@ public abstract class ResolvedTypeMunger {
        
        
        public static class Kind extends TypeSafeEnum {
-               private Kind(String name, int key) {
+               /* private */ Kind(String name, int key) {
                        super(name, key);
                }
                

diff --git a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
index 3f4c908e92ef8409335f2d7e0093791b13badc04..c05f9b1247f72921842d51d0683748655e231df3 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
+++ b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
@@ -195,7 +195,7 @@ public class ClassPathManager {
        }
 
 
-       private static boolean hasClassExtension(String name) {
+       /* private */ static boolean hasClassExtension(String name) {
                return name.toLowerCase().endsWith((".class"));
        }
 }

diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
index a9ffd06dbf39ac20ebf4e226078eb160c27adc2b..bead0eba35aa4119a29286e73b2b28304629b81b 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
@@ -81,7 +81,7 @@ public final class LazyMethodGen {
     private final String[]        declaredExceptions;
     private final InstructionList body; // leaving null for abstracts
     private final Attribute[]     attributes;
-    private final LazyClassGen    enclosingClass;   
+    /* private */ final LazyClassGen    enclosingClass;   
     private final BcelMethod      memberView;
 
     private int             maxLocals; 
@@ -967,7 +967,7 @@ public final class LazyMethodGen {
     // we implement this with a LinkedList.  We could possibly implement this with a java.util.SortedSet,
     // but I don't trust the only implementation, TreeSet, to do the right thing.
     
-    private static void insertHandler(ExceptionRange fresh, LinkedList l) {
+    /* private */ static void insertHandler(ExceptionRange fresh, LinkedList l) {
 //        for (ListIterator iter = l.listIterator(); iter.hasNext();) {
 //            ExceptionRange r = (ExceptionRange) iter.next();
 //            if (fresh.getPriority() >= r.getPriority()) {

diff --git a/weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java b/weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java
index ab4917ce8c20d43d14008e1542efbc30c0c34a61..5c7ce31814126aef9fb9ee7b584265bf1b5b064b 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java
+++ b/weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java
@@ -131,7 +131,7 @@ public class UnwovenClassFile {
 
 
 
-       private static boolean unchanged(byte[] b1, byte[] b2) {
+       /* private */ static boolean unchanged(byte[] b1, byte[] b2) {
                int len = b1.length;
                if (b2.length != len) return false;
                for (int i=0; i < len; i++) {

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
index f8566c0681abcd348ecc216f3bef10c756322b3c..6bfb2a3b5dc75808ae60817d4b9ef59e298dfe64 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
@@ -73,7 +73,7 @@ public class ArgsWeaveTestCase extends WeaveTestCase {
         weaveTest("HelloWorld", "ArgsBeforeAfterHelloWorld", addLexicalOrder(l));        
     }    
 
-       private InstructionList getArgsAdviceTag(BcelShadow shadow, String where) {
+       /* private */ InstructionList getArgsAdviceTag(BcelShadow shadow, String where) {
                String methodName =
                        "ajc_" + where + "_" + shadow.getKind().toLegalJavaIdentifier();
                InstructionFactory fact = shadow.getFactory();