summaryrefslogtreecommitdiffstats
path: root/weaver/src/org
diff options
context:
space:
mode:
authoraclement <aclement>2010-04-05 22:24:07 +0000
committeraclement <aclement>2010-04-05 22:24:07 +0000
commit7fab7a382c435b3017fad8e3f0a9cf423a689720 (patch)
treeab68199f1d2c18e1630ad90d86cd8a5519546844 /weaver/src/org
parent70eb59751815d16feddae8207b68d112f07623e8 (diff)
downloadaspectj-7fab7a382c435b3017fad8e3f0a9cf423a689720.tar.gz
aspectj-7fab7a382c435b3017fad8e3f0a9cf423a689720.zip
292264: declare error/warning with type patterns
Diffstat (limited to 'weaver/src/org')
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
index b4e36cf4d..04dcb35f3 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
@@ -1831,7 +1831,7 @@ public class BcelWeaver {
inReweavableMode);
}
- // checkDeclareTypeErrorOrWarning(world, classType);
+ checkDeclareTypeErrorOrWarning(world, classType);
if (mightNeedBridgeMethods) {
isChanged = BcelClassWeaver.calculateAnyRequiredBridgeMethods(world, clazz) || isChanged;
@@ -1864,8 +1864,8 @@ public class BcelWeaver {
String messageText = "trouble in: \n" + classDebugInfo;
getWorld().getMessageHandler().handleMessage(new Message(messageText, IMessage.ABORT, re, null));
}
-// } else {
-// checkDeclareTypeErrorOrWarning(world, classType);
+ } else {
+ checkDeclareTypeErrorOrWarning(world, classType);
}
// this is very odd return behavior trying to keep everyone happy
/*
@@ -1903,7 +1903,7 @@ public class BcelWeaver {
// ---- writing
-/* private void checkDeclareTypeErrorOrWarning(BcelWorld world2, BcelObjectType classType) {
+ private void checkDeclareTypeErrorOrWarning(BcelWorld world2, BcelObjectType classType) {
List<DeclareTypeErrorOrWarning> dteows = world.getDeclareTypeEows();
for (DeclareTypeErrorOrWarning dteow : dteows) {
if (dteow.getTypePattern().matchesStatically(classType.getResolvedTypeX())) {
@@ -1917,7 +1917,6 @@ public class BcelWeaver {
}
}
}
-*/
private void dumpUnchanged(UnwovenClassFile classFile) throws IOException {
if (zipOutputStream != null) {