From 7b5abac9187c943edac29dee41a7c5cb46c6eb49 Mon Sep 17 00:00:00 2001 From: aclement Date: Tue, 30 May 2006 13:49:27 +0000 Subject: [PATCH] fix for 83052 --- weaver/src/org/aspectj/weaver/WeaverMessages.java | 1 + .../weaver/tools/UnsupportedPointcutPrimitiveException.java | 5 +++-- weaver/src/org/aspectj/weaver/weaver-messages.properties | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/weaver/src/org/aspectj/weaver/WeaverMessages.java b/weaver/src/org/aspectj/weaver/WeaverMessages.java index 2d877f22f..036c03921 100644 --- a/weaver/src/org/aspectj/weaver/WeaverMessages.java +++ b/weaver/src/org/aspectj/weaver/WeaverMessages.java @@ -32,6 +32,7 @@ public class WeaverMessages { public static final String WILDCARD_NOT_ALLOWED = "wildcardTypePatternNotAllowed"; public static final String FIELDS_CANT_HAVE_VOID_TYPE = "fieldCantBeVoid"; public static final String NO_NEWARRAY_JOINPOINTS_BY_DEFAULT = "noNewArrayJoinpointsByDefault"; + public static final String UNSUPPORTED_POINTCUT_PRIMITIVE = "unsupportedPointcutPrimitive"; public static final String DECP_OBJECT = "decpObject"; public static final String CANT_EXTEND_SELF="cantExtendSelf"; diff --git a/weaver/src/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java b/weaver/src/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java index 49f6555f6..6e0bbd661 100644 --- a/weaver/src/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java +++ b/weaver/src/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java @@ -11,6 +11,8 @@ * ******************************************************************/ package org.aspectj.weaver.tools; +import org.aspectj.weaver.WeaverMessages; + /** * @author colyer * @@ -23,8 +25,7 @@ public class UnsupportedPointcutPrimitiveException extends RuntimeException { private String pointcutExpression; public UnsupportedPointcutPrimitiveException(String pcExpression, PointcutPrimitive primitive) { - super("Pointcut expression " + pcExpression + " contains unsupported pointcut primitive '" + - primitive.getName() + "'"); + super(WeaverMessages.format(WeaverMessages.UNSUPPORTED_POINTCUT_PRIMITIVE,pcExpression,primitive.getName())); this.pointcutExpression = pcExpression; this.unsupportedPrimitive = primitive; } diff --git a/weaver/src/org/aspectj/weaver/weaver-messages.properties b/weaver/src/org/aspectj/weaver/weaver-messages.properties index bb80d7bc8..9e90b7183 100644 --- a/weaver/src/org/aspectj/weaver/weaver-messages.properties +++ b/weaver/src/org/aspectj/weaver/weaver-messages.properties @@ -27,6 +27,7 @@ cantBindType=can''t bind type name ''{0}'' wildcardTypePatternNotAllowed=wildcard type pattern not allowed, must use type name fieldCantBeVoid=fields cannot have a void type noNewArrayJoinpointsByDefault=There are no join points for array construction unless -Xjoinpoints:arrayconstruction is specified +unsupportedPointcutPrimitive=Pointcut expression ''{0}'' contains unsupported pointcut primitive ''{1}'' # Declare parents messages... decpObject=can''t change the parents of java.lang.Object -- 2.39.5