aboutsummaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authorjhugunin <jhugunin>2003-01-15 02:04:20 +0000
committerjhugunin <jhugunin>2003-01-15 02:04:20 +0000
commit325ea44eee9ade6fbe2d00439e029b6e41c5eec3 (patch)
tree62388db3c0fa3e97c7a9c0216e546c29e670cb3d /weaver
parent2a0dc9b552e4eb58e2802d74b5ad56d4cdad57ba (diff)
downloadaspectj-325ea44eee9ade6fbe2d00439e029b6e41c5eec3.tar.gz
aspectj-325ea44eee9ade6fbe2d00439e029b6e41c5eec3.zip
better handling of binary only types in the eclipse pass
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedTypeX.java3
-rw-r--r--weaver/testdata/dummyAspect.jarbin589 -> 589 bytes
-rw-r--r--weaver/testdata/megatrace.jarbin4895 -> 3555 bytes
-rw-r--r--weaver/testdata/megatraceNoweave.jarbin2696 -> 2709 bytes
-rw-r--r--weaver/testdata/tracing.jarbin2268 -> 2291 bytes
5 files changed, 2 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
index b6b0a4fe3..e13b81bf3 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
@@ -1065,7 +1065,7 @@ public abstract class ResolvedTypeX extends TypeX {
if (inherited.isAbstract()) {
if (!this.isAbstract()) {
getWorld().showMessage(IMessage.ERROR,
- "inherited abstract pointcut " + inherited.getSignature() +
+ "inherited abstract " + inherited +
" is not made concrete in " + this.getName(),
inherited.getSourceLocation(), this.getSourceLocation());
}
@@ -1080,6 +1080,7 @@ public abstract class ResolvedTypeX extends TypeX {
for (Iterator i = added.iterator(); i.hasNext();) {
ResolvedPointcutDefinition toAdd =
(ResolvedPointcutDefinition) i.next();
+ //System.err.println("adding: " + toAdd);
for (Iterator j = acc.iterator(); j.hasNext();) {
ResolvedPointcutDefinition existing =
(ResolvedPointcutDefinition) j.next();
diff --git a/weaver/testdata/dummyAspect.jar b/weaver/testdata/dummyAspect.jar
index 784a3b611..100b7d8f1 100644
--- a/weaver/testdata/dummyAspect.jar
+++ b/weaver/testdata/dummyAspect.jar
Binary files differ
diff --git a/weaver/testdata/megatrace.jar b/weaver/testdata/megatrace.jar
index eda290200..927615c58 100644
--- a/weaver/testdata/megatrace.jar
+++ b/weaver/testdata/megatrace.jar
Binary files differ
diff --git a/weaver/testdata/megatraceNoweave.jar b/weaver/testdata/megatraceNoweave.jar
index fcf480940..8a6273995 100644
--- a/weaver/testdata/megatraceNoweave.jar
+++ b/weaver/testdata/megatraceNoweave.jar
Binary files differ
diff --git a/weaver/testdata/tracing.jar b/weaver/testdata/tracing.jar
index c3f520133..99744a6bc 100644
--- a/weaver/testdata/tracing.jar
+++ b/weaver/testdata/tracing.jar
Binary files differ