Fixed bugs:

40943: Binary weaving should copy non-Java resources from "-inja...  
36071: 1.1 rc1 should copy resources similar to java compiler 
40826: ajbrowser does not report errors properly  
40774: task list icons don't show in ajbrowser

12 files changed, 111 insertions, 2 deletions

diff --git a/ajde/testdata/bug-36071/bin/test/test.props b/ajde/testdata/bug-36071/bin/test/test.props
new file mode 100644
index 000000000..51e670ac7
--- /dev/null
+++ b/ajde/testdata/bug-36071/bin/test/test.props
@@ -0,0 +1 @@
+test=test
\ No newline at end of file
diff --git a/ajde/testdata/bug-36071/config.lst b/ajde/testdata/bug-36071/config.lst
new file mode 100644
index 000000000..4fbccffce
--- /dev/null
+++ b/ajde/testdata/bug-36071/config.lst
@@ -0,0 +1,2 @@
+Main.java

+test/TestProperties.java

diff --git a/ajde/testdata/bug-36071/src/Main.java b/ajde/testdata/bug-36071/src/Main.java
new file mode 100644
index 000000000..417fc6809
--- /dev/null
+++ b/ajde/testdata/bug-36071/src/Main.java
@@ -0,0 +1,22 @@
+import java.io.IOException;
+
+/*
+ * Created on 30-Jul-03
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+
+/**
+ * @author websterm
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class Main {
+
+	public static void main(String[] args) throws IOException {
+		String propsName = (args.length > 0)? args[0] : "test.props";
+		new test.TestProperties().load(propsName);
+	}
+}
diff --git a/ajde/testdata/bug-36071/src/aspects/Logging.java b/ajde/testdata/bug-36071/src/aspects/Logging.java
new file mode 100644
index 000000000..2e8ba485a
--- /dev/null
+++ b/ajde/testdata/bug-36071/src/aspects/Logging.java
@@ -0,0 +1,27 @@
+/*
+ * Created on 30-Jul-03
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package aspects;
+
+/**
+ * @author websterm
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public aspect Logging {
+	
+	pointcut methods () :
+		execution(* *..*(..)) && !within(Logging);
+	
+	before () : methods () {
+		System.err.println("> " + thisJoinPoint.getSignature().toLongString());
+	}
+	
+	after () : methods () {
+		System.err.println("< " + thisJoinPoint.getSignature().toLongString());
+	}
+}
diff --git a/ajde/testdata/bug-36071/src/test/TestProperties.java b/ajde/testdata/bug-36071/src/test/TestProperties.java
new file mode 100644
index 000000000..18139e035
--- /dev/null
+++ b/ajde/testdata/bug-36071/src/test/TestProperties.java
@@ -0,0 +1,29 @@
+/*
+ * Created on 30-Jul-03
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * @author websterm
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class TestProperties {
+
+	public void load (String name) throws IOException {
+		InputStream in = getClass().getResourceAsStream(name);
+//		System.out.println("? load() in=" + in);
+		Properties props = new Properties();
+		props.load(in);
+		in.close();		
+		props.list(System.out);	
+	}
+}
diff --git a/ajde/testdata/bug-36071/src/test/test.props b/ajde/testdata/bug-36071/src/test/test.props
new file mode 100644
index 000000000..51e670ac7
--- /dev/null
+++ b/ajde/testdata/bug-36071/src/test/test.props
@@ -0,0 +1 @@
+test=test
\ No newline at end of file
diff --git a/ajde/testdata/bug-40943/aspects/Logging.java b/ajde/testdata/bug-40943/aspects/Logging.java
new file mode 100644
index 000000000..2e8ba485a
--- /dev/null
+++ b/ajde/testdata/bug-40943/aspects/Logging.java
@@ -0,0 +1,27 @@
+/*
+ * Created on 30-Jul-03
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package aspects;
+
+/**
+ * @author websterm
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public aspect Logging {
+	
+	pointcut methods () :
+		execution(* *..*(..)) && !within(Logging);
+	
+	before () : methods () {
+		System.err.println("> " + thisJoinPoint.getSignature().toLongString());
+	}
+	
+	after () : methods () {
+		System.err.println("< " + thisJoinPoint.getSignature().toLongString());
+	}
+}
diff --git a/ajde/testdata/bug-40943/input1.jar b/ajde/testdata/bug-40943/input1.jar
new file mode 100644
index 000000000..c6305aa57
--- /dev/null
+++ b/ajde/testdata/bug-40943/input1.jar
diff --git a/ajde/testdata/bug-40943/input2.jar b/ajde/testdata/bug-40943/input2.jar
new file mode 100644
index 000000000..c6305aa57
--- /dev/null
+++ b/ajde/testdata/bug-40943/input2.jar
diff --git a/ajde/testdata/bug-40943/output.jar b/ajde/testdata/bug-40943/output.jar
new file mode 100644
index 000000000..a5f38e68e
--- /dev/null
+++ b/ajde/testdata/bug-40943/output.jar
diff --git a/ajde/testdata/examples/coverage/ModelCoverage.java b/ajde/testdata/examples/coverage/ModelCoverage.java
index 6d09ba59d..e1e53be97 100644
--- a/ajde/testdata/examples/coverage/ModelCoverage.java
+++ b/ajde/testdata/examples/coverage/ModelCoverage.java
@@ -57,7 +57,7 @@ aspect AdviceNamingCoverage {
 	after(): named() { }	
 	after(int i, int j) returning: namedWithArgs(i, j) { }
 	after() throwing: named() { }
-	after(): named() { }
+	after(): named() { } 
 	
 	before(): named() { }
 	
@@ -65,7 +65,7 @@ aspect AdviceNamingCoverage {
 	int around(int i) throws SizeException: namedWithOneArg(i) { return proceed(i); }
 	
 	before(): named() { }	
-	before(int i): call(* *.mumble()) && named() && namedWithOneArg(i) { }	
+	before(int i): call(* XXX.mumble()) && named() && namedWithOneArg(i) { }	
 	before(int i): named() && call(* *.mumble()) && namedWithOneArg(i) { }	
 	
 	before(): call(* *.mumble()) { }
diff --git a/ajde/testdata/examples/coverage/coverage.ajsym b/ajde/testdata/examples/coverage/coverage.ajsym
index 25bc2b070..4841e0cfa 100644
--- a/ajde/testdata/examples/coverage/coverage.ajsym
+++ b/ajde/testdata/examples/coverage/coverage.ajsym