Matthews patches from 95529

1 files changed, 16 insertions, 6 deletions

diff --git a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
index 1019ca617..b59ec5564 100644
--- a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
+++ b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
@@ -72,6 +72,11 @@ public class WeavingAdaptor {
 	protected GeneratedClassHandler generatedClassHandler;
 	protected Map generatedClasses = new HashMap(); /* String -> UnwovenClassFile */
 
+	protected WeavingAdaptor () {
+		createMessageHandler();
+	}
+	
+	
 	/**
 	 * Construct a WeavingAdaptor with a reference to a weaving class loader. The
 	 * adaptor will automatically search the class loader hierarchy to resolve
@@ -135,9 +140,7 @@ public class WeavingAdaptor {
 	}
 	
 	private void init(List classPath, List aspectPath) {
-		messageHandler = new WeavingAdaptorMessageHandler(new PrintWriter(System.err));
-		if (verbose) messageHandler.dontIgnore(IMessage.INFO);
-		if (Boolean.getBoolean(SHOW_WEAVE_INFO_PROPERTY)) messageHandler.dontIgnore(IMessage.WEAVEINFO);
+		createMessageHandler();
 		
 		info("using classpath: " + classPath); 
 		info("using aspectpath: " + aspectPath); 
@@ -152,6 +155,13 @@ public class WeavingAdaptor {
 		weaver = new BcelWeaver(bcelWorld);
 		registerAspectLibraries(aspectPath);
 	}
+
+
+	private void createMessageHandler() {
+		messageHandler = new WeavingAdaptorMessageHandler(new PrintWriter(System.err));
+		if (verbose) messageHandler.dontIgnore(IMessage.INFO);
+		if (Boolean.getBoolean(SHOW_WEAVE_INFO_PROPERTY)) messageHandler.dontIgnore(IMessage.WEAVEINFO);
+	}
 	
 	/**
 	 * Appends URL to path used by the WeavingAdptor to resolve classes
@@ -309,15 +319,15 @@ public class WeavingAdaptor {
 		return ret;
 	}
 	
-	private boolean info (String message) {
+	protected boolean info (String message) {
 		return MessageUtil.info(messageHandler,message);
 	}
 	
-	private boolean warn (String message) {
+	protected boolean warn (String message) {
 		return MessageUtil.warn(messageHandler,message);
 	}
 	
-	private boolean error (String message) {
+	protected boolean error (String message) {
 		return MessageUtil.error(messageHandler,message);
 	}