diff options
| -rw-r--r-- | org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties | 21 | ||||
| -rw-r--r-- | org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java | 9 |
2 files changed, 19 insertions, 11 deletions
diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties index b6de28ebb..daf511f9d 100644 --- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties +++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties @@ -42,8 +42,11 @@ configure.duplicateMaxProblems = duplicate max problems specification: {0} configure.duplicateCompliance = duplicate compliance setting specification: {0} configure.duplicateSource = duplicate source compliance setting specification: {0} configure.duplicateTarget = duplicate target compliance setting specification: {0} -configure.source = source level should be comprised in between ''1.3'' and ''1.9'' (or ''5'', ''5.0'', ..., ''9'' or ''9.0''): {0} -configure.invalidSystem = invalid location for system libraries +configure.unsupportedReleaseOption = option --release is supported only when run with JDK 9 or above +configure.unsupportedWithRelease = option {0} is not supported when --release is used +configure.unsupportedReleaseVersion = release version {0} is not supported +configure.source = source level should be in ''1.1''...''1.8'',''9''...''11'' (or ''5.0''..''11.0''): {0} +configure.invalidSystem = invalid location for system libraries: {0} configure.unsupportedOption = option {0} not supported at compliance level 9 and above configure.duplicateOutputPath = duplicate output path specification: {0} configure.duplicateModulePath = duplicate module path specification: {0} @@ -51,6 +54,7 @@ configure.duplicateModuleSourcepath = duplicate source module path specification configure.invalidModuleDescriptor = cannot open the module descriptor from {0} configure.invalidModuleOption = incorrectly formatted option: {0} configure.duplicateExport = can specify a package in a module only once with --add-export +configure.OneOfModuleOrSourcePath = cannot specify both -source-path and --module-source-path configure.duplicateBootClasspath = duplicate bootclasspath specification: {0} configure.duplicateExtDirs = duplicate extdirs specification: {0} configure.duplicateSourcepath = duplicate sourcepath specification: {0} @@ -58,15 +62,15 @@ configure.invalidDebugOption = invalid debug option: {0} configure.invalidWarningConfiguration = invalid warning configuration: ''{0}'' configure.invalidWarning = invalid warning token: ''{0}''. Ignoring warning and compiling configure.invalidWarningOption = invalid warning option: ''{0}''. Must specify a warning token -configure.targetJDK = target JDK should be comprised in between ''1.1'' and ''1.4'': {0} -configure.incompatibleTargetForSource14 = ''1.4'' source mode requires ''-target 1.4'' : {0} -configure.incompatibleComplianceForSource14 = ''1.4'' source mode requires ''-1.4'' compliance mode: {0} -configure.incompatibleComplianceForTarget14 = ''1.4'' target mode requires ''-1.4'' compliance mode: {0} -configure.incompatibleComplianceForTarget11 = ''1.1'' target mode requires ''-1.3'' compliance mode: {0} +configure.targetJDK = target level should be in ''1.1''...''1.8'',''9''...''11'' (or ''5.0''..''11.0'') or cldc1.1: {0} +configure.incompatibleTargetForSource = Target level ''{0}'' is incompatible with source level ''{1}''. A target level ''{1}'' or better is required +configure.incompatibleTargetForGenericSource = Target level ''{0}'' is incompatible with source level ''{1}''. A source level ''1.5'' or better is required +configure.incompatibleComplianceForSource = Compliance level ''{0}'' is incompatible with source level ''{1}''. A compliance level ''{1}'' or better is required configure.incompatibleComplianceForTarget = Compliance level ''{0}'' is incompatible with target level ''{1}''. A compliance level ''{1}'' or better is required configure.repetition = repetition must be a positive integer: {0} configure.maxProblems = max problems must be a positive integer: {0} configure.invalidNowarnOption = invalid syntax for nowarn option: {0} +configure.unsupportedPreview = Preview of features is supported only at the latest source level configure.invalidErrorConfiguration = invalid error configuration: ''{0}'' configure.invalidError = invalid error token: ''{0}''. Ignoring this error token and compiling @@ -75,6 +79,7 @@ configure.invalidErrorOption = invalid error option: ''{0}''. Must specify an er configure.invalidInfoConfiguration = invalid info configuration: ''{0}'' configure.invalidInfo = invalid info token: ''{0}''. Ignoring this info token and compiling configure.invalidInfoOption = invalid info option: ''{0}''. Must specify an info token +configure.notOnModuleSourcePath = ''{0}'' does not belong to a module on the module source path configure.directoryNotExist = directory does not exist: {0} configure.IOError = i/o error : unable to retrieve .JAVA files in directory: {0} @@ -99,6 +104,8 @@ configure.unexpectedDestinationPathEntryFile = unexpected destination path entry configure.accessRuleAfterDestinationPath = access rules cannot follow destination path entries: {0} configure.duplicateDestinationPathEntry = duplicate destination path entry in {0} option configure.invalidClassName = invalid class name: {0} +configure.invalidModuleName = invalid module name: {0} +configure.packageConflict = The package {0} is accessible from more than one module: {1}, {2} configure.unavailableAPT = Unable to load annotation processing manager {0} from classpath. configure.incorrectVMVersionforAPT = Annotation processing got disabled, since it requires a 1.6 compliant JVM configure.incompatibleSourceForCldcTarget=Target level ''{0}'' is incompatible with source level ''{1}''. A source level ''1.3'' or lower is required diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java index 56a45892d..67d24672b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java @@ -174,10 +174,11 @@ public class KindedPointcut extends Pointcut { } } } - } else if (this.getSignature().getDeclaringType() instanceof WildTypePattern) { - final WildTypePattern pattern = (WildTypePattern) this.getSignature().getDeclaringType(); - final ResolvedType type = info.getType(); - return pattern.matches(type, TypePattern.STATIC); + // Optimization from 532033: passes AspectJ tests but breaks Spring Framework +// } else if (this.getSignature().getDeclaringType() instanceof WildTypePattern) { +// final WildTypePattern pattern = (WildTypePattern) this.getSignature().getDeclaringType(); +// final ResolvedType type = info.getType(); +// return pattern.matches(type, TypePattern.STATIC); } } } |