diff options
Diffstat (limited to 'runtime')
122 files changed, 1284 insertions, 1284 deletions
diff --git a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareAnnotation.java b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareAnnotation.java index 5835f3767..e8db54597 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareAnnotation.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareAnnotation.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.annotation; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareEoW.java b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareEoW.java index e349d603e..0e711cfa7 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareEoW.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareEoW.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.annotation; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareParents.java b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareParents.java index 14860e006..75740440d 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareParents.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareParents.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.annotation; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclarePrecedence.java b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclarePrecedence.java index ef6197557..4ad620811 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclarePrecedence.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclarePrecedence.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.annotation; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareSoft.java b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareSoft.java index f97de09e2..64f1a2660 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareSoft.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcDeclareSoft.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.annotation; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcITD.java b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcITD.java index e67a25f1e..aeefec935 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcITD.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcITD.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.annotation; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcPrivileged.java b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcPrivileged.java index 78ca43e05..33ee89bb4 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcPrivileged.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/annotation/ajcPrivileged.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.annotation; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/AdviceImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/AdviceImpl.java index 77b30223f..94cb80912 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/AdviceImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/AdviceImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -26,7 +26,7 @@ import org.aspectj.lang.reflect.PointcutExpression; * */ public class AdviceImpl implements Advice { - + private static final String AJC_INTERNAL = "org.aspectj.runtime.internal"; private final AdviceKind kind; @@ -36,22 +36,22 @@ public class AdviceImpl implements Advice { private Type[] genericParameterTypes; private AjType[] parameterTypes; private AjType[] exceptionTypes; - + protected AdviceImpl(Method method, String pointcut, AdviceKind type) { this.kind = type; this.adviceMethod = method; this.pointcutExpression = new PointcutExpressionImpl(pointcut); } - + protected AdviceImpl(Method method, String pointcut, AdviceKind type, String extraParamName) { this(method,pointcut,type); this.hasExtraParam = true; } - + public AjType getDeclaringType() { return AjTypeSystem.getAjType(adviceMethod.getDeclaringClass()); } - + public Type[] getGenericParameterTypes() { if (this.genericParameterTypes == null) { Type[] genTypes = adviceMethod.getGenericParameterTypes(); @@ -72,7 +72,7 @@ public class AdviceImpl implements Advice { } return this.genericParameterTypes; } - + public AjType<?>[] getParameterTypes() { if (this.parameterTypes == null) { Class<?>[] ptypes = adviceMethod.getParameterTypes(); @@ -87,7 +87,7 @@ public class AdviceImpl implements Advice { } return this.parameterTypes; } - + public AjType<?>[] getExceptionTypes() { if (this.exceptionTypes == null) { Class<?>[] exTypes = adviceMethod.getExceptionTypes(); @@ -98,11 +98,11 @@ public class AdviceImpl implements Advice { } return this.exceptionTypes; } - + public AdviceKind getKind() { return kind; } - + public String getName() { String adviceName = adviceMethod.getName(); if (adviceName.startsWith("ajc$")) { @@ -112,11 +112,11 @@ public class AdviceImpl implements Advice { } return adviceName; } - + public PointcutExpression getPointcutExpression() { return pointcutExpression; } - + public String toString() { StringBuffer sb = new StringBuffer(); if (getName().length() > 0) { @@ -183,5 +183,5 @@ public class AdviceImpl implements Advice { sb.append(getPointcutExpression().asString()); return sb.toString(); } - + } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/AjTypeImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/AjTypeImpl.java index 2aacae7bf..ee2677dba 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/AjTypeImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/AjTypeImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -63,9 +63,9 @@ import org.aspectj.lang.reflect.Pointcut; * */ public class AjTypeImpl<T> implements AjType<T> { - + private static final String ajcMagic = "ajc$"; - + private Class<T> clazz; private Pointcut[] declaredPointcuts = null; private Pointcut[] pointcuts = null; @@ -77,7 +77,7 @@ public class AjTypeImpl<T> implements AjType<T> { private InterTypeFieldDeclaration[] itdFields = null; private InterTypeConstructorDeclaration[] itdCons = null; private InterTypeConstructorDeclaration[] declaredITDCons = null; - + public AjTypeImpl(Class<T> fromClass) { this.clazz = fromClass; } @@ -110,7 +110,7 @@ public class AjTypeImpl<T> implements AjType<T> { public int getModifiers() { return clazz.getModifiers(); } - + public Class<T> getJavaClass() { return clazz; } @@ -159,7 +159,7 @@ public class AjTypeImpl<T> implements AjType<T> { Class dec = clazz.getDeclaringClass(); return dec != null ? new AjTypeImpl(dec) : null; } - + public PerClause getPerClause() { if (isAspect()) { Aspect aspectAnn = clazz.getAnnotation(Aspect.class); @@ -167,18 +167,18 @@ public class AjTypeImpl<T> implements AjType<T> { if (perClause.equals("")) { if (getSupertype().isAspect()) { return getSupertype().getPerClause(); - } + } return new PerClauseImpl(PerClauseKind.SINGLETON); } else if (perClause.startsWith("perthis(")) { return new PointcutBasedPerClauseImpl(PerClauseKind.PERTHIS,perClause.substring("perthis(".length(),perClause.length() - 1)); } else if (perClause.startsWith("pertarget(")) { - return new PointcutBasedPerClauseImpl(PerClauseKind.PERTARGET,perClause.substring("pertarget(".length(),perClause.length() - 1)); + return new PointcutBasedPerClauseImpl(PerClauseKind.PERTARGET,perClause.substring("pertarget(".length(),perClause.length() - 1)); } else if (perClause.startsWith("percflow(")) { - return new PointcutBasedPerClauseImpl(PerClauseKind.PERCFLOW,perClause.substring("percflow(".length(),perClause.length() - 1)); + return new PointcutBasedPerClauseImpl(PerClauseKind.PERCFLOW,perClause.substring("percflow(".length(),perClause.length() - 1)); } else if (perClause.startsWith("percflowbelow(")) { return new PointcutBasedPerClauseImpl(PerClauseKind.PERCFLOWBELOW,perClause.substring("percflowbelow(".length(),perClause.length() - 1)); } else if (perClause.startsWith("pertypewithin")) { - return new TypePatternBasedPerClauseImpl(PerClauseKind.PERTYPEWITHIN,perClause.substring("pertypewithin(".length(),perClause.length() - 1)); + return new TypePatternBasedPerClauseImpl(PerClauseKind.PERTYPEWITHIN,perClause.substring("pertypewithin(".length(),perClause.length() - 1)); } else { throw new IllegalStateException("Per-clause not recognized: " + perClause); } @@ -197,7 +197,7 @@ public class AjTypeImpl<T> implements AjType<T> { public <A extends Annotation> A getAnnotation(Class<A> annotationType) { return clazz.getAnnotation(annotationType); } - + /* (non-Javadoc) * @see org.aspectj.lang.reflect.AjType#getAnnotations() */ @@ -271,8 +271,8 @@ public class AjTypeImpl<T> implements AjType<T> { public Field[] getDeclaredFields() { Field[] fields = clazz.getDeclaredFields(); List<Field> filteredFields = new ArrayList<>(); - for (Field field : fields) - if (!field.getName().startsWith(ajcMagic) + for (Field field : fields) + if (!field.getName().startsWith(ajcMagic) && !field.isAnnotationPresent(DeclareWarning.class) && !field.isAnnotationPresent(DeclareError.class)) { filteredFields.add(field); @@ -298,7 +298,7 @@ public class AjTypeImpl<T> implements AjType<T> { Field[] fields = clazz.getFields(); List<Field> filteredFields = new ArrayList<>(); for (Field field : fields) - if (!field.getName().startsWith(ajcMagic) + if (!field.getName().startsWith(ajcMagic) && !field.isAnnotationPresent(DeclareWarning.class) && !field.isAnnotationPresent(DeclareError.class)) { filteredFields.add(field); @@ -365,7 +365,7 @@ public class AjTypeImpl<T> implements AjType<T> { if (method.isAnnotationPresent(Around.class)) return false; return true; } - + /* (non-Javadoc) * @see org.aspectj.lang.reflect.AjType#getDeclaredPointcut(java.lang.String) */ @@ -436,8 +436,8 @@ public class AjTypeImpl<T> implements AjType<T> { return null; } } - - + + public Advice[] getDeclaredAdvice(AdviceKind... ofType) { Set<AdviceKind> types; if (ofType.length == 0) { @@ -448,7 +448,7 @@ public class AjTypeImpl<T> implements AjType<T> { } return getDeclaredAdvice(types); } - + public Advice[] getAdvice(AdviceKind... ofType) { Set<AdviceKind> types; if (ofType.length == 0) { @@ -519,7 +519,7 @@ public class AjTypeImpl<T> implements AjType<T> { } throw new NoSuchAdviceException(name); } - + public Advice getDeclaredAdvice(String name) throws NoSuchAdviceException { if (name.equals("")) throw new IllegalArgumentException("use getAdvice(AdviceType...) instead for un-named advice"); if (declaredAdvice == null) initDeclaredAdvice(); @@ -528,7 +528,7 @@ public class AjTypeImpl<T> implements AjType<T> { } throw new NoSuchAdviceException(name); } - + private Advice asAdvice(Method method) { if (method.getAnnotations().length == 0) return null; Before beforeAnn = method.getAnnotation(Before.class); @@ -551,7 +551,7 @@ public class AjTypeImpl<T> implements AjType<T> { if (aroundAnn != null) return new AdviceImpl(method,aroundAnn.value(),AdviceKind.AROUND); return null; } - + /* (non-Javadoc) * @see org.aspectj.lang.reflect.AjType#getDeclaredITDMethod(java.lang.String, java.lang.Class, java.lang.Class...) */ @@ -590,12 +590,12 @@ public class AjTypeImpl<T> implements AjType<T> { if (!m.getName().contains("ajc$interMethodDispatch1$")) continue; if (m.isAnnotationPresent(ajcITD.class)) { ajcITD ann = m.getAnnotation(ajcITD.class); - InterTypeMethodDeclaration itdm = + InterTypeMethodDeclaration itdm = new InterTypeMethodDeclarationImpl( this,ann.targetType(),ann.modifiers(), ann.name(),m); itdms.add(itdm); - } + } } addAnnotationStyleITDMethods(itdms,false); this.declaredITDMethods = new InterTypeMethodDeclaration[itdms.size()]; @@ -605,7 +605,7 @@ public class AjTypeImpl<T> implements AjType<T> { } public InterTypeMethodDeclaration getITDMethod(String name, AjType<?> target, - AjType<?>... parameterTypes) + AjType<?>... parameterTypes) throws NoSuchMethodException { InterTypeMethodDeclaration[] itdms = getITDMethods(); outer: for (InterTypeMethodDeclaration itdm : itdms) { @@ -638,12 +638,12 @@ public class AjTypeImpl<T> implements AjType<T> { if (m.isAnnotationPresent(ajcITD.class)) { ajcITD ann = m.getAnnotation(ajcITD.class); if (!Modifier.isPublic(ann.modifiers())) continue; - InterTypeMethodDeclaration itdm = + InterTypeMethodDeclaration itdm = new InterTypeMethodDeclarationImpl( this,ann.targetType(),ann.modifiers(), ann.name(),m); itdms.add(itdm); - } + } } addAnnotationStyleITDMethods(itdms,true); this.itdMethods = new InterTypeMethodDeclaration[itdms.size()]; @@ -651,7 +651,7 @@ public class AjTypeImpl<T> implements AjType<T> { } return this.itdMethods; } - + private void addAnnotationStyleITDMethods(List<InterTypeMethodDeclaration> toList, boolean publicOnly) { if (isAspect()) { for (Field f : clazz.getDeclaredFields()) { @@ -710,10 +710,10 @@ public class AjTypeImpl<T> implements AjType<T> { if (!m.getName().contains("ajc$postInterConstructor")) continue; if (m.isAnnotationPresent(ajcITD.class)) { ajcITD ann = m.getAnnotation(ajcITD.class); - InterTypeConstructorDeclaration itdc = + InterTypeConstructorDeclaration itdc = new InterTypeConstructorDeclarationImpl(this,ann.targetType(),ann.modifiers(),m); itdcs.add(itdc); - } + } } this.declaredITDCons = new InterTypeConstructorDeclaration[itdcs.size()]; itdcs.toArray(this.declaredITDCons); @@ -753,10 +753,10 @@ public class AjTypeImpl<T> implements AjType<T> { if (m.isAnnotationPresent(ajcITD.class)) { ajcITD ann = m.getAnnotation(ajcITD.class); if (!Modifier.isPublic(ann.modifiers())) continue; - InterTypeConstructorDeclaration itdc = + InterTypeConstructorDeclaration itdc = new InterTypeConstructorDeclarationImpl(this,ann.targetType(),ann.modifiers(),m); itdcs.add(itdc); - } + } } this.itdCons = new InterTypeConstructorDeclaration[itdcs.size()]; itdcs.toArray(this.itdCons); @@ -771,9 +771,9 @@ public class AjTypeImpl<T> implements AjType<T> { try { AjType<?> itdTarget = itdf.getTargetType(); if (itdTarget.equals(target)) return itdf; - } catch (ClassNotFoundException cnfEx) { + } catch (ClassNotFoundException cnfEx) { // move on to next field - } + } } } throw new NoSuchFieldException(name); @@ -788,7 +788,7 @@ public class AjTypeImpl<T> implements AjType<T> { if (!m.getName().contains("ajc$interFieldInit")) continue; ajcITD ann = m.getAnnotation(ajcITD.class); String interFieldInitMethodName = m.getName(); - String interFieldGetDispatchMethodName = + String interFieldGetDispatchMethodName = interFieldInitMethodName.replace("FieldInit","FieldGetDispatch"); try { Method dispatch = clazz.getDeclaredMethod(interFieldGetDispatchMethodName, m.getParameterTypes()); @@ -809,7 +809,7 @@ public class AjTypeImpl<T> implements AjType<T> { return this.declaredITDFields; } - public InterTypeFieldDeclaration getITDField(String name, AjType<?> target) + public InterTypeFieldDeclaration getITDField(String name, AjType<?> target) throws NoSuchFieldException { InterTypeFieldDeclaration[] itdfs = getITDFields(); for (InterTypeFieldDeclaration itdf : itdfs) { @@ -817,9 +817,9 @@ public class AjTypeImpl<T> implements AjType<T> { try { AjType<?> itdTarget = itdf.getTargetType(); if (itdTarget.equals(target)) return itdf; - } catch (ClassNotFoundException cnfEx) { + } catch (ClassNotFoundException cnfEx) { // move on to next field - } + } } } throw new NoSuchFieldException(name); @@ -835,7 +835,7 @@ public class AjTypeImpl<T> implements AjType<T> { if (!m.getName().contains("ajc$interFieldInit")) continue; if (!Modifier.isPublic(ann.modifiers())) continue; String interFieldInitMethodName = m.getName(); - String interFieldGetDispatchMethodName = + String interFieldGetDispatchMethodName = interFieldInitMethodName.replace("FieldInit","FieldGetDispatch"); try { Method dispatch = m.getDeclaringClass().getDeclaredMethod(interFieldGetDispatchMethodName, m.getParameterTypes()); @@ -866,14 +866,14 @@ public class AjTypeImpl<T> implements AjType<T> { String message = (String) field.get(null); DeclareErrorOrWarningImpl deow = new DeclareErrorOrWarningImpl(dw.value(),message,false,this); deows.add(deow); - } + } } else if (field.isAnnotationPresent(DeclareError.class)) { DeclareError de = field.getAnnotation(DeclareError.class); if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) { String message = (String) field.get(null); DeclareErrorOrWarningImpl deow = new DeclareErrorOrWarningImpl(de.value(),message,true,this); deows.add(deow); - } + } } } catch (IllegalArgumentException e) { // just move on to the next field @@ -915,7 +915,7 @@ public class AjTypeImpl<T> implements AjType<T> { decps.toArray(ret); return ret; } - + private void addAnnotationStyleDeclareParents(List<DeclareParents> toList) { for (Field f : clazz.getDeclaredFields()) { if (f.isAnnotationPresent(org.aspectj.lang.annotation.DeclareParents.class)) { @@ -989,10 +989,10 @@ public class AjTypeImpl<T> implements AjType<T> { public DeclarePrecedence[] getDeclarePrecedence() { List<DeclarePrecedence> decps = new ArrayList<>(); - + // @AspectJ Style if (clazz.isAnnotationPresent(org.aspectj.lang.annotation.DeclarePrecedence.class)) { - org.aspectj.lang.annotation.DeclarePrecedence ann = + org.aspectj.lang.annotation.DeclarePrecedence ann = clazz.getAnnotation(org.aspectj.lang.annotation.DeclarePrecedence.class); DeclarePrecedenceImpl decp = new DeclarePrecedenceImpl( ann.value(), @@ -1000,7 +1000,7 @@ public class AjTypeImpl<T> implements AjType<T> { ); decps.add(decp); } - + // annotated code-style for (Method method : clazz.getDeclaredMethods()) { if (method.isAnnotationPresent(ajcDeclarePrecedence.class)) { @@ -1067,19 +1067,19 @@ public class AjTypeImpl<T> implements AjType<T> { public boolean isPrivileged() { return isAspect() && clazz.isAnnotationPresent(ajcPrivileged.class); } - + @Override public boolean equals(Object obj) { if (!(obj instanceof AjTypeImpl)) return false; AjTypeImpl other = (AjTypeImpl) obj; return other.clazz.equals(clazz); } - + @Override public int hashCode() { return clazz.hashCode(); } - + private AjType<?>[] toAjTypeArray(Class<?>[] classes) { AjType<?>[] ajtypes = new AjType<?>[classes.length]; for (int i = 0; i < ajtypes.length; i++) { @@ -1087,7 +1087,7 @@ public class AjTypeImpl<T> implements AjType<T> { } return ajtypes; } - + private Class<?>[] toClassArray(AjType<?>[] ajTypes) { Class<?>[] classes = new Class<?>[ajTypes.length]; for (int i = 0; i < classes.length; i++) { @@ -1095,7 +1095,7 @@ public class AjTypeImpl<T> implements AjType<T> { } return classes; } - + public String toString() { return getName(); } } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareAnnotationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareAnnotationImpl.java index 09c592b8e..977ff097a 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareAnnotationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareAnnotationImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -30,7 +30,7 @@ public class DeclareAnnotationImpl implements DeclareAnnotation { private DeclareAnnotation.Kind kind; private TypePattern typePattern; private SignaturePattern signaturePattern; - + public DeclareAnnotationImpl(AjType<?> declaring, String kindString, String pattern, Annotation ann, String annText) { this.declaringType = declaring; if (kindString.equals("at_type")) this.kind = DeclareAnnotation.Kind.Type; @@ -66,11 +66,11 @@ public class DeclareAnnotationImpl implements DeclareAnnotation { public Annotation getAnnotation() { return this.theAnnotation; } - + public String getAnnotationAsText() { return this.annText; } - + public String toString() { StringBuffer sb = new StringBuffer(); sb.append("declare @"); @@ -79,16 +79,16 @@ public class DeclareAnnotationImpl implements DeclareAnnotation { sb.append("type : "); sb.append(getTypePattern().asString()); break; - case Method: - sb.append("method : "); + case Method: + sb.append("method : "); sb.append(getSignaturePattern().asString()); break; - case Field: - sb.append("field : "); + case Field: + sb.append("field : "); sb.append(getSignaturePattern().asString()); break; - case Constructor: - sb.append("constructor : "); + case Constructor: + sb.append("constructor : "); sb.append(getSignaturePattern().asString()); break; } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareErrorOrWarningImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareErrorOrWarningImpl.java index 8223d1187..7a38780b8 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareErrorOrWarningImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareErrorOrWarningImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -25,16 +25,16 @@ public class DeclareErrorOrWarningImpl implements DeclareErrorOrWarning { private String msg; private boolean isError; private AjType declaringType; - + public DeclareErrorOrWarningImpl(String pointcut, String message, boolean isError, AjType decType) { this.pc = new PointcutExpressionImpl(pointcut); this.msg = message; this.isError = isError; this.declaringType = decType; } - + public AjType getDeclaringType() { return this.declaringType; } - + public PointcutExpression getPointcutExpression() { return pc; } @@ -46,7 +46,7 @@ public class DeclareErrorOrWarningImpl implements DeclareErrorOrWarning { public boolean isError() { return isError; } - + public String toString() { StringBuffer sb = new StringBuffer(); sb.append("declare "); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareParentsImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareParentsImpl.java index e33166822..432d04bb3 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareParentsImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareParentsImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -30,11 +30,11 @@ public class DeclareParentsImpl implements DeclareParents { private String firstMissingTypeName; private boolean isExtends; private boolean parentsError = false; - - - // Parents arg is a comma-separate list of type names that needs to be turned into - // AjTypes - public DeclareParentsImpl(String targets, String parentsAsString, boolean isExtends, AjType<?> declaring) + + + // Parents arg is a comma-separate list of type names that needs to be turned into + // AjTypes + public DeclareParentsImpl(String targets, String parentsAsString, boolean isExtends, AjType<?> declaring) { this.targetTypesPattern = new TypePatternImpl(targets); this.isExtends = isExtends; @@ -70,7 +70,7 @@ public class DeclareParentsImpl implements DeclareParents { } return this.parents; } - + public String toString() { StringBuffer sb = new StringBuffer(); sb.append("declare parents : "); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclarePrecedenceImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclarePrecedenceImpl.java index ea8639aec..6cdfc8ada 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclarePrecedenceImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclarePrecedenceImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -26,7 +26,7 @@ public class DeclarePrecedenceImpl implements DeclarePrecedence { private AjType<?> declaringType; private TypePattern[] precedenceList; private String precedenceString; - + public DeclarePrecedenceImpl(String precedenceList, AjType declaring) { this.declaringType = declaring; this.precedenceString = precedenceList; @@ -48,7 +48,7 @@ public class DeclarePrecedenceImpl implements DeclarePrecedence { public TypePattern[] getPrecedenceOrder() { return this.precedenceList; } - + public String toString() { return "declare precedence : " + this.precedenceString; } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareSoftImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareSoftImpl.java index 4fb8122c6..3dfba60aa 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareSoftImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareSoftImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -26,8 +26,8 @@ public class DeclareSoftImpl implements DeclareSoft { private PointcutExpression pointcut; private AjType<?> exceptionType; private String missingTypeName; - - + + public DeclareSoftImpl(AjType<?> declaringType, String pcut, String exceptionTypeName) { this.declaringType = declaringType; this.pointcut = new PointcutExpressionImpl(pcut); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeConstructorDeclarationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeConstructorDeclarationImpl.java index 9df0c99ef..6e17debf8 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeConstructorDeclarationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeConstructorDeclarationImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -26,7 +26,7 @@ public class InterTypeConstructorDeclarationImpl extends InterTypeDeclarationImpl implements InterTypeConstructorDeclaration { private Method baseMethod; - + public InterTypeConstructorDeclarationImpl(AjType<?> decType, String target, int mods, Method baseMethod) { super(decType, target, mods); @@ -63,7 +63,7 @@ public class InterTypeConstructorDeclarationImpl extends } return ret; } - + public String toString() { StringBuffer sb = new StringBuffer(); sb.append(java.lang.reflect.Modifier.toString(getModifiers())); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeDeclarationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeDeclarationImpl.java index f091665ef..511aabdc4 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeDeclarationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeDeclarationImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -24,7 +24,7 @@ public class InterTypeDeclarationImpl implements InterTypeDeclaration { protected String targetTypeName; private AjType<?> targetType; private int modifiers; - + public InterTypeDeclarationImpl(AjType<?> decType, String target, int mods) { this.declaringType = decType; this.targetTypeName = target; @@ -35,7 +35,7 @@ public class InterTypeDeclarationImpl implements InterTypeDeclaration { // we'll only report this later if the user asks for the target type. } } - + public InterTypeDeclarationImpl(AjType<?> decType, AjType<?> targetType, int mods) { this.declaringType = decType; this.targetType = targetType; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeFieldDeclarationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeFieldDeclarationImpl.java index f65d4b0e1..67bd2e5c9 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeFieldDeclarationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeFieldDeclarationImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -28,7 +28,7 @@ public class InterTypeFieldDeclarationImpl extends InterTypeDeclarationImpl private String name; private AjType<?> type; private Type genericType; - + public InterTypeFieldDeclarationImpl(AjType<?> decType, String target, int mods, String name, AjType<?> type, Type genericType) { super(decType, target, mods); @@ -36,7 +36,7 @@ public class InterTypeFieldDeclarationImpl extends InterTypeDeclarationImpl this.type = type; this.genericType = genericType; } - + public InterTypeFieldDeclarationImpl(AjType<?> decType, AjType<?> targetType, Field base) { super(decType,targetType,base.getModifiers()); this.name = base.getName(); @@ -60,7 +60,7 @@ public class InterTypeFieldDeclarationImpl extends InterTypeDeclarationImpl public Type getGenericType() { return this.genericType; } - + public String toString() { StringBuffer sb = new StringBuffer(); sb.append(java.lang.reflect.Modifier.toString(getModifiers())); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeMethodDeclarationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeMethodDeclarationImpl.java index 4ef079b49..89ebf387f 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeMethodDeclarationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeMethodDeclarationImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -34,7 +34,7 @@ public class InterTypeMethodDeclarationImpl extends InterTypeDeclarationImpl private AjType<?> returnType; private Type genericReturnType; private AjType<?>[] exceptionTypes; - + public InterTypeMethodDeclarationImpl(AjType<?> decType, String target, int mods, String name, Method itdInterMethod) { super(decType, target, mods); @@ -48,7 +48,7 @@ public class InterTypeMethodDeclarationImpl extends InterTypeDeclarationImpl this.name = base.getName(); this.baseMethod = base; } - + public String getName() { return this.name; } @@ -99,7 +99,7 @@ public class InterTypeMethodDeclarationImpl extends InterTypeDeclarationImpl } return ret; } - + public String toString() { StringBuffer sb = new StringBuffer(); sb.append(java.lang.reflect.Modifier.toString(getModifiers())); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PerClauseImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PerClauseImpl.java index e01519914..4e7a6f871 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PerClauseImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PerClauseImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -21,11 +21,11 @@ import org.aspectj.lang.reflect.PerClauseKind; public class PerClauseImpl implements PerClause { private final PerClauseKind kind; - + protected PerClauseImpl(PerClauseKind kind) { this.kind = kind; } - + public PerClauseKind getKind() { return kind; } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutBasedPerClauseImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutBasedPerClauseImpl.java index 5049d3a42..4cbe0a265 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutBasedPerClauseImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutBasedPerClauseImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -29,7 +29,7 @@ public class PointcutBasedPerClauseImpl extends PerClauseImpl implements super(kind); this.pointcutExpression = new PointcutExpressionImpl(pointcutExpression); } - + public PointcutExpression getPointcutExpression() { return pointcutExpression; } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutExpressionImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutExpressionImpl.java index facf7d99d..282cb6452 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutExpressionImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutExpressionImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -19,14 +19,14 @@ import org.aspectj.lang.reflect.PointcutExpression; */ public class PointcutExpressionImpl implements PointcutExpression { private String expression; - + public PointcutExpressionImpl(String aPointcutExpression) { this.expression = aPointcutExpression; } - + public String asString() { return expression; } - + public String toString() { return asString(); } } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutImpl.java index b94f1c864..6a84f2104 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -30,7 +30,7 @@ public class PointcutImpl implements Pointcut { private final Method baseMethod; private final AjType declaringType; private String[] parameterNames = new String[0]; - + protected PointcutImpl(String name, String pc, Method method, AjType declaringType, String pNames) { this.name = name; this.pc = new PointcutExpressionImpl(pc); @@ -38,14 +38,14 @@ public class PointcutImpl implements Pointcut { this.declaringType = declaringType; this.parameterNames = splitOnComma(pNames); } - + /* (non-Javadoc) * @see org.aspectj.lang.reflect.Pointcut#getPointcutExpression() */ public PointcutExpression getPointcutExpression() { return pc; } - + public String getName() { return name; } @@ -66,7 +66,7 @@ public class PointcutImpl implements Pointcut { public AjType getDeclaringType() { return declaringType; } - + public String[] getParameterNames() { return parameterNames; } @@ -79,7 +79,7 @@ public class PointcutImpl implements Pointcut { } return ret; } - + public String toString() { StringBuffer sb = new StringBuffer(); sb.append(getName()); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/SignaturePatternImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/SignaturePatternImpl.java index 4fef6c1b9..13e558a73 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/SignaturePatternImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/SignaturePatternImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -20,7 +20,7 @@ import org.aspectj.lang.reflect.SignaturePattern; public class SignaturePatternImpl implements SignaturePattern { private String sigPattern; - + public SignaturePatternImpl(String pattern) { this.sigPattern = pattern; } @@ -28,7 +28,7 @@ public class SignaturePatternImpl implements SignaturePattern { public String asString() { return sigPattern; } - + public String toString() { return asString(); } } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/StringToType.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/StringToType.java index b953fa1ce..4951f37c6 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/StringToType.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/StringToType.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -24,20 +24,20 @@ import org.aspectj.lang.reflect.AjTypeSystem; */ public class StringToType { - public static Type[] commaSeparatedListToTypeArray(String typeNames, Class classScope) + public static Type[] commaSeparatedListToTypeArray(String typeNames, Class classScope) throws ClassNotFoundException { StringTokenizer strTok = new StringTokenizer(typeNames,","); Type[] ret = new Type[strTok.countTokens()]; int index = 0; - //outer: + //outer: while (strTok.hasMoreTokens()) { String typeName = strTok.nextToken().trim(); ret[index++] = stringToType(typeName, classScope); } return ret; } - - public static Type stringToType(String typeName, Class classScope) + + public static Type stringToType(String typeName, Class classScope) throws ClassNotFoundException { try { if (!typeName.contains("<")) { @@ -56,8 +56,8 @@ public class StringToType { throw new ClassNotFoundException(typeName); } } - - private static Type makeParameterizedType(String typeName, Class classScope) + + private static Type makeParameterizedType(String typeName, Class classScope) throws ClassNotFoundException { int paramStart = typeName.indexOf('<'); String baseName = typeName.substring(0, paramStart); @@ -77,7 +77,7 @@ public class StringToType { public Type getOwnerType() { return baseClass.getEnclosingClass(); - } + } }; } } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/TypePatternBasedPerClauseImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/TypePatternBasedPerClauseImpl.java index f0bca173c..6d0881df8 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/TypePatternBasedPerClauseImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/TypePatternBasedPerClauseImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -32,7 +32,7 @@ public class TypePatternBasedPerClauseImpl extends PerClauseImpl implements public TypePattern getTypePattern() { return this.typePattern; } - + public String toString() { return "pertypewithin(" + typePattern.asString() + ")"; } diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/TypePatternImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/TypePatternImpl.java index 80b4b2ad1..fe15b02e8 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/TypePatternImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/TypePatternImpl.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -20,7 +20,7 @@ import org.aspectj.lang.reflect.TypePattern; public class TypePatternImpl implements TypePattern { private String typePattern; - + public TypePatternImpl(String pattern) { this.typePattern = pattern; } @@ -28,7 +28,7 @@ public class TypePatternImpl implements TypePattern { public String asString() { return this.typePattern; } - + public String toString() { return asString(); } } diff --git a/runtime/src/main/java/org/aspectj/lang/Aspects.java b/runtime/src/main/java/org/aspectj/lang/Aspects.java index ecc388bdb..a0b6b6cc2 100644 --- a/runtime/src/main/java/org/aspectj/lang/Aspects.java +++ b/runtime/src/main/java/org/aspectj/lang/Aspects.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur @@ -36,7 +36,7 @@ public class Aspects { /** * @param <T> the expected class of the aspect - * @param aspectClass the aspect class + * @param aspectClass the aspect class * @return the singleton aspect or the percflow / percflowbelow associated with the current thread * @throws NoAspectBoundException if no such aspect */ @@ -53,7 +53,7 @@ public class Aspects { /** * @param <T> the expected class of the aspect - * @param aspectClass the aspect class + * @param aspectClass the aspect class * @param perObject the this/target object for which to look for an aspect instance * @return the associated perthis / pertarget aspect instance * @throws NoAspectBoundException if no such aspect, or no aspect bound @@ -71,7 +71,7 @@ public class Aspects { /** * @param <T> the expected class of the aspect - * @param aspectClass the aspect class + * @param aspectClass the aspect class * @param perTypeWithin the class for which to search for an aspect instance * @return the associated aspect instance * @throws NoAspectBoundException if no such aspect, or no aspect bound @@ -88,7 +88,7 @@ public class Aspects { } /** - * @param aspectClass the aspect class + * @param aspectClass the aspect class * @return true if singleton aspect or percflow / percflowbelow aspect is bound * @throws NoAspectBoundException if not bound */ @@ -101,7 +101,7 @@ public class Aspects { } /** - * @param aspectClass the aspect class + * @param aspectClass the aspect class * @param perObject the this/target object for which to look for an aspect instance * @return true if the perthis / pertarget aspect is bound * @throws NoAspectBoundException if not bound @@ -115,7 +115,7 @@ public class Aspects { } /** - * @param aspectClass the aspect class + * @param aspectClass the aspect class * @param perTypeWithin class * @return true if the pertypewithin aspect is bound * @throws NoAspectBoundException if not bound @@ -149,7 +149,7 @@ public class Aspects { method.setAccessible(true); if (!method.isAccessible() || !Modifier.isPublic(method.getModifiers()) - || !Modifier.isStatic(method.getModifiers())) { + || !Modifier.isStatic(method.getModifiers())) { throw new NoSuchMethodException(aspectClass.getName() + ".aspectOf(..) is not accessible public static"); } return method; diff --git a/runtime/src/main/java/org/aspectj/lang/Aspects14.java b/runtime/src/main/java/org/aspectj/lang/Aspects14.java index 4ddb6b123..4885000dc 100644 --- a/runtime/src/main/java/org/aspectj/lang/Aspects14.java +++ b/runtime/src/main/java/org/aspectj/lang/Aspects14.java @@ -2,9 +2,9 @@ * Copyright (c) 2006 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * variant of Aspects in the aspectj5rt project - this one isn't Java5 - Andy Clement @@ -17,7 +17,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; /** - * For users working on a level of Java prior to Java5, Aspects14 handles generic aspectOf methods when they + * For users working on a level of Java prior to Java5, Aspects14 handles generic aspectOf methods when they * are not available in the aspects but added later on through load time weaving. Users on Java5 should use * the class Aspects instead. * Aspects14.aspectOf(..) is doing reflective calls to the aspect aspectOf, so for better performance @@ -152,7 +152,7 @@ public class Aspects14 { method.setAccessible(true); if (!method.isAccessible() || !Modifier.isPublic(method.getModifiers()) - || !Modifier.isStatic(method.getModifiers())) { + || !Modifier.isStatic(method.getModifiers())) { throw new NoSuchMethodException(aspectClass.getName() + ".aspectOf(..) is not accessible public static"); } return method; diff --git a/runtime/src/main/java/org/aspectj/lang/JoinPoint.java b/runtime/src/main/java/org/aspectj/lang/JoinPoint.java index 03c834e7a..e587d6d6e 100644 --- a/runtime/src/main/java/org/aspectj/lang/JoinPoint.java +++ b/runtime/src/main/java/org/aspectj/lang/JoinPoint.java @@ -3,9 +3,9 @@ * 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Xerox/PARC initial implementation diff --git a/runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java b/runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java index 286e4c1f1..9c6e6ba3d 100644 --- a/runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java +++ b/runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java @@ -1,20 +1,20 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.lang; -/** +/** * Thrown by the <code>aspectOf</code> special method on aspect types * when there is no aspect of that type currently bound. */ @@ -25,10 +25,10 @@ public class NoAspectBoundException extends RuntimeException { "Exception while initializing " +aspectName + ": " +inner); this.cause = inner; } - + public NoAspectBoundException() { } - + public Throwable getCause() { return cause; } - + } diff --git a/runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java b/runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java index 8d4d2fe57..e7b639de9 100644 --- a/runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java +++ b/runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/runtime/src/main/java/org/aspectj/lang/Signature.java b/runtime/src/main/java/org/aspectj/lang/Signature.java index cd1cd4aac..677ab9759 100644 --- a/runtime/src/main/java/org/aspectj/lang/Signature.java +++ b/runtime/src/main/java/org/aspectj/lang/Signature.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -16,14 +16,14 @@ package org.aspectj.lang; /** <p>Represents the signature at a join point. This interface parallels * <code>java.lang.reflect.Member</code>. </p> - * + * * <p>This interface is typically used for tracing or logging applications * to obtain reflective information about the join point, i.e. using * the j2se 1.4 <code>java.util.logging</code> API</p> * <pre> * aspect Logging { * Logger logger = Logger.getLogger("MethodEntries"); - * + * * before(): within(com.bigboxco..*) && execution(public * *(..)) { * Signature sig = thisJoinPoint.getSignature(); * logger.entering(sig.getDeclaringType().getName(), @@ -31,13 +31,13 @@ package org.aspectj.lang; * } * } * </pre> - * - * + * + * * <p>More detailed information about a specific kind of signature can - * be obtained by casting this <code>Signature</code> object into one + * be obtained by casting this <code>Signature</code> object into one * of its more specific sub-types available in * <code>org.aspectj.lang.reflect</code>. - * + * * @see java.lang.reflect.Member * @see java.util.logging.Logger */ @@ -58,48 +58,48 @@ public interface Signature { /** * @return the identifier part of this signature. For methods this * will return the method name. - * + * * @see java.lang.reflect.Member#getName */ String getName(); /** * Returns the modifiers on this signature represented as an int. Use - * the constants and helper methods defined on + * the constants and helper methods defined on * <code>java.lang.reflect.Modifier</code> to manipulate this, i.e. * <pre> * // check if this signature is public * java.lang.reflect.Modifier.isPublic(sig.getModifiers()); - * + * * // print out the modifiers * java.lang.reflect.Modifier.toString(sig.getModifiers()); * </pre> - * + * * @return the modifiers on this signature represented as an int * @see java.lang.reflect.Member#getModifiers * @see java.lang.reflect.Modifier */ - int getModifiers(); + int getModifiers(); /** * <p>Returns a <code>java.lang.Class</code> object representing the class, * interface, or aspect that declared this member. For intra-member * declarations, this will be the type on which the member is declared, * not the type where the declaration is lexically written. Use - * <code>SourceLocation.getWithinType()</code> to get the type in + * <code>SourceLocation.getWithinType()</code> to get the type in * which the declaration occurs lexically.</p> * <p>For consistency with <code>java.lang.reflect.Member</code>, this * method should have been named <code>getDeclaringClass()</code>.</p> - * + * * @return the class, interface or aspect that declared this member * @see java.lang.reflect.Member#getDeclaringClass */ Class getDeclaringType(); - + /** * This is equivalent to calling getDeclaringType().getName(), but caches * the result for greater efficiency. - * + * * @return the fully qualified name of the declaring type */ String getDeclaringTypeName(); diff --git a/runtime/src/main/java/org/aspectj/lang/SoftException.java b/runtime/src/main/java/org/aspectj/lang/SoftException.java index ea75ebac4..2a09f4f4a 100644 --- a/runtime/src/main/java/org/aspectj/lang/SoftException.java +++ b/runtime/src/main/java/org/aspectj/lang/SoftException.java @@ -1,15 +1,15 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC), * 2004 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -18,7 +18,7 @@ package org.aspectj.lang; import java.io.PrintStream; import java.io.PrintWriter; -/** +/** * Wrapper for checked exceptions matched by a 'declare soft'. * You can soften checked exceptions at join points by using * the form <code>declare soft: TypePattern: Pointcut</code>. @@ -43,23 +43,23 @@ public class SoftException extends RuntimeException { HAVE_JAVA_14 = java14; } - // shouldn't field be private final, constructor default or private? + // shouldn't field be private final, constructor default or private? // but either would be a binary incompatible change. - Throwable inner; + Throwable inner; public SoftException(Throwable inner) { super(); this.inner = inner; } - + public Throwable getWrappedThrowable() { return inner; } public Throwable getCause() { return inner; } - + public void printStackTrace() { - printStackTrace(System.err); + printStackTrace(System.err); } - + public void printStackTrace(PrintStream stream) { super.printStackTrace(stream); final Throwable _inner = this.inner; @@ -68,7 +68,7 @@ public class SoftException extends RuntimeException { _inner.printStackTrace(stream); } } - + public void printStackTrace(PrintWriter stream) { super.printStackTrace(stream); final Throwable _inner = this.inner; diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/AdviceName.java b/runtime/src/main/java/org/aspectj/lang/annotation/AdviceName.java index 62f60916e..5b5354204 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/AdviceName.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/AdviceName.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2005 Contributors. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Adrian Colyer initial implementation *******************************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/After.java b/runtime/src/main/java/org/aspectj/lang/annotation/After.java index 43d9edc57..84324c01e 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/After.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/After.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur @@ -29,14 +29,14 @@ public @interface After { * @return the pointcut expression where to bind the advice */ String value(); - + /** * When compiling without debug info, or when interpreting pointcuts at runtime, * the names of any arguments used in the advice declaration are not available. - * Under these circumstances only, it is necessary to provide the arg names in + * Under these circumstances only, it is necessary to provide the arg names in * the annotation - these MUST duplicate the names used in the annotated method. * Format is a simple comma-separated list. - * + * * @return the argument names (should duplicate the names used for the annotated method parameters) */ String argNames() default ""; diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/AfterReturning.java b/runtime/src/main/java/org/aspectj/lang/annotation/AfterReturning.java index 99e7f99f4..536d666a7 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/AfterReturning.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/AfterReturning.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur @@ -39,11 +39,11 @@ public @interface AfterReturning { * @return the name of the argument in the advice signature to bind the returned value to */ String returning() default ""; - + /** * When compiling without debug info, or when interpreting pointcuts at runtime, * the names of any arguments used in the advice declaration are not available. - * Under these circumstances only, it is necessary to provide the arg names in + * Under these circumstances only, it is necessary to provide the arg names in * the annotation - these MUST duplicate the names used in the annotated method. * Format is a simple comma-separated list. * @return the argument names (that should match names used in the annotated method) diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/AfterThrowing.java b/runtime/src/main/java/org/aspectj/lang/annotation/AfterThrowing.java index 32d0f7944..b4dc816ad 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/AfterThrowing.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/AfterThrowing.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur @@ -39,11 +39,11 @@ public @interface AfterThrowing { * @return the name of the argument in the advice signature to bind the thrown exception to */ String throwing() default ""; - + /** * When compiling without debug info, or when interpreting pointcuts at runtime, * the names of any arguments used in the advice declaration are not available. - * Under these circumstances only, it is necessary to provide the arg names in + * Under these circumstances only, it is necessary to provide the arg names in * the annotation - these MUST duplicate the names used in the annotated method. * Format is a simple comma-separated list. * @return the argument names (that should match names used in the annotated method) diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/Around.java b/runtime/src/main/java/org/aspectj/lang/annotation/Around.java index 36510c70f..b1eade09a 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/Around.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/Around.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur @@ -29,11 +29,11 @@ public @interface Around { * @return the pointcut expression where to bind the advice */ String value(); - + /** * When compiling without debug info, or when interpreting pointcuts at runtime, * the names of any arguments used in the advice declaration are not available. - * Under these circumstances only, it is necessary to provide the arg names in + * Under these circumstances only, it is necessary to provide the arg names in * the annotation - these MUST duplicate the names used in the annotated method. * Format is a simple comma-separated list. * @return the argument names (should match the names on the annotated method) diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/Aspect.java b/runtime/src/main/java/org/aspectj/lang/annotation/Aspect.java index 7db0814ad..659ee7f5a 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/Aspect.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/Aspect.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/Before.java b/runtime/src/main/java/org/aspectj/lang/annotation/Before.java index db1ec5e2a..cc38314bd 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/Before.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/Before.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur @@ -29,14 +29,14 @@ public @interface Before { * @return the pointcut expression where to bind the advice */ String value(); - + /** * When compiling without debug info, or when interpreting pointcuts at runtime, * the names of any arguments used in the advice declaration are not available. - * Under these circumstances only, it is necessary to provide the arg names in + * Under these circumstances only, it is necessary to provide the arg names in * the annotation - these MUST duplicate the names used in the annotated method. * Format is a simple comma-separated list. - * + * * @return the argument names (should match the annotated method parameter names) */ String argNames() default ""; diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareAnnotation.java b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareAnnotation.java index d6b730be6..247a8e9fa 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareAnnotation.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareAnnotation.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Alexandre Vasseur initial implementation diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareError.java b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareError.java index 0d0d1c055..feea26550 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareError.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareError.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.annotation; @@ -19,7 +19,7 @@ import java.lang.annotation.Target; /** * @author colyer * Annotation for declare error... - * + * * usage: @DeclareError("somePcut()") * private static final String "a message"; */ diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareMixin.java b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareMixin.java index 4a7d35085..cbf60be27 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareMixin.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareMixin.java @@ -2,12 +2,12 @@ * Copyright (c) 2009 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: - * initial implementation Andy Clement + * initial implementation Andy Clement *******************************************************************************/ package org.aspectj.lang.annotation; diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareParents.java b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareParents.java index 9f2c02a4f..91f209466 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareParents.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareParents.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Adrian Colyer @@ -33,7 +33,7 @@ public @interface DeclareParents { * of interface members (equivalent to defining * a set of interface member ITDs for the * public methods of the interface). - * + * * @return define the default implementation of interface members (should always be specified) */ Class defaultImpl() default DeclareParents.class; diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/DeclarePrecedence.java b/runtime/src/main/java/org/aspectj/lang/annotation/DeclarePrecedence.java index 2c74c8a99..79d971dd7 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/DeclarePrecedence.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/DeclarePrecedence.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareWarning.java b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareWarning.java index 17cf2df74..ec765cf50 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/DeclareWarning.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/DeclareWarning.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.annotation; @@ -19,7 +19,7 @@ import java.lang.annotation.Target; /** * @author colyer * Annotation for declare warning... - * + * * usage: @DeclareWarning("somePcut()") * private static final String "a message"; */ diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/Pointcut.java b/runtime/src/main/java/org/aspectj/lang/annotation/Pointcut.java index 938a50a80..ae3891067 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/Pointcut.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/Pointcut.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur @@ -30,14 +30,14 @@ public @interface Pointcut { * We allow "" as default for abstract pointcut */ String value() default ""; - + /** * When compiling without debug info, or when interpreting pointcuts at runtime, * the names of any arguments used in the pointcut are not available. - * Under these circumstances only, it is necessary to provide the arg names in + * Under these circumstances only, it is necessary to provide the arg names in * the annotation - these MUST duplicate the names used in the annotated method. * Format is a simple comma-separated list. - * + * * @return argNames the argument names (should match those in the annotated method) */ String argNames() default ""; diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/RequiredTypes.java b/runtime/src/main/java/org/aspectj/lang/annotation/RequiredTypes.java index d83b1bb73..92534ced5 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/RequiredTypes.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/RequiredTypes.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2014 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * ******************************************************************/ package org.aspectj.lang.annotation; @@ -19,7 +19,7 @@ import java.lang.annotation.Target; * type names as strings, for example "com.foo.Bar". Useful in an aspect library that * includes a number of aspects, only a few of which should ever be active depending * upon what is on the classpath. - * + * * @author Andy Clement * @since 1.8.3 */ diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/SuppressAjWarnings.java b/runtime/src/main/java/org/aspectj/lang/annotation/SuppressAjWarnings.java index 8fa9c6a16..0e788018b 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/SuppressAjWarnings.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/SuppressAjWarnings.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: - * Wes Isberg initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Wes Isberg initial implementation * Andy Clement fleshed out to match SuppressWarnings * ******************************************************************/ @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; * <ul> * <li>advice that might not run (-Xlint TODO message id)</li> * </ul> - * + * */ @Retention(RetentionPolicy.RUNTIME) public @interface SuppressAjWarnings { diff --git a/runtime/src/main/java/org/aspectj/lang/annotation/control/CodeGenerationHint.java b/runtime/src/main/java/org/aspectj/lang/annotation/control/CodeGenerationHint.java index e7d92c301..57a131cbd 100644 --- a/runtime/src/main/java/org/aspectj/lang/annotation/control/CodeGenerationHint.java +++ b/runtime/src/main/java/org/aspectj/lang/annotation/control/CodeGenerationHint.java @@ -2,9 +2,9 @@ * Copyright (c) 2013 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Andy Clement diff --git a/runtime/src/main/java/org/aspectj/lang/internal/lang/PlaceHolder.java b/runtime/src/main/java/org/aspectj/lang/internal/lang/PlaceHolder.java index 9edd4bcdf..3de99d5ce 100644 --- a/runtime/src/main/java/org/aspectj/lang/internal/lang/PlaceHolder.java +++ b/runtime/src/main/java/org/aspectj/lang/internal/lang/PlaceHolder.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: - * Wes Isberg initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Wes Isberg initial implementation * ******************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/Advice.java b/runtime/src/main/java/org/aspectj/lang/reflect/Advice.java index 3c00e74ad..cfdf5bb8c 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/Advice.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/Advice.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -22,37 +22,37 @@ public interface Advice { * @return the declaring aspect */ AjType getDeclaringType(); - + /** * @return the kind of advice (before, after-returning, after-throwing, etc.) */ AdviceKind getKind(); - + /** * If using the @AspectJ annotations, the advice name is the name of the * annotated advice method. If using the code style, the advice is * anonymous, unless the advice is annotated with the @AdviceName annotation, * in which case the name given in the annotation is returned. - * + * * @return the advice name, or the empty string if the advice is anonymous. */ String getName(); - + /** * @return the advice parameters */ AjType<?>[] getParameterTypes(); - + /** * @return the generic parameter types, @see java.lang.reflect.Method.getGenericParameterTypes */ Type[] getGenericParameterTypes(); - + /** * @return the declared thrown exceptions by the advice */ AjType<?>[] getExceptionTypes(); - + /** * @return the pointcut expression associated with the advice declaration. */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/AdviceKind.java b/runtime/src/main/java/org/aspectj/lang/reflect/AdviceKind.java index 82351db88..f07641d01 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/AdviceKind.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/AdviceKind.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java index c01f75019..3ab39919b 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/AjType.java b/runtime/src/main/java/org/aspectj/lang/reflect/AjType.java index a4b3aab4c..3ede863db 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/AjType.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/AjType.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Adrian Colyer Initial implementation diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/AjTypeSystem.java b/runtime/src/main/java/org/aspectj/lang/reflect/AjTypeSystem.java index 2f21ba2ff..bf2bf0364 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/AjTypeSystem.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/AjTypeSystem.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -19,20 +19,20 @@ import java.util.WeakHashMap; import org.aspectj.internal.lang.reflect.AjTypeImpl; /** - * This is the anchor for the AspectJ runtime type system. + * This is the anchor for the AspectJ runtime type system. * Typical usage to get the AjType representation of a given type * at runtime is to call <code>AjType<Foo> fooType = AjTypeSystem.getAjType(Foo.class);</code> */ public class AjTypeSystem { - - private static Map<Class, WeakReference<AjType>> ajTypes = + + private static Map<Class, WeakReference<AjType>> ajTypes = Collections.synchronizedMap(new WeakHashMap<>()); /** * Return the AspectJ runtime type representation of the given Java type. * Unlike java.lang.Class, AjType understands pointcuts, advice, declare statements, * and other AspectJ type members. AjType is the recommended reflection API for - * AspectJ programs as it offers everything that java.lang.reflect does, with + * AspectJ programs as it offers everything that java.lang.reflect does, with * AspectJ-awareness on top. * @param <T> the expected type associated with the returned AjType * @param fromClass the class for which to discover the AjType diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java index 9a008994d..2b36aa70e 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -17,6 +17,6 @@ package org.aspectj.lang.reflect; import org.aspectj.lang.Signature; public interface CatchClauseSignature extends Signature { - Class getParameterType(); + Class getParameterType(); String getParameterName(); } diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java index 1c6ba45e3..d8d6c5017 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java index 268a759a2..f30f7bcf6 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/DeclareAnnotation.java b/runtime/src/main/java/org/aspectj/lang/reflect/DeclareAnnotation.java index 17f8637d7..bd18b00c2 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/DeclareAnnotation.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/DeclareAnnotation.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Adrian Colyer Initial implementation diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/DeclareErrorOrWarning.java b/runtime/src/main/java/org/aspectj/lang/reflect/DeclareErrorOrWarning.java index 1892e5035..01de92372 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/DeclareErrorOrWarning.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/DeclareErrorOrWarning.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -16,25 +16,25 @@ package org.aspectj.lang.reflect; * in an aspect. */ public interface DeclareErrorOrWarning { - + /** - * @return the type that declared this declare warning or declare error member. + * @return the type that declared this declare warning or declare error member. */ AjType getDeclaringType(); - + /** * @return the pointcut expression associated with the warning or error */ PointcutExpression getPointcutExpression(); - + /** * @return the message associated with the declare warning / declare error */ String getMessage(); - + /** * @return true if this is a declare error member, false if it is declare warning */ boolean isError(); - + } diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/DeclareParents.java b/runtime/src/main/java/org/aspectj/lang/reflect/DeclareParents.java index 2800f5d6c..be538e374 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/DeclareParents.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/DeclareParents.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -22,27 +22,27 @@ public interface DeclareParents { * @return the declaring aspect */ AjType getDeclaringType(); - + /** * @return the target type pattern */ TypePattern getTargetTypesPattern(); - + /** * @return true if this is a declare parents...extends member declaration */ boolean isExtends(); - + /** * @return true if this is a declare parents...implements member declaration */ boolean isImplements(); - + /** - * @return the set of types that the types matching getTargetTypesPattern are + * @return the set of types that the types matching getTargetTypesPattern are * declared to implement or extend * @throws ClassNotFoundException if any types cannot be found */ Type[] getParentTypes() throws ClassNotFoundException; - + } diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/DeclarePrecedence.java b/runtime/src/main/java/org/aspectj/lang/reflect/DeclarePrecedence.java index 26b415ecf..6720ae21d 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/DeclarePrecedence.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/DeclarePrecedence.java @@ -1,18 +1,18 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; /** - * AspectJ runtime representation of a declare precedence statement as + * AspectJ runtime representation of a declare precedence statement as * declared in an aspect. */ public interface DeclarePrecedence { @@ -21,7 +21,7 @@ public interface DeclarePrecedence { * @return the declaring aspect */ AjType getDeclaringType(); - + /** * @return an ordered set of type patterns. An aspect matching * a type pattern at a lower index in the array takes precedence diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/DeclareSoft.java b/runtime/src/main/java/org/aspectj/lang/reflect/DeclareSoft.java index 55ade67f3..0c42b67ac 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/DeclareSoft.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/DeclareSoft.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -15,18 +15,18 @@ package org.aspectj.lang.reflect; * AspectJ runtime representation of a declare soft member within an aspect. */ public interface DeclareSoft { - + /** * @return the aspect that declared this member */ AjType getDeclaringType(); - + /** * @return the softened exception type * @throws ClassNotFoundException if exception type cannot be found */ AjType getSoftenedExceptionType() throws ClassNotFoundException; - + /** * @return the pointcut determining the join points at which the exception is to be softened. */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java index 5e4c4a55f..082d80885 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java @@ -3,9 +3,9 @@ * 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Xerox/PARC initial implementation diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java index bbef8b6fa..407958200 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java @@ -1,15 +1,15 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC), * 2006 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -18,10 +18,10 @@ import java.lang.reflect.Constructor; /** * Signature for static and instance initializers. - * Static initializers have no parameters or exceptions, + * Static initializers have no parameters or exceptions, * so empty arrays are returned from the CodeSignature methods. */ -public interface InitializerSignature extends CodeSignature { +public interface InitializerSignature extends CodeSignature { /** * @return Constructor associated with this initializer, * or null in the case of interface initializers and diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeConstructorDeclaration.java b/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeConstructorDeclaration.java index c4bae0346..7fcaa6a14 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeConstructorDeclaration.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeConstructorDeclaration.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -23,12 +23,12 @@ public interface InterTypeConstructorDeclaration extends InterTypeDeclaration { * @return the constructor parameters */ AjType<?>[] getParameterTypes(); - + /** * @return the generic constructor parameters */ Type[] getGenericParameterTypes(); - + /** * @return the declared exceptions thrown by this constructor */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeDeclaration.java b/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeDeclaration.java index 5c2efc2c4..3469c4fe2 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeDeclaration.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeDeclaration.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -20,13 +20,13 @@ public interface InterTypeDeclaration { * @return the declaring aspect */ AjType<?> getDeclaringType(); - + /** * @return the target type of this ITD * @throws ClassNotFoundException if the type cannot be found */ AjType<?> getTargetType() throws ClassNotFoundException; - + /** * @return member modifiers, can be interpreted using java.lang.reflect.Modifier */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeFieldDeclaration.java b/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeFieldDeclaration.java index e396b7a6f..73e9ed384 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeFieldDeclaration.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeFieldDeclaration.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -17,17 +17,17 @@ import java.lang.reflect.Type; * Represents an inter-type field declaration declared in an aspect. */ public interface InterTypeFieldDeclaration extends InterTypeDeclaration { - + /** * @return the field name */ String getName(); - + /** * @return the field type */ AjType<?> getType(); - + /** * @return the generic field type */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeMethodDeclaration.java b/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeMethodDeclaration.java index 11e3f72a9..047e89244 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeMethodDeclaration.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/InterTypeMethodDeclaration.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -24,32 +24,32 @@ public interface InterTypeMethodDeclaration extends InterTypeDeclaration { * @return the name of this method */ String getName(); - + /** * @return the method return type */ AjType<?> getReturnType(); - + /** * @return the generic return type */ Type getGenericReturnType(); - + /** * @return the method parameters */ AjType<?>[] getParameterTypes(); - + /** * @return the generic method parameters */ Type[] getGenericParameterTypes(); - + /** - * @return the type variables declared by this method + * @return the type variables declared by this method */ TypeVariable<Method>[] getTypeParameters(); - + /** * @return the declared exceptions thrown by this method */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java index 5a52b3041..90cb45c6b 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Andy Clement - initial implementation *******************************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java index cbc448e1b..4efc3297e 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -18,5 +18,5 @@ import org.aspectj.lang.Signature; public interface MemberSignature extends Signature { // AccessibleObject is a 1.2 API, we run on 1.1... (thanks Wes for catching this) - //AccessibleObject getAccessibleObject(); + //AccessibleObject getAccessibleObject(); } diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java index d660e1eb1..22d11dd58 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/NoSuchAdviceException.java b/runtime/src/main/java/org/aspectj/lang/reflect/NoSuchAdviceException.java index dc133d340..d3a05bc21 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/NoSuchAdviceException.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/NoSuchAdviceException.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -19,11 +19,11 @@ public class NoSuchAdviceException extends Exception { private static final long serialVersionUID = 3256444698657634352L; private String name; - + public NoSuchAdviceException(String name) { this.name = name; } - + /** * @return the advice name that could not be found. */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/NoSuchPointcutException.java b/runtime/src/main/java/org/aspectj/lang/reflect/NoSuchPointcutException.java index 6027711f1..bf575cad8 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/NoSuchPointcutException.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/NoSuchPointcutException.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -19,11 +19,11 @@ public class NoSuchPointcutException extends Exception { private static final long serialVersionUID = 3256444698657634352L; private String name; - + public NoSuchPointcutException(String name) { this.name = name; } - + /** * @return the name of the pointcut that could not be found. */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/PerClause.java b/runtime/src/main/java/org/aspectj/lang/reflect/PerClause.java index 32be9628c..d8443698a 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/PerClause.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/PerClause.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/PerClauseKind.java b/runtime/src/main/java/org/aspectj/lang/reflect/PerClauseKind.java index 1e2d42ecd..1996fa55b 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/PerClauseKind.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/PerClauseKind.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/Pointcut.java b/runtime/src/main/java/org/aspectj/lang/reflect/Pointcut.java index 72b3ee33c..cc84b7282 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/Pointcut.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/Pointcut.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -15,30 +15,30 @@ package org.aspectj.lang.reflect; * AspectJ runtime representation of a pointcut member inside a class or aspect. */ public interface Pointcut { - + /** * @return the declared name of the pointcut. */ String getName(); - + /** - * @return the modifiers associated with the pointcut declaration. + * @return the modifiers associated with the pointcut declaration. * Use java.lang.reflect.Modifier to interpret the return value */ int getModifiers(); - + /** * @return the pointcut parameter types. */ AjType<?>[] getParameterTypes(); - + /** * @return the pointcut parameter names. Returns an array of empty strings * of length getParameterTypes().length if parameter names are not * available at runtime. */ String[] getParameterNames(); - + /** * @return the type that declared this pointcut */ diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/PointcutBasedPerClause.java b/runtime/src/main/java/org/aspectj/lang/reflect/PointcutBasedPerClause.java index c622124d1..bda262988 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/PointcutBasedPerClause.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/PointcutBasedPerClause.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/PointcutExpression.java b/runtime/src/main/java/org/aspectj/lang/reflect/PointcutExpression.java index b7d60ef27..a1acdfefd 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/PointcutExpression.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/PointcutExpression.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -18,7 +18,7 @@ package org.aspectj.lang.reflect; public interface PointcutExpression { /** - * @return a string representation of the pointcut expression + * @return a string representation of the pointcut expression */ String asString(); } diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/SignaturePattern.java b/runtime/src/main/java/org/aspectj/lang/reflect/SignaturePattern.java index 35177cee9..78465281b 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/SignaturePattern.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/SignaturePattern.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -19,5 +19,5 @@ public interface SignaturePattern { /** @return a string representation of this pattern */ String asString(); - + } diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java b/runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java index 7ba567f5f..6eeb43dc6 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -17,10 +17,10 @@ package org.aspectj.lang.reflect; /** For defining code, the class defined and location in a source file. */ public interface SourceLocation { Class getWithinType(); - + String getFileName(); int getLine(); - + /** * @deprecated can not be implemented for bytecode weaving, may * be removed in 1.1gold. diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/TypePattern.java b/runtime/src/main/java/org/aspectj/lang/reflect/TypePattern.java index 96a4b179e..82ffb19bb 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/TypePattern.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/TypePattern.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/TypePatternBasedPerClause.java b/runtime/src/main/java/org/aspectj/lang/reflect/TypePatternBasedPerClause.java index a8ea1f0ae..ec645c262 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/TypePatternBasedPerClause.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/TypePatternBasedPerClause.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.lang.reflect; @@ -22,5 +22,5 @@ public interface TypePatternBasedPerClause { * @return the associated type pattern */ TypePattern getTypePattern(); - + } diff --git a/runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java index 3e117ce18..7f1178743 100644 --- a/runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java +++ b/runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Andy Clement - initial implementation *******************************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/runtime/CFlow.java b/runtime/src/main/java/org/aspectj/runtime/CFlow.java index d607b4822..b587ec48b 100644 --- a/runtime/src/main/java/org/aspectj/runtime/CFlow.java +++ b/runtime/src/main/java/org/aspectj/runtime/CFlow.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java b/runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java index c7a9acc1e..c04f444b6 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * Alex Vasseur wired up for @AJ proceeding * Andy Clement 23-06-06 added extras for @AJ * ******************************************************************/ @@ -21,26 +21,26 @@ import org.aspectj.lang.ProceedingJoinPoint; public abstract class AroundClosure { protected Object[] state; - // Records with the related joinpoint has a this or a target and whether + // Records with the related joinpoint has a this or a target and whether // either of them are bound in the pointcut. Set in the 'link' call made // at each matching join point... (see pr126167) // bit6 being 1 means the flags haven't been initialized - protected int bitflags = 0x100000; + protected int bitflags = 0x100000; protected Object[] preInitializationState; public AroundClosure() { } - + public AroundClosure(Object[] state) { this.state = state; } - + public int getFlags() {return bitflags;} public Object[] getState() { return state; } - + public Object[] getPreInitializationState() { return preInitializationState; } @@ -55,7 +55,7 @@ public abstract class AroundClosure { /** * This method is called to implicitly associate the closure with the joinpoint * as required for @AJ aspect proceed() - * + * * @return the associated ProceedingJoinPoint */ public ProceedingJoinPoint linkClosureAndJoinPoint() { @@ -68,7 +68,7 @@ public abstract class AroundClosure { /** * This method is called to implicitly associate the closure with the joinpoint * as required for @AJ aspect proceed() - * + * * @param flags indicating whether this/target found at joinpoint and bound * @return the associated ProceedingJoinPoint */ @@ -83,7 +83,7 @@ public abstract class AroundClosure { /** * This method is called to implicitly associate the closure with the joinpoint * as required for @AJ aspect proceed() - * + * * @param flags indicating whether this/target found at joinpoint and bound * @return the associated ProceedingJoinPoint */ diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java index 633458195..5364d79a8 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement initial implementation + * + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Andy Clement initial implementation * ******************************************************************/ @@ -21,18 +21,18 @@ import org.aspectj.runtime.internal.cflowstack.ThreadStackFactoryImpl11; public class CFlowCounter { - + private static ThreadStackFactory tsFactory; private ThreadCounter flowHeightHandler; static { selectFactoryForVMVersion(); } - + public CFlowCounter() { flowHeightHandler = tsFactory.getNewThreadCounter(); } - + public void inc() { flowHeightHandler.inc(); } @@ -43,7 +43,7 @@ public class CFlowCounter { flowHeightHandler.removeThreadCounter(); } } - + public boolean isValid() { return flowHeightHandler.isNotZero(); } @@ -51,7 +51,7 @@ public class CFlowCounter { private static ThreadStackFactory getThreadLocalStackFactory() { return new ThreadStackFactoryImpl(); } private static ThreadStackFactory getThreadLocalStackFactoryFor11() { return new ThreadStackFactoryImpl11(); } - + private static void selectFactoryForVMVersion() { String override = getSystemPropertyWithoutSecurityException("aspectj.runtime.cflowstack.usethreadlocal","unspecified"); boolean useThreadLocalImplementation = false; @@ -69,8 +69,8 @@ public class CFlowCounter { tsFactory = getThreadLocalStackFactoryFor11(); } } - - + + private static String getSystemPropertyWithoutSecurityException (String aPropertyName, String aDefaultValue) { try { return System.getProperty(aPropertyName, aDefaultValue); @@ -79,7 +79,7 @@ public class CFlowCounter { return aDefaultValue; } } - + // For debug ... public static String getThreadStackFactoryClassName() { return tsFactory.getClass().getName(); diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java index b78864a33..2d35b8018 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java index 48308f145..fa7ec4d68 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -25,29 +25,29 @@ import org.aspectj.runtime.internal.cflowstack.ThreadStackFactoryImpl11; /* * How we benefit from ThreadLocal when it is available at runtime: - * + * * When the CFlowStack class is loaded, we run its static initializer. This checks the JVM * version number and loads an appropriate implementation of the ThreadStackFactory. * There are two possible implementations depending on whether this is a 1.1 or 1.2+ JVM. * Rather than doing a Class.forName for ThreadLocal and catching a ClassNotFoundEx in order * to determine the JVM version, we look at the java class version which I believe can help * us identify the Java level. - * + * * In the 1.1 JVM case we use a factory implementation that does not use ThreadLocal storage. * In the 1.2+ JVM case we use a factory implementation that does use ThreadLocal storage. - * - * Once we have the factory set, whenever someone builds a CFlowStack object, we ask the + * + * Once we have the factory set, whenever someone builds a CFlowStack object, we ask the * factory for a new stack proxy - this is an object that can return us the right stack * that we should use on a particular thread. The reason we create the proxy in the ctor and * not lazily in the getThreadStack() method is because it means the getThreadStack() method in * this class does not have to be synchronized. - * - * When any of the methods in CFlowStack need to operate on the stack (peek/pop/etc), they + * + * When any of the methods in CFlowStack need to operate on the stack (peek/pop/etc), they * all delegate to getThreadStack() which asks the proxy for the right stack. Depending on the * factory loaded to build the proxy, the call to proxy.getThreadStack() will return a threadlocal * based stack or it will call the original implementation of getThreadStack() which manages - * a Hashtable of threads->stacks. - * + * a Hashtable of threads->stacks. + * */ public class CFlowStack { @@ -58,11 +58,11 @@ public class CFlowStack { static { selectFactoryForVMVersion(); } - + public CFlowStack() { stackProxy = tsFactory.getNewThreadStack(); } - + private Stack getThreadStack() { return stackProxy.getThreadStack(); } @@ -93,7 +93,7 @@ public class CFlowStack { if (stack.isEmpty()) throw new org.aspectj.lang.NoAspectBoundException(); return (Object)stack.peek(); } - + public Object get(int index) { CFlow cf = peekCFlow(); return (null == cf ? null : cf.get(index)); @@ -120,10 +120,10 @@ public class CFlowStack { public boolean isValid() { return !getThreadStack().isEmpty(); } - + private static ThreadStackFactory getThreadLocalStackFactory() { return new ThreadStackFactoryImpl(); } private static ThreadStackFactory getThreadLocalStackFactoryFor11() { return new ThreadStackFactoryImpl11(); } - + private static void selectFactoryForVMVersion() { String override = getSystemPropertyWithoutSecurityException("aspectj.runtime.cflowstack.usethreadlocal","unspecified"); boolean useThreadLocalImplementation = false; @@ -141,7 +141,7 @@ public class CFlowStack { tsFactory = getThreadLocalStackFactoryFor11(); } } - + private static String getSystemPropertyWithoutSecurityException (String aPropertyName, String aDefaultValue) { try { return System.getProperty(aPropertyName, aDefaultValue); @@ -151,7 +151,7 @@ public class CFlowStack { } } - + // For debug ... public static String getThreadStackFactoryClassName() { return tsFactory.getClass().getName(); diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java b/runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java index 0d784266b..9efdc1b58 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java @@ -3,9 +3,9 @@ * 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Xerox/PARC initial implementation diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java b/runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java index 319740572..916ae280f 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -20,11 +20,11 @@ public class PerObjectMap { // private WeakHashMap map = new WeakHashMap(); // // public boolean hasAspect(Object o) { return map.containsKey(o); } -// +// // public Object aspectOf(Object o) { // return map.get(o); // } -// +// // public void bind(Object object, Object _aspect) { // map.put(object, _aspect); // } diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java index f4a34260e..b9ee7b2dd 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java @@ -3,9 +3,9 @@ * * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement initial implementation diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java index db372494e..62241d5b1 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement initial implementation + * + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Andy Clement initial implementation * Copied from bits of original CFlowStack * ******************************************************************/ package org.aspectj.runtime.internal.cflowstack; @@ -22,11 +22,11 @@ public class ThreadCounterImpl11 implements ThreadCounter { private Hashtable counters = new Hashtable(); private Thread cached_thread; private Counter cached_counter; - + private int change_count = 0; private static final int COLLECT_AT = 20000; - private static final int MIN_COLLECT_AT = 100; - + private static final int MIN_COLLECT_AT = 100; + static class Counter { protected int value = 0; } @@ -71,7 +71,7 @@ public class ThreadCounterImpl11 implements ThreadCounter { } public void removeThreadCounter() { - // TODO + // TODO } } diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java index 3ae58d97d..278f45ce7 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java @@ -3,9 +3,9 @@ * * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement initial implementation diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java index a752aef67..60d2a408a 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java @@ -3,9 +3,9 @@ * * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement initial implementation diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java index 2437f06b0..4e9f45562 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement initial implementation + * + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Andy Clement initial implementation * ******************************************************************/ package org.aspectj.runtime.internal.cflowstack; @@ -31,29 +31,29 @@ public class ThreadStackFactoryImpl implements ThreadStackFactory { public ThreadStack getNewThreadStack() { return new ThreadStackImpl(); } - + private static class ThreadCounterImpl extends ThreadLocal implements ThreadCounter { - + public Object initialValue() { return new Counter(); } public Counter getThreadCounter() { return (Counter)get(); } - + public void removeThreadCounter() { this.remove(); } - + public void inc() { getThreadCounter().value++; } public void dec() { getThreadCounter().value--; } public boolean isNotZero() { return getThreadCounter().value!= 0; } - + static class Counter { protected int value = 0; } } - + public ThreadCounter getNewThreadCounter() { return new ThreadCounterImpl(); } diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java index 21c246193..74b862864 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement initial implementation + * + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Andy Clement initial implementation * ******************************************************************/ package org.aspectj.runtime.internal.cflowstack; @@ -18,7 +18,7 @@ public class ThreadStackFactoryImpl11 implements ThreadStackFactory { public ThreadStack getNewThreadStack() { return new ThreadStackImpl11(); } - + public ThreadCounter getNewThreadCounter() { return new ThreadCounterImpl11(); } diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java index 51f09cadd..30c42fcc2 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement initial implementation + * + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Andy Clement initial implementation * Copied from bits of original CFlowStack * ******************************************************************/ package org.aspectj.runtime.internal.cflowstack; @@ -23,7 +23,7 @@ public class ThreadStackImpl11 implements ThreadStack { private Stack cached_stack; private int change_count = 0; private static final int COLLECT_AT = 20000; - private static final int MIN_COLLECT_AT = 100; + private static final int MIN_COLLECT_AT = 100; public synchronized Stack getThreadStack() { if (Thread.currentThread() != cached_thread) { diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java index 0022c03ba..11ca95fe0 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -22,8 +22,8 @@ import org.aspectj.lang.reflect.AdviceSignature; class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature { Class returnType; private Method adviceMethod = null; - - AdviceSignatureImpl(int modifiers, String name, Class declaringType, + + AdviceSignatureImpl(int modifiers, String name, Class declaringType, Class[] parameterTypes, String[] parameterNames, Class[] exceptionTypes, Class returnType) { @@ -31,11 +31,11 @@ class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature { exceptionTypes); this.returnType = returnType; } - + AdviceSignatureImpl(String stringRep) { super(stringRep); - } - /* name is consistent with reflection API + } + /* name is consistent with reflection API before and after always return Void.TYPE (some around also return Void.Type) */ public Class getReturnType() { @@ -47,15 +47,15 @@ class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature { StringBuffer buf = new StringBuffer(); // buf.append(sm.makeModifiersString(getModifiers())); if (sm.includeArgs) buf.append(sm.makeTypeName(getReturnType())); - if (sm.includeArgs) buf.append(" "); + if (sm.includeArgs) buf.append(" "); buf.append(sm.makePrimaryTypeName(getDeclaringType(),getDeclaringTypeName())); buf.append("."); - buf.append(toAdviceName(getName())); + buf.append(toAdviceName(getName())); sm.addSignature(buf, getParameterTypes()); sm.addThrows(buf, getExceptionTypes()); return buf.toString(); } - + private String toAdviceName(String methodName) { if (methodName.indexOf('$') == -1) return methodName; StringTokenizer strTok = new StringTokenizer(methodName,"$"); @@ -63,11 +63,11 @@ class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature { String token = strTok.nextToken(); if ( token.startsWith("before") || token.startsWith("after") || - token.startsWith("around") ) return token; + token.startsWith("around") ) return token; } return methodName; } - + /* (non-Javadoc) * @see org.aspectj.runtime.reflect.MemberSignatureImpl#createAccessibleObject() */ diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java index 6f049a66b..56f217d55 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -19,19 +19,19 @@ import org.aspectj.lang.reflect.CatchClauseSignature; class CatchClauseSignatureImpl extends SignatureImpl implements CatchClauseSignature { Class parameterType; String parameterName; - - CatchClauseSignatureImpl(Class declaringType, + + CatchClauseSignatureImpl(Class declaringType, Class parameterType, String parameterName) { super(0, "catch", declaringType); this.parameterType = parameterType; this.parameterName = parameterName; } - + CatchClauseSignatureImpl(String stringRep) { super(stringRep); } - + public Class getParameterType() { if (parameterType == null) parameterType = extractType(3); return parameterType; @@ -40,8 +40,8 @@ class CatchClauseSignatureImpl extends SignatureImpl implements CatchClauseSigna if (parameterName == null) parameterName = extractString(4); return parameterName; } - + protected String createToString(StringMaker sm) { return "catch(" + sm.makeTypeName(getParameterType()) + ")"; - } + } } diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java index 74fc462d6..f28b2e704 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -20,8 +20,8 @@ abstract class CodeSignatureImpl extends MemberSignatureImpl implements CodeSign Class[] parameterTypes; String[] parameterNames; Class[] exceptionTypes; - - CodeSignatureImpl(int modifiers, String name, Class declaringType, + + CodeSignatureImpl(int modifiers, String name, Class declaringType, Class[] parameterTypes, String[] parameterNames, Class[] exceptionTypes) { super(modifiers, name, declaringType); @@ -32,7 +32,7 @@ abstract class CodeSignatureImpl extends MemberSignatureImpl implements CodeSign CodeSignatureImpl(String stringRep) { super(stringRep); } - + public Class[] getParameterTypes() { if (parameterTypes == null) parameterTypes = extractTypes(3); return parameterTypes; diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java index a7f688d58..01ba7c8e5 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -20,19 +20,19 @@ import org.aspectj.lang.reflect.ConstructorSignature; class ConstructorSignatureImpl extends CodeSignatureImpl implements ConstructorSignature { private Constructor constructor; - - ConstructorSignatureImpl(int modifiers, Class declaringType, + + ConstructorSignatureImpl(int modifiers, Class declaringType, Class[] parameterTypes, String[] parameterNames, Class[] exceptionTypes) { super(modifiers, "<init>", declaringType, parameterTypes, parameterNames, exceptionTypes); - } - + } + ConstructorSignatureImpl(String stringRep) { super(stringRep); } - + public String getName() { return "<init>"; } - + protected String createToString(StringMaker sm) { StringBuffer buf = new StringBuffer(); buf.append(sm.makeModifiersString(getModifiers())); @@ -41,7 +41,7 @@ class ConstructorSignatureImpl extends CodeSignatureImpl implements ConstructorS sm.addThrows(buf, getExceptionTypes()); return buf.toString(); } - + /* (non-Javadoc) * @see org.aspectj.runtime.reflect.MemberSignatureImpl#createAccessibleObject() */ diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java b/runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java index e2f414bfa..1f199108f 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002-2018 Palo Alto Research Center, Incorporated (PARC), Contributors - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * Alex Vasseur new factory methods for variants of JP * Abraham Nevado new factory methods for collapsed SJPs * Andy Clement new factory methods that rely on LDC <class> @@ -39,7 +39,7 @@ public final class Factory { ClassLoader lookupClassLoader; String filename; int count; - + private static final Class[] NO_TYPES = new Class[0]; private static final String[] NO_STRINGS = new String[0]; @@ -88,7 +88,7 @@ public final class Factory { lookupClassLoader = lexicalClass.getClassLoader(); } - + // // Create a signature and build a JoinPoint in one step. Prior to 1.6.10 this was done as a two step operation in the generated // code but merging these methods in the runtime library enables the generated code to be shorter. Generating code that @@ -99,95 +99,95 @@ public final class Factory { Signature sig = this.makeMethodSig(modifiers, methodName, declaringType, paramTypes, paramNames, exceptionTypes, returnType); return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(l, -1)); } - + // Create a signature and build a JoinPoint in one step. Prior to 1.6.10 this was done as a two step operation in the generated // code but merging these methods in the runtime library enables the generated code to be shorter. Generating code that // uses this method requires the weaver to be invoked with <tt>-Xset:targetRuntime1_6_10=true</tt>. // This method differs from the previous one in that it includes no exceptionTypes parameter - it is an optimization for the // case where there are no exceptions. The generated code won't build an empty string and will not pass it into here. - // + // // @since 1.6.10 public JoinPoint.StaticPart makeSJP(String kind, String modifiers, String methodName, String declaringType, String paramTypes, String paramNames, String returnType, int l) { Signature sig = this.makeMethodSig(modifiers, methodName, declaringType, paramTypes, paramNames, "", returnType); return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(l, -1)); } - + // These are direct routes to creating thisJoinPoint and thisEnclosingJoinPoint objects // added in 1.9.1 - + public JoinPoint.StaticPart makeMethodSJP(String kind, int modifiers, String methodName, Class declaringType, Class[] paramTypes, String[] paramNames, Class[] exceptionTypes, Class returnType, int line) { - Signature sig = this.makeMethodSig(modifiers, methodName, declaringType, paramTypes==null?NO_TYPES:paramTypes, + Signature sig = this.makeMethodSig(modifiers, methodName, declaringType, paramTypes==null?NO_TYPES:paramTypes, paramNames==null?NO_STRINGS:paramNames, exceptionTypes==null?NO_TYPES:exceptionTypes, returnType == null?Void.TYPE:returnType); - return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.EnclosingStaticPart makeMethodESJP(String kind, int modifiers, String methodName, Class declaringType, Class[] paramTypes, String[] paramNames, Class[] exceptionTypes, Class returnType, int line) { Signature sig = this.makeMethodSig(modifiers, methodName, declaringType, paramTypes==null?NO_TYPES:paramTypes, paramNames==null?NO_STRINGS:paramNames, exceptionTypes==null?NO_TYPES:exceptionTypes, returnType == null?Void.TYPE:returnType); - return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.StaticPart makeConstructorSJP(String kind, int modifiers, Class declaringType, Class[] parameterTypes, String[] parameterNames, Class[] exceptionTypes, int line) { ConstructorSignatureImpl sig = new ConstructorSignatureImpl(modifiers, declaringType, parameterTypes==null?NO_TYPES:parameterTypes, parameterNames==null?NO_STRINGS:parameterNames, exceptionTypes==null?NO_TYPES:exceptionTypes); - return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.EnclosingStaticPart makeConstructorESJP(String kind, int modifiers, Class declaringType, Class[] parameterTypes, String[] parameterNames, Class[] exceptionTypes, int line) { ConstructorSignatureImpl sig = new ConstructorSignatureImpl(modifiers, declaringType, parameterTypes==null?NO_TYPES:parameterTypes, parameterNames==null?NO_STRINGS:parameterNames, exceptionTypes==null?NO_TYPES:exceptionTypes); - return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.StaticPart makeCatchClauseSJP(String kind, Class declaringType, Class parameterType, String parameterName, int line) { CatchClauseSignatureImpl sig = new CatchClauseSignatureImpl(declaringType, parameterType, parameterName==null?"":parameterName); - return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.EnclosingStaticPart makeCatchClauseESJP(String kind, Class declaringType, Class parameterType, String parameterName, int line) { CatchClauseSignatureImpl sig = new CatchClauseSignatureImpl(declaringType, parameterType, parameterName==null?"":parameterName); - return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.StaticPart makeFieldSJP(String kind, int modifiers, String name, Class declaringType, Class fieldType, int line) { FieldSignatureImpl sig = new FieldSignatureImpl(modifiers, name, declaringType, fieldType); - return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.EnclosingStaticPart makeFieldESJP(String kind, int modifiers, String name, Class declaringType, Class fieldType, int line) { FieldSignatureImpl sig = new FieldSignatureImpl(modifiers, name, declaringType, fieldType); - return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } - + public JoinPoint.StaticPart makeInitializerSJP(String kind, int modifiers, Class declaringType, int line) { InitializerSignatureImpl sig = new InitializerSignatureImpl(modifiers, declaringType); - return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.EnclosingStaticPart makeInitializerESJP(String kind, int modifiers, Class declaringType, int line) { InitializerSignatureImpl sig = new InitializerSignatureImpl(modifiers, declaringType); - return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } - + public JoinPoint.StaticPart makeLockSJP(String kind, Class declaringType, int line) { LockSignatureImpl sig = new LockSignatureImpl(declaringType); - return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.EnclosingStaticPart makeLockESJP(String kind, Class declaringType, int line) { LockSignatureImpl sig = new LockSignatureImpl(declaringType); - return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.StaticPart makeUnlockSJP(String kind, Class declaringType, int line) { UnlockSignatureImpl sig = new UnlockSignatureImpl(declaringType); - return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.EnclosingStaticPart makeUnlockESJP(String kind, Class declaringType, int line) { UnlockSignatureImpl sig = new UnlockSignatureImpl(declaringType); - return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.StaticPart makeAdviceSJP(String kind, int modifiers, String name, Class declaringType, Class[] parameterTypes, @@ -197,7 +197,7 @@ public final class Factory { parameterNames==null?NO_STRINGS:parameterNames, exceptionTypes==null?NO_TYPES:exceptionTypes, returnType==null?Void.TYPE:returnType); - return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.StaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } public JoinPoint.EnclosingStaticPart makeAdviceESJP(String kind, int modifiers, String name, Class declaringType, Class[] parameterTypes, @@ -207,9 +207,9 @@ public final class Factory { parameterNames==null?NO_STRINGS:parameterNames, exceptionTypes==null?NO_TYPES:exceptionTypes, returnType==null?Void.TYPE:returnType); - return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); + return new JoinPointImpl.EnclosingStaticPartImpl(count++, kind, sig, makeSourceLoc(line, -1)); } - + // --- public JoinPoint.StaticPart makeSJP(String kind, Signature sig, SourceLocation loc) { @@ -279,13 +279,13 @@ public final class Factory { ret.setLookupClassLoader(lookupClassLoader); return ret; } - + public MethodSignature makeMethodSig(String modifiers, String methodName, String declaringType, String paramTypes, String paramNames, String exceptionTypes, String returnType) { Class declaringTypeClass = makeClass(declaringType, lookupClassLoader); return makeMethodSig(modifiers, methodName, declaringTypeClass, paramTypes, paramNames, exceptionTypes, returnType); } - + public MethodSignature makeMethodSig(String modifiers, String methodName, Class declaringTypeClass, String paramTypes, String paramNames, String exceptionTypes, String returnType) { int modifiersAsInt = Integer.parseInt(modifiers, 16); diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java index 8c3de24c4..396164691 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java @@ -1,19 +1,19 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.runtime.reflect; - + import java.lang.reflect.Field; import org.aspectj.lang.reflect.FieldSignature; @@ -21,34 +21,34 @@ import org.aspectj.lang.reflect.FieldSignature; public class FieldSignatureImpl extends MemberSignatureImpl implements FieldSignature { Class fieldType; private Field field; - - FieldSignatureImpl(int modifiers, String name, Class declaringType, + + FieldSignatureImpl(int modifiers, String name, Class declaringType, Class fieldType) { super(modifiers, name, declaringType); this.fieldType = fieldType; } - + FieldSignatureImpl(String stringRep) { super(stringRep); } - + public Class getFieldType() { if (fieldType == null) fieldType = extractType(3); return fieldType; } - + protected String createToString(StringMaker sm) { StringBuffer buf = new StringBuffer(); buf.append(sm.makeModifiersString(getModifiers())); if (sm.includeArgs) buf.append(sm.makeTypeName(getFieldType())); - if (sm.includeArgs) buf.append(" "); + if (sm.includeArgs) buf.append(" "); buf.append(sm.makePrimaryTypeName(getDeclaringType(),getDeclaringTypeName())); buf.append("."); - buf.append(getName()); + buf.append(getName()); return buf.toString(); - } - + } + /* (non-Javadoc) * @see org.aspectj.runtime.reflect.MemberSignatureImpl#createAccessibleObject() */ diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java index adb8f840e..d9315ac55 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -21,29 +21,29 @@ import java.lang.reflect.Modifier; class InitializerSignatureImpl extends CodeSignatureImpl implements InitializerSignature { private Constructor constructor; - + InitializerSignatureImpl(int modifiers, Class declaringType) { - super(modifiers, Modifier.isStatic(modifiers) ? "<clinit>" : "<init>", declaringType, EMPTY_CLASS_ARRAY, + super(modifiers, Modifier.isStatic(modifiers) ? "<clinit>" : "<init>", declaringType, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY); } - + InitializerSignatureImpl(String stringRep) { super(stringRep); } - + public String getName() { return Modifier.isStatic(getModifiers()) ? "<clinit>": "<init>"; } protected String createToString(StringMaker sm) { StringBuffer buf = new StringBuffer(); - buf.append(sm.makeModifiersString(getModifiers())); + buf.append(sm.makeModifiersString(getModifiers())); buf.append(sm.makePrimaryTypeName(getDeclaringType(),getDeclaringTypeName())); buf.append("."); - buf.append(getName()); + buf.append(getName()); return buf.toString(); } - + /* (non-Javadoc) * @see org.aspectj.runtime.reflect.MemberSignatureImpl#createAccessibleObject() */ diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java index 2183a5706..e6f5c20c3 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.runtime.reflect; @@ -139,7 +139,7 @@ class JoinPointImpl implements ProceedingJoinPoint { // To proceed we need a closure to proceed on. Generated code // will either be using arc or arcs but not both. arcs being non-null // indicates it is in use (even if an empty stack) - private AroundClosure arc = null; + private AroundClosure arc = null; private Stack<AroundClosure> arcs = null; public void set$AroundClosure(AroundClosure arc) { @@ -167,7 +167,7 @@ class JoinPointImpl implements ProceedingJoinPoint { return arc.run(arc.getState()); } } else { - return arcs.peek().run(arcs.peek().getState()); + return arcs.peek().run(arcs.peek().getState()); } } @@ -179,7 +179,7 @@ class JoinPointImpl implements ProceedingJoinPoint { } else { ac = arcs.peek(); } - + if (ac == null) { return null; } else { @@ -193,16 +193,16 @@ class JoinPointImpl implements ProceedingJoinPoint { boolean bindsThis = (flags & 0x000100) != 0; boolean hasTarget = (flags & 0x000010) != 0; boolean bindsTarget = (flags & 0x000001) != 0; - + // state is always consistent with caller?,callee?,formals...,jp Object[] state = ac.getState(); - + // these next two numbers can differ because some join points have a this and // target that are the same (eg. call) - and yet you can bind this and target // separately. - + // In the state array, [0] may be this, [1] may be target - + int firstArgumentIndexIntoAdviceBindings = 0; int firstArgumentIndexIntoState = 0; firstArgumentIndexIntoState += (hasThis ? 1 : 0); @@ -225,14 +225,14 @@ class JoinPointImpl implements ProceedingJoinPoint { } else { // need to replace the target, and it is different to this, whether // that means replacing state[0] or state[1] depends on whether - // the join point has a this - + // the join point has a this + // This previous variant doesn't seem to cope with only binding target at a joinpoint // which has both this and target. It forces you to supply this even if you didn't bind // it. // firstArgumentIndexIntoAdviceBindings = (hasThis ? 1 : 0) + 1; // state[hasThis ? 1 : 0] = adviceBindings[hasThis ? 1 : 0]; - + int targetPositionInAdviceBindings = (hasThis && bindsThis) ? 1 : 0; firstArgumentIndexIntoAdviceBindings = ((hasThis&&bindsThis)?1:0)+((hasTarget&&bindsTarget&&!thisTargetTheSame)?1:0); state[hasThis ? 1 : 0] = adviceBindings[targetPositionInAdviceBindings]; @@ -241,12 +241,12 @@ class JoinPointImpl implements ProceedingJoinPoint { // leave state[0]/state[1] alone, they are OK } } - + // copy the rest across for (int i = firstArgumentIndexIntoAdviceBindings; i < adviceBindings.length; i++) { state[firstArgumentIndexIntoState + (i - firstArgumentIndexIntoAdviceBindings)] = adviceBindings[i]; } - + // old code that did this, didnt allow this/target overriding // for (int i = state.length-2; i >= 0; i--) { // int formalIndex = (adviceBindings.length - 1) - (state.length-2) + i; diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java index 2448868d0..842a549ea 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Andy Clement - initial implementation *******************************************************************************/ @@ -18,24 +18,24 @@ import org.aspectj.lang.reflect.LockSignature; class LockSignatureImpl extends SignatureImpl implements LockSignature { private Class parameterType; - + LockSignatureImpl(Class c) { super(Modifier.STATIC, "lock", c); parameterType = c; } - + LockSignatureImpl(String stringRep) { super(stringRep); } - + protected String createToString(StringMaker sm) { if (parameterType == null) parameterType = extractType(3); return "lock("+sm.makeTypeName(parameterType)+")"; - } + } public Class getParameterType() { if (parameterType == null) parameterType = extractType(3); return parameterType; } - + } diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java index a7cd77a5f..8722b4d04 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -17,13 +17,13 @@ package org.aspectj.runtime.reflect; import org.aspectj.lang.reflect.MemberSignature; abstract class MemberSignatureImpl extends SignatureImpl implements MemberSignature { - - MemberSignatureImpl(int modifiers, String name, Class declaringType) { + + MemberSignatureImpl(int modifiers, String name, Class declaringType) { super(modifiers, name, declaringType); } - + public MemberSignatureImpl(String stringRep) { super(stringRep); } - + } diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java index 76ea6c6cf..af8f11589 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.runtime.reflect; @@ -57,7 +57,7 @@ class MethodSignatureImpl extends CodeSignatureImpl implements MethodSignature { /* * (non-Javadoc) - * + * * @see org.aspectj.lang.reflect.MemberSignature#getAccessibleObject() */ public Method getMethod() { @@ -77,7 +77,7 @@ class MethodSignatureImpl extends CodeSignatureImpl implements MethodSignature { /** * Hunt for a method up the hierarchy for a specified type. - * + * * @param type the type on which to look for the method * @param name the name of the method * @param params the parameters of the method diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java index 0f9232bdd..062d0112e 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java @@ -3,9 +3,9 @@ * 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Xerox/PARC initial implementation diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java index 91fc1c321..b549d612a 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -20,18 +20,18 @@ class SourceLocationImpl implements SourceLocation { Class withinType; String fileName; int line; - + SourceLocationImpl(Class withinType, String fileName, int line) { this.withinType = withinType; this.fileName = fileName; this.line = line; } - + public Class getWithinType() { return withinType; } public String getFileName() { return fileName; } public int getLine() { return line; } public int getColumn() { return -1; } - + public String toString() { return getFileName() + ":" + getLine(); } diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java b/runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java index 53e3988a9..fb2fb4aeb 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -22,12 +22,12 @@ class StringMaker { boolean includeThrows = false; boolean includeModifiers = false; boolean shortPrimaryTypeNames = false; - + boolean includeJoinPointTypeName = true; boolean includeEnclosingPoint = true; boolean shortKindName = true; int cacheOffset; - + static StringMaker shortStringMaker; static { shortStringMaker = new StringMaker(); @@ -36,13 +36,13 @@ class StringMaker { shortStringMaker.includeThrows = false; shortStringMaker.includeModifiers = false; shortStringMaker.shortPrimaryTypeNames = true; - + shortStringMaker.includeJoinPointTypeName = false; shortStringMaker.includeEnclosingPoint = false; - + shortStringMaker.cacheOffset = 0; } - + static StringMaker middleStringMaker; static { middleStringMaker = new StringMaker(); @@ -54,7 +54,7 @@ class StringMaker { shortStringMaker.cacheOffset = 1; } - + static StringMaker longStringMaker; static { longStringMaker = new StringMaker(); @@ -67,26 +67,26 @@ class StringMaker { longStringMaker.cacheOffset = 2; } - + String makeKindName(String name) { int dash = name.lastIndexOf('-'); if (dash == -1) return name; return name.substring(dash+1); } - + String makeModifiersString(int modifiers) { if (!includeModifiers) return ""; String str = Modifier.toString(modifiers); if (str.length() == 0) return ""; return str + " "; } - + String stripPackageName(String name) { int dot = name.lastIndexOf('.'); if (dot == -1) return name; return name.substring(dot+1); - } - + } + String makeTypeName(Class type, String typeName, boolean shortName) { if (type == null) return "ANONYMOUS"; if (type.isArray()) { @@ -99,22 +99,22 @@ class StringMaker { return typeName.replace('$', '.'); } } - + public String makeTypeName(Class type) { return makeTypeName(type, type.getName(),shortTypeNames); } - + public String makePrimaryTypeName(Class type, String typeName) { return makeTypeName(type, typeName, shortPrimaryTypeNames); } - + public void addTypeNames(StringBuffer buf, Class[] types) { for (int i = 0; i < types.length; i++) { if (i > 0) buf.append(", "); buf.append(makeTypeName(types[i])); } } - + public void addSignature(StringBuffer buf, Class[] types) { if (types == null) return; if (!includeArgs) { @@ -130,7 +130,7 @@ class StringMaker { addTypeNames(buf, types); buf.append(")"); } - + public void addThrows(StringBuffer buf, Class[] types) { if (!includeThrows || types == null || types.length == 0) return; diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java index d8b377a6f..43d6a4bf0 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Andy Clement - initial implementation *******************************************************************************/ @@ -18,12 +18,12 @@ import org.aspectj.lang.reflect.UnlockSignature; class UnlockSignatureImpl extends SignatureImpl implements UnlockSignature { private Class parameterType; - + UnlockSignatureImpl(Class c) { super(Modifier.STATIC, "unlock", c); parameterType = c; } - + UnlockSignatureImpl(String stringRep) { super(stringRep); } @@ -31,7 +31,7 @@ class UnlockSignatureImpl extends SignatureImpl implements UnlockSignature { protected String createToString(StringMaker sm) { if (parameterType == null) parameterType = extractType(3); return "unlock("+sm.makeTypeName(parameterType)+")"; - } + } public Class getParameterType() { if (parameterType == null) parameterType = extractType(3); diff --git a/runtime/src/test/java/org/aspectj/internal/lang/reflect/AjTypeTest.java b/runtime/src/test/java/org/aspectj/internal/lang/reflect/AjTypeTest.java index 9ddb5c0dc..502f1478f 100644 --- a/runtime/src/test/java/org/aspectj/internal/lang/reflect/AjTypeTest.java +++ b/runtime/src/test/java/org/aspectj/internal/lang/reflect/AjTypeTest.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: - * Adrian Colyer initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Adrian Colyer initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -28,25 +28,25 @@ import org.aspectj.lang.reflect.AjTypeSystem; public class AjTypeTest extends TestCase { private AjType<String> stringType; - + @Override protected void setUp() throws Exception { super.setUp(); stringType = AjTypeSystem.getAjType(String.class); } - + public void testCreateAjType() { assertNotNull("should find type",stringType); } - + public void testGetName() { assertEquals(String.class.getName(),stringType.getName()); } - + public void testGetPackage() { assertEquals(String.class.getPackage(),stringType.getPackage()); } - + public void testGetInterfaces() { Class[] i1 = String.class.getInterfaces(); AjType<?>[] i2 = stringType.getInterfaces(); @@ -54,32 +54,32 @@ public class AjTypeTest extends TestCase { for (int i = 0; i < i1.length; i++) assertEquals(i1[i],i2[i].getJavaClass()); } - + public void testGetModifiers() { assertEquals(String.class.getModifiers(),stringType.getModifiers()); } - + public void testGetSupertype() { Class<?> stringSuper = String.class.getSuperclass(); AjType ajSuper = stringType.getSupertype(); - assertEquals(AjTypeSystem.getAjType(stringSuper),ajSuper); + assertEquals(AjTypeSystem.getAjType(stringSuper),ajSuper); } public void testObjectSupertype() { AjType<?> objectSuper = AjTypeSystem.getAjType(Object.class).getSupertype(); - assertNull(objectSuper); + assertNull(objectSuper); } public void testInterfaceSupertype() { AjType<?> serializableSuper = AjTypeSystem.getAjType(Serializable.class).getSupertype(); - assertNull(serializableSuper); + assertNull(serializableSuper); } - + public void testGetGenericSupertype() { Type t = AjTypeSystem.getAjType(Goo.class).getGenericSupertype(); assertEquals(Foo.class,t); } - + public void testGetEnclosingMethod() { new Goo().foo(); } @@ -92,19 +92,19 @@ public class AjTypeTest extends TestCase { AjType t = AjTypeSystem.getAjType(Foo.Z.class); assertEquals("org.aspectj.internal.lang.reflect.Foo",t.getEnclosingType().getName()); } - + public void testGetDeclaringType() { AjType t = AjTypeSystem.getAjType(Foo.Z.class); assertEquals("org.aspectj.internal.lang.reflect.Foo",t.getDeclaringType().getName()); } - + public void testIsAnnotationPresent() { AjType<Foo> foo = AjTypeSystem.getAjType(Foo.class); AjType<Goo> goo = AjTypeSystem.getAjType(Goo.class); assertTrue(foo.isAnnotationPresent(SomeAnn.class)); assertFalse(goo.isAnnotationPresent(SomeAnn.class)); } - + public void testGetAnnotation() { AjType<Foo> foo = AjTypeSystem.getAjType(Foo.class); AjType<Goo> goo = AjTypeSystem.getAjType(Goo.class); @@ -125,14 +125,14 @@ public class AjTypeTest extends TestCase { assertEquals(0,goo.getDeclaredAnnotations().length); assertEquals(1,foo.getDeclaredAnnotations().length); } - + public void testGetAjTypes() { AjType<Foo> foo = AjTypeSystem.getAjType(Foo.class); AjType[] fooTypes = foo.getAjTypes(); assertEquals(1,fooTypes.length); assertEquals("org.aspectj.internal.lang.reflect.Foo$Z",fooTypes[0].getName()); } - + public void testGetDeclaredAjTypes() { AjType<Foo> foo = AjTypeSystem.getAjType(Foo.class); AjType[] fooTypes = foo.getDeclaredAjTypes(); @@ -142,13 +142,13 @@ public class AjTypeTest extends TestCase { assertTrue(s.contains(" org.aspectj.internal.lang.reflect.Foo$Z")); assertTrue(s.contains(" org.aspectj.internal.lang.reflect.Foo$XX")); } - + public void testGetConstructor() throws Exception { Constructor c1 = String.class.getConstructor(String.class); Constructor c2 = stringType.getConstructor(stringType); assertEquals(c1,c2); } - + public void testGetConstructors() { Constructor[] c1 = String.class.getConstructors(); Constructor[] c2 = stringType.getConstructors(); @@ -156,13 +156,13 @@ public class AjTypeTest extends TestCase { for (int i = 0; i < c1.length; i++) assertEquals(c1[i],c2[i]); } - + public void testGetDeclaredConstructor() throws Exception { Constructor c1 = String.class.getDeclaredConstructor(String.class); Constructor c2 = stringType.getDeclaredConstructor(stringType); assertEquals(c1,c2); } - + public void testGetDeclaredConstructors() { Constructor[] c1 = String.class.getDeclaredConstructors(); Constructor[] c2 = stringType.getDeclaredConstructors(); @@ -170,13 +170,13 @@ public class AjTypeTest extends TestCase { for (int i = 0; i < c1.length; i++) assertEquals(c1[i],c2[i]); } - + public void testGetDeclaredField() throws Exception { Field f1 = String.class.getDeclaredField("value"); Field f2 = stringType.getDeclaredField("value"); assertEquals(f1,f2); } - + public void testGetDeclaredFields() { Field[] f1 = String.class.getDeclaredFields(); Field[] f2 = stringType.getDeclaredFields(); @@ -184,32 +184,32 @@ public class AjTypeTest extends TestCase { for (int i = 0; i < f1.length; i++) assertEquals(f1[i],f2[i]); } - + public void testGetField() throws Exception { AjType<Goo> goo = AjTypeSystem.getAjType(Goo.class); assertEquals("g",goo.getField("g").getName()); } - + public void testGetFields() { AjType<Goo> goo = AjTypeSystem.getAjType(Goo.class); Field[] fields = goo.getFields(); assertEquals(1,fields.length); assertEquals("g",fields[0].getName()); - + } - + public void testGetDeclaredMethod() throws Exception { Method m1 = String.class.getDeclaredMethod("toUpperCase"); Method m2 = stringType.getDeclaredMethod("toUpperCase"); assertEquals(m1,m2); } - + public void testGetMethod() throws Exception { Method m1 = String.class.getMethod("toUpperCase"); Method m2 = stringType.getMethod("toUpperCase"); - assertEquals(m1,m2); + assertEquals(m1,m2); } - + public void testGetDeclaredMethods() { Method[] m1 = String.class.getDeclaredMethods(); Method[] m2 = stringType.getDeclaredMethods(); @@ -225,67 +225,67 @@ public class AjTypeTest extends TestCase { for (int i = 0; i < m1.length; i++) assertEquals(m1[i],m2[i]); } - + public void testGetEnumConstants() { AjType e = AjTypeSystem.getAjType(E.class); Object[] consts = e.getEnumConstants(); assertEquals(3,consts.length); } - + public void testGetTypeParameters() { AjType<Foo> foo = AjTypeSystem.getAjType(Foo.class); TypeVariable<Class<Foo>>[] tvs = foo.getTypeParameters(); assertEquals(1,tvs.length); assertEquals("T",tvs[0].getName()); } - + public void testIsEnum() { assertFalse(stringType.isEnum()); } - + public void testIsInstance() { assertTrue(stringType.isInstance("I am")); } - + public void testIsInterface() { assertFalse(stringType.isInterface()); assertTrue(AjTypeSystem.getAjType(Serializable.class).isInterface()); } - + public void testIsLocalClass() { assertFalse(stringType.isLocalClass()); } - + public void testIsArray() { assertFalse(stringType.isArray()); assertTrue(AjTypeSystem.getAjType(Integer[].class).isArray()); } - + public void testIsPrimitive() { assertFalse(stringType.isPrimitive()); assertTrue(AjTypeSystem.getAjType(boolean.class).isPrimitive()); } - + public void testIsAspect() { assertFalse(stringType.isAspect()); } - + public void testIsMemberAspect() { assertFalse(stringType.isMemberAspect()); } - + public void testIsPrivileged() { assertFalse(stringType.isPrivileged()); } - + public void testEquals() { AjType stringTypeTwo = AjTypeSystem.getAjType(String.class); assertTrue(stringType.equals(stringTypeTwo)); } - + public void testHashCode() { AjType stringTypeTwo = AjTypeSystem.getAjType(String.class); - assertEquals(stringType.hashCode(),stringTypeTwo.hashCode()); + assertEquals(stringType.hashCode(),stringTypeTwo.hashCode()); } } @@ -295,7 +295,7 @@ public class AjTypeTest extends TestCase { @SomeAnn class Foo<T> { - + public Foo() { class Y { int y; } AjType t = AjTypeSystem.getAjType(Y.class); @@ -313,8 +313,8 @@ class Foo<T> { } class Goo extends Foo { - @interface IX {} - + @interface IX {} + public Goo() { super(); } diff --git a/runtime/src/test/java/org/aspectj/internal/lang/reflect/AjTypeWithAspectsTest.java b/runtime/src/test/java/org/aspectj/internal/lang/reflect/AjTypeWithAspectsTest.java index 5431a7457..19f3ab1bc 100644 --- a/runtime/src/test/java/org/aspectj/internal/lang/reflect/AjTypeWithAspectsTest.java +++ b/runtime/src/test/java/org/aspectj/internal/lang/reflect/AjTypeWithAspectsTest.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: - * Adrian Colyer initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Adrian Colyer initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; import java.lang.reflect.Field; @@ -43,7 +43,7 @@ import org.aspectj.lang.reflect.TypePatternBasedPerClause; public class AjTypeWithAspectsTest extends TestCase { private AjType<SimpleAspect> sa; - + protected void setUp() throws Exception { super.setUp(); sa = AjTypeSystem.getAjType(SimpleAspect.class); @@ -55,12 +55,12 @@ public class AjTypeWithAspectsTest extends TestCase { AjType<PerCflowAspect> perCflowA = AjTypeSystem.getAjType(PerCflowAspect.class); AjType<PerCflowbelowAspect> perCflowbelowA = AjTypeSystem.getAjType(PerCflowbelowAspect.class); AjType<PerTypeWithin> perTypeWithinA = AjTypeSystem.getAjType(PerTypeWithin.class); - + PerClause pc = perThisA.getPerClause(); assertEquals(PerClauseKind.PERTHIS,pc.getKind()); assertEquals("pc()",((PointcutBasedPerClause)pc).getPointcutExpression().asString()); assertEquals("perthis(pc())",pc.toString()); - + pc= perTargetA.getPerClause(); assertEquals(PerClauseKind.PERTARGET,pc.getKind()); assertEquals("pc()",((PointcutBasedPerClause)pc).getPointcutExpression().asString()); @@ -82,7 +82,7 @@ public class AjTypeWithAspectsTest extends TestCase { assertEquals("pertypewithin(org.aspectj..*)",pc.toString()); } - + public void testGetDeclaredField() throws Exception{ Field f = sa.getDeclaredField("s"); try { @@ -90,15 +90,15 @@ public class AjTypeWithAspectsTest extends TestCase { fail("Expecting NoSuchFieldException"); } catch (NoSuchFieldException nsf) {} } - + public void testGetField() throws Exception { Field f = sa.getField("s"); try { Field f2 = sa.getField("ajc$xyz$s"); fail("Expecting NoSuchFieldException"); - } catch (NoSuchFieldException nsf) {} + } catch (NoSuchFieldException nsf) {} } - + public void testGetDeclaredFields() { Field[] fields = sa.getDeclaredFields(); assertEquals(1,fields.length); @@ -110,7 +110,7 @@ public class AjTypeWithAspectsTest extends TestCase { assertEquals(1,fields.length); assertEquals("s",fields[0].getName()); } - + public void testGetDeclaredMethod() throws Exception { Method m = sa.getDeclaredMethod("aMethod"); try { @@ -122,7 +122,7 @@ public class AjTypeWithAspectsTest extends TestCase { fail("Expecting NoSuchMethodException"); } catch(NoSuchMethodException ex) {} } - + public void testGetMethod() throws Exception { Method m = sa.getMethod("aMethod"); try { @@ -132,7 +132,7 @@ public class AjTypeWithAspectsTest extends TestCase { try { Method m3 = sa.getMethod("ajc$before$123"); fail("Expecting NoSuchMethodException"); - } catch(NoSuchMethodException ex) {} + } catch(NoSuchMethodException ex) {} } public void testGetDeclaredMethods() { @@ -151,7 +151,7 @@ public class AjTypeWithAspectsTest extends TestCase { } assertTrue(match.contains("aMethod")); } - + public void testGetDeclaredPointcut() throws Exception { Pointcut p1 = sa.getDeclaredPointcut("simpleAspectMethodExecution"); assertEquals("simpleAspectMethodExecution",p1.getName()); @@ -169,11 +169,11 @@ public class AjTypeWithAspectsTest extends TestCase { try { Pointcut p3 = sa.getDeclaredPointcut("sausages"); fail("Expecting NoSuchPointcutExcetpion"); - } catch (NoSuchPointcutException ex) { + } catch (NoSuchPointcutException ex) { assertEquals("sausages",ex.getName()); - } + } } - + public void testGetPointcut() throws Exception { Pointcut p1 = sa.getPointcut("simpleAspectMethodExecution"); assertEquals("simpleAspectMethodExecution",p1.getName()); @@ -190,11 +190,11 @@ public class AjTypeWithAspectsTest extends TestCase { try { Pointcut p3 = sa.getPointcut("sausages"); fail("Expecting NoSuchPointcutExcetpion"); - } catch (NoSuchPointcutException ex) { + } catch (NoSuchPointcutException ex) { assertEquals("sausages",ex.getName()); - } + } } - + public void testGetDeclaredPointcuts() { Pointcut[] pcs = sa.getDeclaredPointcuts(); assertEquals(2,pcs.length); @@ -203,13 +203,13 @@ public class AjTypeWithAspectsTest extends TestCase { assertTrue(match.contains(pcs[0].getName())); assertTrue(match.contains(pcs[1].getName())); } - + public void testGetPointcuts() { Pointcut[] pcs = sa.getPointcuts(); assertEquals(1,pcs.length); assertEquals("simpleAspectMethodExecution",pcs[0].getName()); } - + public void testGetDeclaredAdvice() { Advice[] advice = sa.getDeclaredAdvice(); assertEquals(10,advice.length); @@ -244,7 +244,7 @@ public class AjTypeWithAspectsTest extends TestCase { assertEquals("",atwo.getName()); assertEquals("before() : execution(* SimpleAspect.*(..))",atwo.toString()); } - + public void testGetAdvice() { Advice[] advice = sa.getDeclaredAdvice(); assertEquals(10,advice.length); @@ -259,9 +259,9 @@ public class AjTypeWithAspectsTest extends TestCase { advice = sa.getDeclaredAdvice(AdviceKind.AROUND); assertEquals(2,advice.length); advice = sa.getDeclaredAdvice(AdviceKind.BEFORE,AdviceKind.AFTER); - assertEquals(4,advice.length); + assertEquals(4,advice.length); } - + public void testGetNamedAdvice() throws Exception { Advice a = sa.getAdvice("logItAll"); assertEquals("logItAll",a.getName()); @@ -282,7 +282,7 @@ public class AjTypeWithAspectsTest extends TestCase { ; } } - + public void testGetNamedDeclaredAdvice() throws Exception { Advice a = sa.getDeclaredAdvice("logItAll"); assertEquals("logItAll",a.getName()); @@ -303,22 +303,22 @@ public class AjTypeWithAspectsTest extends TestCase { ; } } - + public void testIsPrivileged() { assertFalse(sa.isPrivileged()); - assertTrue(AjTypeSystem.getAjType(SimplePrivilegedAspect.class).isPrivileged()); + assertTrue(AjTypeSystem.getAjType(SimplePrivilegedAspect.class).isPrivileged()); } - + public void testIsAspect() { assertTrue(sa.isAspect()); } - + public void testIsMemberAspect() { assertFalse(AjTypeSystem.getAjType(SimplePrivilegedAspect.class).isMemberAspect()); assertTrue(AjTypeSystem.getAjType(SimplePrivilegedAspect.MemberAspect.class).isMemberAspect()); } - + public void testGetDeclareEoWarnings() { DeclareErrorOrWarning[] deows = sa.getDeclareErrorOrWarnings(); assertEquals(4,deows.length); @@ -337,31 +337,31 @@ public class AjTypeWithAspectsTest extends TestCase { } else { if (deow.getMessage().equals("dont call this method code")) foundCodeWarning = true; if (deow.getMessage().equals("dont call this method ann")) foundAnnWarning = true; - assertEquals("call(* DontDoIt.*(..))",deow.getPointcutExpression().toString()); + assertEquals("call(* DontDoIt.*(..))",deow.getPointcutExpression().toString()); } } assertTrue(foundCodeWarning && foundAnnWarning && foundCodeError && foundAnnError); } - + } -@Aspect +@Aspect class SimpleAspect { - + // regular field public String s; - + // synthetic field public String ajc$xyz$s; - + // regular method public void aMethod() {} - + // advice method, annotation style @Before("execution(* SimpleAspect.*(..))") public void logEntry() {} - + // advice method, code style @Before("execution(* SimpleAspect.*(..))") public void ajc$before$123() {} @@ -369,7 +369,7 @@ class SimpleAspect { // advice method, annotation style @After("execution(* SimpleAspect.*(..))") public void logFinally() {} - + // advice method, code style @After("execution(* SimpleAspect.*(..))") public void ajc$after$123() {} @@ -377,7 +377,7 @@ class SimpleAspect { // advice method, annotation style @AfterReturning("execution(* SimpleAspect.*(..))") public void logExit() {} - + // advice method, code style @AfterReturning("execution(* SimpleAspect.*(..))") public void ajc$afterReturning$123() {} @@ -385,7 +385,7 @@ class SimpleAspect { // advice method, annotation style @AfterThrowing("execution(* SimpleAspect.*(..))") public void logException() {} - + // advice method, code style @AfterThrowing("execution(* SimpleAspect.*(..))") public void ajc$afterThrowing$123() {} @@ -393,7 +393,7 @@ class SimpleAspect { // advice method, annotation style @Around("execution(* SimpleAspect.*(..))") public void logItAll() {} - + // advice method, code style @Around("execution(* SimpleAspect.*(..))") @AdviceName("whatGoesAround") @@ -402,15 +402,15 @@ class SimpleAspect { // pointcut, annotation style @org.aspectj.lang.annotation.Pointcut("execution(* SimpleAspect.*(..))") public void simpleAspectMethodExecution() {}; - + // pointcut, code style @org.aspectj.lang.annotation.Pointcut("call(* SimpleAspect.*(..))") private void ajc$pointcut$$simpleAspectCall$123(SimpleAspect target) {}; - + // decw, ann style @DeclareWarning("call(* DontDoIt.*(..))") public static final String dontDoIt = "dont call this method ann"; - + // decw, code style @ajcDeclareEoW(pointcut="call(* DontDoIt.*(..))",message="dont call this method code",isError=false) private void ajc$declare_eow$123() {} @@ -418,7 +418,7 @@ class SimpleAspect { // dec., ann style @DeclareError("call(* DontDoIt.*(..))") public static final String dontDoItISaid = "dont call this method ann"; - + // decw, code style @ajcDeclareEoW(pointcut="call(* DontDoIt.*(..))",message="dont call this method code",isError=true) private void ajc$declare_eow$124() {} @@ -427,10 +427,10 @@ class SimpleAspect { @Aspect @ajcPrivileged class SimplePrivilegedAspect { - + @Aspect static class MemberAspect {} - + } @Aspect("perthis(pc())") @@ -445,5 +445,5 @@ class PerCflowAspect {} @Aspect("percflowbelow(pc())") class PerCflowbelowAspect {} -@Aspect("pertypewithin(org.aspectj..*)") +@Aspect("pertypewithin(org.aspectj..*)") class PerTypeWithin {} diff --git a/runtime/src/test/java/org/aspectj/internal/lang/reflect/InterTypeTest.java b/runtime/src/test/java/org/aspectj/internal/lang/reflect/InterTypeTest.java index 128993d67..4a186ffbf 100644 --- a/runtime/src/test/java/org/aspectj/internal/lang/reflect/InterTypeTest.java +++ b/runtime/src/test/java/org/aspectj/internal/lang/reflect/InterTypeTest.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.internal.lang.reflect; @@ -37,7 +37,7 @@ public class InterTypeTest extends TestCase { assertEquals(runnable,itd.getTargetType()); assertEquals(5, itd.getModifiers()); } - + public void testITDField() throws ClassNotFoundException { AjType<InterTypeTest> thisClass = AjTypeSystem.getAjType(InterTypeTest.class); AjType<Runnable> runnable = AjTypeSystem.getAjType(java.lang.Runnable.class); @@ -49,12 +49,12 @@ public class InterTypeTest extends TestCase { assertEquals(stringType,itdf.getType()); assertEquals(t,itdf.getGenericType()); } - + public void testITDCons() throws ClassNotFoundException, NoSuchMethodException { AjType<InterTypeTest> thisClass = AjTypeSystem.getAjType(InterTypeTest.class); AjType<Runnable> runnable = AjTypeSystem.getAjType(java.lang.Runnable.class); Method base = InterTypeTest.class.getDeclaredMethod("interCons",InterTypeTest.class,String.class,int.class); - InterTypeConstructorDeclaration itdc = + InterTypeConstructorDeclaration itdc = new InterTypeConstructorDeclarationImpl(thisClass,"java.lang.Runnable",5,base); assertEquals(2,itdc.getParameterTypes().length); assertEquals(String.class,itdc.getParameterTypes()[0].getJavaClass()); @@ -64,7 +64,7 @@ public class InterTypeTest extends TestCase { assertEquals(base.getGenericParameterTypes()[2],((AjType<?>)itdc.getGenericParameterTypes()[1]).getJavaClass()); assertEquals(0,itdc.getExceptionTypes().length); } - + public void testITDMethod() throws NoSuchMethodException { AjType<InterTypeTest> thisClass = AjTypeSystem.getAjType(InterTypeTest.class); AjType<Runnable> runnable = AjTypeSystem.getAjType(java.lang.Runnable.class); @@ -79,10 +79,10 @@ public class InterTypeTest extends TestCase { assertEquals(2,itdm.getGenericParameterTypes().length); assertEquals(base.getGenericParameterTypes()[1],((AjType<?>)itdm.getGenericParameterTypes()[0]).getJavaClass()); assertEquals(base.getGenericParameterTypes()[2],((AjType<?>)itdm.getGenericParameterTypes()[1]).getJavaClass()); - assertEquals(0,itdm.getExceptionTypes().length); + assertEquals(0,itdm.getExceptionTypes().length); } - + public static void interCons(InterTypeTest itt, String s, int i) { } - + public static int interMethod(InterTypeTest itt, String s, int i) { return 5; } } diff --git a/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTests.java b/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTests.java index 65749c5d8..c73061aaa 100644 --- a/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTests.java +++ b/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTests.java @@ -4,9 +4,9 @@ package org.aspectj.runtime; * 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Xerox/PARC initial implementation diff --git a/runtime/src/test/java/org/aspectj/runtime/RuntimeTest.java b/runtime/src/test/java/org/aspectj/runtime/RuntimeTest.java index 244624d9b..339b0bc67 100644 --- a/runtime/src/test/java/org/aspectj/runtime/RuntimeTest.java +++ b/runtime/src/test/java/org/aspectj/runtime/RuntimeTest.java @@ -1,15 +1,15 @@ package org.aspectj.runtime; /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ import java.io.*; @@ -21,7 +21,7 @@ import junit.framework.*; public class RuntimeTest extends TestCase { public RuntimeTest(String name) { super(name); } - + public void testNoAspectBoundException() { RuntimeException fun = new RuntimeException("fun"); NoAspectBoundException nab = new NoAspectBoundException("Foo", fun); @@ -30,7 +30,7 @@ public class RuntimeTest extends TestCase { public void testSoftExceptionPrintStackTrace() { // let's see -// Throwable t = new Error("xyz"); +// Throwable t = new Error("xyz"); // new SoftException(t).printStackTrace(); // save to specified PrintStream @@ -63,12 +63,12 @@ public class RuntimeTest extends TestCase { System.setErr(systemErr); } } - - - static void checkSoftExceptionString(String s) { + + + static void checkSoftExceptionString(String s) { assertTrue(s.contains("SoftException")); assertTrue(s.contains("Caused by: java.lang.Error")); assertTrue(s.contains("xyz")); assertTrue(s.contains("testSoftExceptionPrintStackTrace")); } -} +} diff --git a/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java index 2a17ad998..31de0a52d 100644 --- a/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java +++ b/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -24,7 +24,7 @@ public class JoinPointImplTest extends TestCase { Object arg3 = new Object(); Object[] args = new Object[] { arg1, arg2, arg3 }; JoinPointImpl jpi = new JoinPointImpl(null,null,null,args); - + Object[] retrievedArgs = jpi.getArgs(); assertEquals("First arg unchanged",arg1,retrievedArgs[0]); assertEquals("Second arg unchanged",arg2,retrievedArgs[1]); @@ -38,5 +38,5 @@ public class JoinPointImplTest extends TestCase { assertEquals("state of referenced object updated","defghi",afterUpdateArgs[1].toString()); assertEquals("Object reference not changed",arg3,afterUpdateArgs[2]); } - + } diff --git a/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java index fb51e20be..ce60a65cd 100644 --- a/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java +++ b/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Matthew Webster - initial implementation @@ -114,4 +114,4 @@ public class RuntimePerformanceTest extends TestCase { Class returnType = Void.TYPE; return factory.makeMethodSig(1,methodName,clazz,parameterTypes,parameterNames,exceptionTypes,returnType); } -}
\ No newline at end of file +} diff --git a/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java index 7a66a5b39..99faf8735 100644 --- a/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java +++ b/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -23,7 +23,7 @@ public class SignatureTest extends TestCase { assertEquals(SignatureTest.class.getName(),fsi.getDeclaringTypeName()); assertSame(fsi.getDeclaringTypeName(),fsi.getDeclaringTypeName()); // should be cached. } - + public void testToShortMiddleLongString () { MethodSignatureImpl msi = new MethodSignatureImpl(0,"test",SignatureTest.class,new Class[] { String.class, Integer.TYPE }, new String[] { "s", "i" }, new Class[] {}, Runnable.class); String shortString = msi.toShortString(); @@ -34,24 +34,24 @@ public class SignatureTest extends TestCase { assertSame(longString,msi.toLongString()); // should be cached. assertTrue("String representations should be different",!(shortString.equals(middleString) || middleString.equals(longString) || longString.equals(shortString))); } - + public void testClearCache() throws Exception { MethodSignatureImpl msi = new MethodSignatureImpl(0,"test",SignatureTest.class,new Class[] { String.class, Integer.TYPE }, new String[] { "s", "i" }, new Class[] {}, Runnable.class); String shortString = msi.toShortString(); assertSame(shortString,msi.toShortString()); - + Field field = SignatureImpl.class.getDeclaredField("stringCache"); field.setAccessible(true); Object res = field.get(msi); - + field = res.getClass().getDeclaredField("toStringCacheRef"); field.setAccessible(true); Reference ref = (Reference)field.get(res); - + ref.clear(); assertEquals(shortString,msi.toShortString()); - + String longString = msi.toLongString(); - assertSame(longString,msi.toLongString()); // should be cached. + assertSame(longString,msi.toLongString()); // should be cached. } } |