aboutsummaryrefslogtreecommitdiffstats
path: root/loadtime
diff options
context:
space:
mode:
authoravasseur <avasseur>2005-10-25 13:04:26 +0000
committeravasseur <avasseur>2005-10-25 13:04:26 +0000
commite1d674faa6a8f4d3f9ca051b88aab36d635eaf1b (patch)
tree09d1432ba5c2a3895c63c0870efd2cf401e844ba /loadtime
parentcc6862f2b54c3333d645a0efb28f5366b0a2bcc3 (diff)
downloadaspectj-e1d674faa6a8f4d3f9ca051b88aab36d635eaf1b.tar.gz
aspectj-e1d674faa6a8f4d3f9ca051b88aab36d635eaf1b.zip
ajdtcore for abstract @Pointcut
Diffstat (limited to 'loadtime')
-rw-r--r--loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java18
-rw-r--r--loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java2
2 files changed, 1 insertions, 19 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index ebfdce180..cdccc0e09 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -113,23 +113,6 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
messageHandler = bcelWorld.getMessageHandler();
// after adding aspects
weaver.prepareForWeave();
-// // weave and flush what was registered so far
-// for (Iterator iterator = m_codeGens.iterator(); iterator.hasNext();) {
-// ConcreteAspectCodeGen concreteAspectCodeGen = (ConcreteAspectCodeGen) iterator.next();
-// byte[] partiallyWoven = concreteAspectCodeGen.getBytes(this);
-// this.generatedClassHandler.acceptClass(
-// concreteAspectCodeGen.m_concreteAspect.name,
-// partiallyWoven
-// );
-// ResolvedType aspect = weaver.addLibraryAspect(concreteAspectCodeGen.m_concreteAspect.name);
-// //generate key for SC
-// String aspectCode = readAspect(concreteAspectCodeGen.m_concreteAspect.name, loader);
-// if(namespace==null){
-// namespace=new StringBuffer(aspectCode);
-// }else{
-// namespace = namespace.append(";"+aspectCode);
-// }
-// }
}
}
@@ -161,7 +144,6 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
Enumeration xmls = weavingContext.getResources(st.nextToken());
// System.out.println("? registerDefinitions: found-aop.xml=" + xmls.hasMoreElements() + ", loader=" + loader);
-
while (xmls.hasMoreElements()) {
URL xml = (URL) xmls.nextElement();
MessageUtil.info(messageHandler, "using " + xml.getFile());
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java b/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
index b90ddeda0..85b718ac5 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
@@ -152,7 +152,7 @@ public class ConcreteAspectCodeGen {
if ("()V".equals(method.getSignature())) {
elligibleAbstractions.add(method.getName());
} else {
- reportError("Abstract member '" + method.getName() + "' cannot be concretized as a pointcut (illegal signature): " + stringify());
+ reportError("Abstract method '" + method.getName() + "' cannot be concretized as a pointcut (illegal signature, must have no arguments, must return void): " + stringify());
return false;
}
}