From bd786b079b05d0dccd7bbe4ee871b06ddd84fb48 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 13 Apr 2005 15:45:12 +0000
Subject: [PATCH] From The Branch: Alex's changes in the weaver module to avoid
 use of the default package where inappropriate.

---
 weaver/testsrc/BcweaverModuleTests.java                     | 1 +
 weaver/testsrc/{ => org/aspectj/weaver}/LocaleTest.java     | 2 ++
 .../org/aspectj/weaver/bcel/AroundWeaveTestCase.java        | 4 ++--
 weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java | 3 ++-
 weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java   | 5 +++++
 weaver/testsrc/{ => org/aspectj/weaver/test}/Aspect.java    | 2 +-
 .../{ => org/aspectj/weaver/test}/DynamicHelloWorld.java    | 6 ++++++
 .../{ => org/aspectj/weaver/test}/FancyHelloWorld.java      | 2 ++
 .../{ => org/aspectj/weaver/test}/FieldyHelloWorld.java     | 2 ++
 .../testsrc/{ => org/aspectj/weaver/test}/HelloWorld.java   | 2 ++
 .../{ => org/aspectj/weaver/test}/MultiArgHelloWorld.java   | 2 +-
 weaver/testsrc/{ => org/aspectj/weaver/test}/Test.java      | 2 ++
 .../testsrc/{ => org/aspectj/weaver/test}/TestSwitchy.java  | 2 ++
 13 files changed, 30 insertions(+), 5 deletions(-)
 rename weaver/testsrc/{ => org/aspectj/weaver}/LocaleTest.java (96%)
 rename weaver/testsrc/{ => org/aspectj/weaver/test}/Aspect.java (99%)
 rename weaver/testsrc/{ => org/aspectj/weaver/test}/DynamicHelloWorld.java (74%)
 rename weaver/testsrc/{ => org/aspectj/weaver/test}/FancyHelloWorld.java (93%)
 rename weaver/testsrc/{ => org/aspectj/weaver/test}/FieldyHelloWorld.java (85%)
 rename weaver/testsrc/{ => org/aspectj/weaver/test}/HelloWorld.java (86%)
 rename weaver/testsrc/{ => org/aspectj/weaver/test}/MultiArgHelloWorld.java (86%)
 rename weaver/testsrc/{ => org/aspectj/weaver/test}/Test.java (86%)
 rename weaver/testsrc/{ => org/aspectj/weaver/test}/TestSwitchy.java (95%)

diff --git a/weaver/testsrc/BcweaverModuleTests.java b/weaver/testsrc/BcweaverModuleTests.java
index 86f70c5f7..de2eeceac 100644
--- a/weaver/testsrc/BcweaverModuleTests.java
+++ b/weaver/testsrc/BcweaverModuleTests.java
@@ -12,6 +12,7 @@
 
 // default package
 
+import org.aspectj.weaver.LocaleTest;
 import org.aspectj.weaver.tools.ToolsTests;
 
 import junit.framework.*;
diff --git a/weaver/testsrc/LocaleTest.java b/weaver/testsrc/org/aspectj/weaver/LocaleTest.java
similarity index 96%
rename from weaver/testsrc/LocaleTest.java
rename to weaver/testsrc/org/aspectj/weaver/LocaleTest.java
index 2ed013a40..fc6518237 100644
--- a/weaver/testsrc/LocaleTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/LocaleTest.java
@@ -1,3 +1,5 @@
+package org.aspectj.weaver;
+
 import java.io.IOException;
 import java.util.Locale;
 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/AroundWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/AroundWeaveTestCase.java
index 543f1dfe8..983acc4a9 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/AroundWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/AroundWeaveTestCase.java
@@ -46,8 +46,8 @@ public class AroundWeaveTestCase extends WeaveTestCase {
 
 
     private BcelAdvice makeAroundMunger(final boolean matchOnlyPrintln) {
-        BcelWorld world = new BcelWorld();
-        final Member sig = 
+        BcelWorld world = super.world;
+        final Member sig =
             Member.method(
                 TypeX.forName("Aspect"),
                 Modifier.STATIC,
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
index be97540e6..05f5610ae 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
@@ -24,7 +24,8 @@ public class UtilityTestCase extends TestCase {
 
     public void disassembleTest(String name) throws IOException {
         BcelWorld world = new BcelWorld("../weaver/bin");
-        
+        world.addPath(WeaveTestCase.classDir);
+
         LazyClassGen clazz = new LazyClassGen(BcelWorld.getBcelObjectType(world.resolve(name)));
         clazz.print();
         System.out.println();
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
index d14176891..5a78845cc 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
@@ -33,6 +33,9 @@ public abstract class WeaveTestCase extends TestCase {
     String outDirPath;
     	
 	public BcelWorld world = new BcelWorld();
+    {
+        world.addPath(classDir);
+    }
 
     public WeaveTestCase(String name) {
         super(name);
@@ -118,6 +121,8 @@ public abstract class WeaveTestCase extends TestCase {
 			+ File.pathSeparator
 			+ getTraceJar() 
 			+ File.pathSeparator
+            + classDir
+            + File.pathSeparator
 			+ System.getProperty("java.class.path");
    	}
    	
diff --git a/weaver/testsrc/Aspect.java b/weaver/testsrc/org/aspectj/weaver/test/Aspect.java
similarity index 99%
rename from weaver/testsrc/Aspect.java
rename to weaver/testsrc/org/aspectj/weaver/test/Aspect.java
index 1447c5335..cd4430283 100644
--- a/weaver/testsrc/Aspect.java
+++ b/weaver/testsrc/org/aspectj/weaver/test/Aspect.java
@@ -20,7 +20,7 @@
  *
  * Contributor(s):
  */
-
+package org.aspectj.weaver.test;
 import java.util.*;
 
 import org.aspectj.runtime.internal.*;
diff --git a/weaver/testsrc/DynamicHelloWorld.java b/weaver/testsrc/org/aspectj/weaver/test/DynamicHelloWorld.java
similarity index 74%
rename from weaver/testsrc/DynamicHelloWorld.java
rename to weaver/testsrc/org/aspectj/weaver/test/DynamicHelloWorld.java
index f3818050e..0e10e644a 100644
--- a/weaver/testsrc/DynamicHelloWorld.java
+++ b/weaver/testsrc/org/aspectj/weaver/test/DynamicHelloWorld.java
@@ -1,7 +1,13 @@
+package org.aspectj.weaver.test;
+
 import java.io.*;
 import java.util.*;
 
 /**
+ * FIXME regen with an Eclipse 2.1 the testdata/bin with this new package
+ * same for all classes in that package
+ * and update tests then (pointcuts etc)
+ *
  * @version 	1.0
  * @author
  */
diff --git a/weaver/testsrc/FancyHelloWorld.java b/weaver/testsrc/org/aspectj/weaver/test/FancyHelloWorld.java
similarity index 93%
rename from weaver/testsrc/FancyHelloWorld.java
rename to weaver/testsrc/org/aspectj/weaver/test/FancyHelloWorld.java
index 96bd4a067..5fb2577a0 100644
--- a/weaver/testsrc/FancyHelloWorld.java
+++ b/weaver/testsrc/org/aspectj/weaver/test/FancyHelloWorld.java
@@ -1,3 +1,5 @@
+package org.aspectj.weaver.test;
+
 import java.io.PrintStream;
 
 /**
diff --git a/weaver/testsrc/FieldyHelloWorld.java b/weaver/testsrc/org/aspectj/weaver/test/FieldyHelloWorld.java
similarity index 85%
rename from weaver/testsrc/FieldyHelloWorld.java
rename to weaver/testsrc/org/aspectj/weaver/test/FieldyHelloWorld.java
index b5502abf8..0ddd5e3bd 100644
--- a/weaver/testsrc/FieldyHelloWorld.java
+++ b/weaver/testsrc/org/aspectj/weaver/test/FieldyHelloWorld.java
@@ -1,3 +1,5 @@
+package org.aspectj.weaver.test;
+
 public class FieldyHelloWorld {
 
 	public static String str = "Hello";
diff --git a/weaver/testsrc/HelloWorld.java b/weaver/testsrc/org/aspectj/weaver/test/HelloWorld.java
similarity index 86%
rename from weaver/testsrc/HelloWorld.java
rename to weaver/testsrc/org/aspectj/weaver/test/HelloWorld.java
index b296ba704..f8da9b040 100644
--- a/weaver/testsrc/HelloWorld.java
+++ b/weaver/testsrc/org/aspectj/weaver/test/HelloWorld.java
@@ -1,3 +1,5 @@
+package org.aspectj.weaver.test;
+
 /**
  * @version 	1.0
  * @author
diff --git a/weaver/testsrc/MultiArgHelloWorld.java b/weaver/testsrc/org/aspectj/weaver/test/MultiArgHelloWorld.java
similarity index 86%
rename from weaver/testsrc/MultiArgHelloWorld.java
rename to weaver/testsrc/org/aspectj/weaver/test/MultiArgHelloWorld.java
index 9fccf0ec6..d47fd4b93 100644
--- a/weaver/testsrc/MultiArgHelloWorld.java
+++ b/weaver/testsrc/org/aspectj/weaver/test/MultiArgHelloWorld.java
@@ -1,4 +1,4 @@
-
+package org.aspectj.weaver.test;
 
 public class MultiArgHelloWorld {
 
diff --git a/weaver/testsrc/Test.java b/weaver/testsrc/org/aspectj/weaver/test/Test.java
similarity index 86%
rename from weaver/testsrc/Test.java
rename to weaver/testsrc/org/aspectj/weaver/test/Test.java
index 97f37d943..74ad97eb9 100644
--- a/weaver/testsrc/Test.java
+++ b/weaver/testsrc/org/aspectj/weaver/test/Test.java
@@ -1,3 +1,5 @@
+package org.aspectj.weaver.test;
+
 public class Test {
     public static void main(String[] args) {
         foo()
diff --git a/weaver/testsrc/TestSwitchy.java b/weaver/testsrc/org/aspectj/weaver/test/TestSwitchy.java
similarity index 95%
rename from weaver/testsrc/TestSwitchy.java
rename to weaver/testsrc/org/aspectj/weaver/test/TestSwitchy.java
index 1f65a12d8..9339b772b 100644
--- a/weaver/testsrc/TestSwitchy.java
+++ b/weaver/testsrc/org/aspectj/weaver/test/TestSwitchy.java
@@ -1,3 +1,5 @@
+package org.aspectj.weaver.test;
+
 /**
  * @author hilsdale
  *
-- 
2.39.5