From 10751b81060a05b906ae9e13da4a61e79096f5b7 Mon Sep 17 00:00:00 2001
From: ehilsdal <ehilsdal>
Date: Fri, 14 Nov 2003 01:32:52 +0000
Subject: [PATCH] a few inner class cleanups (semantics preserving)

---
 weaver/src/org/aspectj/weaver/Lint.java                       | 4 ++--
 weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java         | 2 +-
 weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java      | 2 +-
 weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java         | 4 ++--
 weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java      | 2 +-
 weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/weaver/src/org/aspectj/weaver/Lint.java b/weaver/src/org/aspectj/weaver/Lint.java
index 8872ca7e6..3b3db4c60 100644
--- 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 a732cf82c..ec4b76b2d 100644
--- 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 3f4c908e9..c05f9b124 100644
--- 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 a9ffd06db..bead0eba3 100644
--- 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 ab4917ce8..5c7ce3181 100644
--- 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 f8566c068..6bfb2a3b5 100644
--- 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();
-- 
2.39.5