From a5b31830511167ea4a8b9d750c7e1d16292e0938 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 1 Jun 2006 15:52:05 +0000 Subject: [PATCH] improved handling of optional joinpoints argument processing. and updated usage text to correct an error. --- .../src/org/aspectj/ajdt/ajc/BuildArgParser.java | 4 ++-- .../src/org/aspectj/ajdt/ajc/messages.properties | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java index 823149482..dde7e8b62 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java @@ -537,8 +537,8 @@ public class BuildArgParser extends Main { buildConfig.setAddSerialVerUID(true); } else if (arg.equals("-Xdev:Pinpoint")) { buildConfig.setXdevPinpointMode(true); - } else if (arg.equals("-Xjoinpoints:arrayconstruction")) { - buildConfig.setXJoinpoints("arrayconstruction"); + } else if (arg.startsWith("-Xjoinpoints:")) { + buildConfig.setXJoinpoints(arg.substring(13)); } else if (arg.equals("-noWeave") || arg.equals( "-XnoWeave")) { showWarning("the noweave option is no longer required and is being ignored"); } else if (arg.equals( "-XterminateAfterCompilation")) { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties index 4f43c0de0..7c7c146cd 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties @@ -134,10 +134,13 @@ xoption.usage = {0} non-standard options:\n\ \t-XterminateAfterCompilation compile classes then terminate before weaving\n\ \t-XaddSerialVersionUID calculates and adds the serialVersionUID to any\n\ \t serializable type woven by an aspect\n\ -\t-Xajruntimelevel: allows code to be generated that targets\n\ +\t-Xajruntimetarget: allows code to be generated that targets\n\ \t a 1.2 or a 1.5 level AspectJ runtime (default 1.5)\n\ \t-XhasMember allow hasmethod() and hasfield type patterns in\n\ -\t declare parents and declare @type\n +\t declare parents and declare @type\n\ +\t-Xjoinpoints: supply a comma separated list of new joinpoints\n\ +\t that can be identified by pointcuts. Values are:\n\ +\t arrayconstruction, synchronization\n ## options not documented above (per ..ajdt.ajc.BuildArgParser.java): # -XincrementalFile, -XjavadocsInModel -- 2.39.5