diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-06-04 07:58:52 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-06-04 07:58:52 +0700 |
| commit | 49cb924f5402c9d24379ae1af62def6fa5892649 (patch) | |
| tree | 69844405209043e2e18aa9eef0f01f287bc1ae52 /org.aspectj.matcher/src | |
| parent | 82df3f0fc9842758f15f12299c9113e48f1ccb5c (diff) | |
| download | aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.tar.gz aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.zip | |
Upgrade license from CPLv1/EPLv1 to EPLv2
This was required by the Eclipse team as one precondition for the next
release.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'org.aspectj.matcher/src')
284 files changed, 2576 insertions, 2576 deletions
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java index e098251d1..a4d47ecc6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2008 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 - * + * 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.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java index 763f78f0b..9165fa514 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -172,4 +172,4 @@ public abstract class AbstractReferenceTypeDelegate implements ReferenceTypeDele public boolean hasBeenWoven() { return false; } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java index d759bc721..cc9d3112d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -83,7 +83,7 @@ public abstract class Advice extends ShadowMunger { ret.concreteAspect = inAspect; return ret; } - + public boolean isAroundAdvice() { return attribute.getKind() == AdviceKind.Around; } @@ -231,7 +231,7 @@ public abstract class Advice extends ShadowMunger { /** * In after returning advice if we are binding the extra parameter to a parameterized type we may not be able to do a type-safe * conversion. - * + * * @param resolvedExtraParameterType the type in the after returning declaration * @param shadowReturnType the type at the shadow * @param world @@ -314,7 +314,7 @@ public abstract class Advice extends ShadowMunger { * whereas for code style they are in a well defined order. So there is some extra complexity in here for annotation style that * looks up the correct parameter in the advice signature by name, based on the name specified in the annotation. If this fails * then we 'fallback' to guessing at positions, where the extra argument is presumed to come at the end. - * + * * @return the type of the extraParameter */ public UnresolvedType getExtraParameterType() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AdviceKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AdviceKind.java index 3d5300110..cf536e06a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AdviceKind.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AdviceKind.java @@ -2,9 +2,9 @@ * Copyright (c) 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: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjAttribute.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjAttribute.java index fd65867ae..cf2c4db45 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjAttribute.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjAttribute.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -28,12 +28,12 @@ import org.aspectj.weaver.patterns.Pointcut; /** * These attributes are written to and read from .class files (see the JVM spec). - * + * * <p> * Each member or type can have a number of AjAttributes. Each such attribute is in 1-1 correspondence with an Unknown bcel * attribute. Creating one of these does NOTHING to the underlying thing, so if you really want to add an attribute to a particular * thing, well, you'd better actually do that. - * + * * @author Erik Hilsdale * @author Jim Hugunin */ @@ -67,7 +67,7 @@ public abstract class AjAttribute { /** * Writes the full attribute, i.e. name_index, length, and contents - * + * * @param dataCompressor */ public byte[] getAllBytes(short nameIndex, ConstantPoolWriter dataCompressor) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java index 487087604..01809e1ec 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -240,7 +240,7 @@ public class AjcMemberMaker { /** * Return a resolvedmember representing the synthetic getter for the field. The old style (<1.6.9) is a heavyweight static * method with a long name. The new style (1.6.9 and later) is short, and reusable across aspects. - * + * * @param aspectType the aspect attempting the access * @param field the field to be accessed * @param shortSyntax is the old (long) or new (short) style format being used @@ -274,7 +274,7 @@ public class AjcMemberMaker { /** * Return a resolvedmember representing the synthetic setter for the field. The old style (<1.6.9) is a heavyweight static * method with a long name. The new style (1.6.9 and later) is short, not always static, and reusable across aspects. - * + * * @param aspectType the aspect attempting the access * @param field the field to be accessed * @param shortSyntax is the old or new style format being used diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotatedElement.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotatedElement.java index 86297b85b..61a5a1683 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotatedElement.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotatedElement.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java index a5199164f..3fc5fc391 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java @@ -2,9 +2,9 @@ * Copyright (c) 2006-2008 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAnnotationValue.java index c25c33cd2..11677bbbb 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAnnotationValue.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAnnotationValue.java @@ -1,13 +1,13 @@ /* ******************************************************************* * 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 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement IBM 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 IBM initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java index 17824ac69..081989330 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java @@ -1,13 +1,13 @@ /* ******************************************************************* * 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 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement IBM 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 IBM initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationOnTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationOnTypeMunger.java index 6390ed311..76fb9588d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationOnTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationOnTypeMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005 IBM - * 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.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationTargetKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationTargetKind.java index fe2104484..a9c835b2c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationTargetKind.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationTargetKind.java @@ -1,11 +1,11 @@ /******************************************************************** - * 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: + * Copyright (c) 2005 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: * Helen Hawkins - Initial implementation *******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationValue.java index 32f366774..ce08b11e3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationValue.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationValue.java @@ -1,13 +1,13 @@ /* ******************************************************************* * 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 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement IBM 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 IBM initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java index f4ef760bb..7c674b361 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java @@ -1,13 +1,13 @@ /* ******************************************************************* * 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 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement IBM 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 IBM initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayReferenceType.java index 81acaadfe..23aaa2e5e 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayReferenceType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayReferenceType.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2008 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: - * 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.weaver; @@ -15,7 +15,7 @@ import java.lang.reflect.Modifier; /** * Represents a resolved array type - * + * * @author Andy Clement */ public class ArrayReferenceType extends ReferenceType { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BCException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BCException.java index 81bf607ed..8d34727c5 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BCException.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BCException.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BindingScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BindingScope.java index d97fb8fb6..a67c93737 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BindingScope.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BindingScope.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2006-2008 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 - * + * 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.weaver; @@ -15,7 +15,7 @@ import org.aspectj.weaver.patterns.SimpleScope; /** * BindingScope that knows the enclosingType, which is needed for pointcut reference resolution - * + * * @author Alexandre Vasseur * @author Andy Clement */ @@ -65,4 +65,4 @@ public class BindingScope extends SimpleScope { } return super.lookupType(name, location); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceType.java index ad434575a..b9c8f4bf3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceType.java @@ -2,9 +2,9 @@ * Copyright (c) 2010 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 * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java index 4a765a9e5..6acb432a7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -23,7 +23,7 @@ import org.aspectj.weaver.patterns.Pointcut; /** * Representation of a shadow munger for a declare error or warning declaration. - * + * * @author Andy Clement */ public class Checker extends ShadowMunger { @@ -38,7 +38,7 @@ public class Checker extends ShadowMunger { /** * Create a Checker for a declare error or declare warning. - * + * * @param deow the declare error or declare warning for which to create the checker munger */ public Checker(DeclareErrorOrWarning deow) { @@ -77,7 +77,7 @@ public class Checker extends ShadowMunger { /** * Determine if the Checker matches at a shadow. If it does then we can immediately report the message. Currently, there can * never be a non-statically determinable match. - * + * * @param shadow the shadow which to match against * @param world the world through which to access message handlers */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ClassAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ClassAnnotationValue.java index cb7476c32..684f677a6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ClassAnnotationValue.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ClassAnnotationValue.java @@ -1,13 +1,13 @@ /* ******************************************************************* * 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 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement IBM 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 IBM initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CompressingDataOutputStream.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CompressingDataOutputStream.java index 43a66ff4f..210077575 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CompressingDataOutputStream.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CompressingDataOutputStream.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2010 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 - * + * 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 (SpringSource) * ******************************************************************/ @@ -20,7 +20,7 @@ import java.io.IOException; * A variation of a DataOutputStream that is linked to a constant pool writer. The linked constant pool can be used to compress * objects into to simple index references into the constant pool. The corresponding decompression is done in the * VersionedDataInputStream. - * + * * @author Andy Clement */ public class CompressingDataOutputStream extends DataOutputStream { @@ -95,4 +95,4 @@ public class CompressingDataOutputStream extends DataOutputStream { writeShort(compressFilepath(path)); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConcreteTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConcreteTypeMunger.java index 153e73d06..09ad8c730 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConcreteTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConcreteTypeMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -111,7 +111,7 @@ public abstract class ConcreteTypeMunger implements PartialOrder.PartialComparab * 'share' type variables with the generic type. Usually this method is called because we need to know whether to tailor the * munger for addition to a particular type. For example: <pre><code> * interface I<T> {} - * + * * aspect X implements I<String> { * List<T> I<T>.foo { return null; } * } @@ -144,10 +144,10 @@ public abstract class ConcreteTypeMunger implements PartialOrder.PartialComparab /** * Some type mungers are created purely to help with the implementation of shadow mungers. For example to support the cflow() * pointcut we create a new cflow field in the aspect, and that is added via a BcelCflowCounterFieldAdder. - * + * * During compilation we need to compare sets of type mungers, and if some only come into existence after the 'shadowy' type * things have been processed, we need to ignore them during the comparison. - * + * * Returning true from this method indicates the type munger exists to support 'shadowy' stuff - and so can be ignored in some * comparison. */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolReader.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolReader.java index 1345e7e09..7171bdbe9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolReader.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolReader.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2010 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 + * 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 (SpringSource) @@ -13,7 +13,7 @@ package org.aspectj.weaver; /** * Used during attribute reading to decode constant pool references. - * + * * @author Andy Clement */ public interface ConstantPoolReader { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolWriter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolWriter.java index 2b145a1de..be2719c8a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolWriter.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolWriter.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2010 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 - * + * 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 (SpringSource) * ******************************************************************/ @@ -13,7 +13,7 @@ package org.aspectj.weaver; /** * Used during attribute writing to encode common strings/etc as constant pool references. - * + * * @author Andy Clement */ public interface ConstantPoolWriter { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java index 6e99e33fa..5180042b8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004 IBM * 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: * Andy Clement - initial API and implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java index e71850c05..98480f661 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -36,12 +36,12 @@ import org.aspectj.weaver.patterns.PointcutRewriter; /** * This holds on to all members that have an invasive effect outside of there own compilation unit. These members need to be all * gathered up and in a world before any weaving can take place. - * + * * They are also important in the compilation process and need to be gathered up before the inter-type declaration weaving stage * (unsurprisingly). - * + * * All members are concrete. - * + * * @author Jim Hugunin */ public class CrosscuttingMembers { @@ -255,7 +255,7 @@ public class CrosscuttingMembers { * comparison with the existing list of shadowmungers would return that something has changed even though it might not have, so * in this first round we ignore the shadowMungers. The second time this is called is whilst we're preparing to weave. At this * point we know everything in the system and so we're able to compare the shadowMunger list. (see bug 129163) - * + * * @param other * @param careAboutShadowMungers * @return true if something has changed since the last time this method was called, false otherwise diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembersSet.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembersSet.java index b80d2c3de..2a06b2113 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembersSet.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembersSet.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002-2009 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -33,7 +33,7 @@ import org.aspectj.weaver.patterns.IVerificationRequired; /** * This holds on to all CrosscuttingMembers for a world. It handles management of change. - * + * * @author Jim Hugunin * @author Andy Clement */ @@ -66,7 +66,7 @@ public class CrosscuttingMembersSet { public boolean addOrReplaceAspect(ResolvedType aspectType) { return addOrReplaceAspect(aspectType, true); } - + /** * Check if any parent aspects of the supplied aspect have unresolved dependencies (and so * should cause this aspect to be turned off). @@ -99,13 +99,13 @@ public class CrosscuttingMembersSet { return false; } if (world.hasUnsatisfiedDependency(aspectType)) { - return false; + return false; } // Abstract super aspects might have unsatisfied dependencies if (excludeDueToParentAspectHavingUnresolvedDependency(aspectType)) { return false; } - + boolean change = false; CrosscuttingMembers xcut = members.get(aspectType); if (xcut == null) { @@ -134,7 +134,7 @@ public class CrosscuttingMembersSet { return change; } - + private boolean addOrReplaceDescendantsOf(ResolvedType aspectType, boolean inWeavePhase) { // System.err.println("Looking at descendants of "+aspectType.getName()); Set<ResolvedType> knownAspects = members.keySet(); @@ -242,7 +242,7 @@ public class CrosscuttingMembersSet { /** * Retrieve a subset of all known mungers, those of a specific kind. - * + * * @param kind the kind of munger requested * @return a list of those mungers (list is empty if none found) */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java index f11e02451..897e7995b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2007 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Linton Ye https://bugs.eclipse.org/bugs/show_bug.cgi?id=193065 diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java index e6c4274e5..dff7a8e4d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java @@ -2,9 +2,9 @@ * Copyright (c) 2004,2010 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Matthew Webster, IBM diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/EnumAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/EnumAnnotationValue.java index f15968b8d..533b3c78a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/EnumAnnotationValue.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/EnumAnnotationValue.java @@ -1,13 +1,13 @@ /* ******************************************************************* * 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 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andy Clement IBM 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 IBM initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -29,7 +29,7 @@ public class EnumAnnotationValue extends AnnotationValue { public String stringify() { return typeSignature+value; } - + public String getValue() { return value; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ExposeTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ExposeTypeMunger.java index f5b842011..ff0e73488 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ExposeTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ExposeTypeMunger.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2007 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: + * 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, IBM initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java index 5d08467d0..5d93d0c4b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2008 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.weaver; @@ -17,7 +17,7 @@ import org.aspectj.weaver.patterns.PerClause; /** * A delegate that can sit in the ReferenceType instance created for an aspect generated from aop.xml. Only answers the minimal set * of information required as the type is processed. - * + * * @author Andy Clement */ public class GeneratedReferenceTypeDelegate extends AbstractReferenceTypeDelegate { @@ -91,7 +91,7 @@ public class GeneratedReferenceTypeDelegate extends AbstractReferenceTypeDelegat public AnnotationAJ[] getAnnotations() { throw new UnsupportedOperationException("Not supported for GeneratedReferenceTypeDelegate"); } - + public boolean hasAnnotations() { throw new UnsupportedOperationException("Not supported for GeneratedReferenceTypeDelegate"); } @@ -152,4 +152,4 @@ public class GeneratedReferenceTypeDelegate extends AbstractReferenceTypeDelegat throw new UnsupportedOperationException("Not supported for GeneratedReferenceTypeDelegate"); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IClassWeaver.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IClassWeaver.java index ad65eedf9..0c30b855b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IClassWeaver.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IClassWeaver.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -21,7 +21,7 @@ public interface IClassWeaver { /** * perform the weaving. - * + * * @return <code>true</code> if the class is changed by the weaving, <code>false</code> otherwise. */ boolean weave(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ICrossReferenceHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ICrossReferenceHandler.java index e38338ae1..70651d649 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ICrossReferenceHandler.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ICrossReferenceHandler.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2000, 2003 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 *******************************************************************************/ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java index 95615d13a..4981598c7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java @@ -1,9 +1,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: IBM Corporation - initial API and implementation * Helen Hawkins - iniital version diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasPosition.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasPosition.java index 8efb55828..edb32abcd 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasPosition.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasPosition.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -20,9 +20,9 @@ public interface IHasPosition { /** * The ending index of this location in the character stream - * + * * This points to the last character in this token. - * + * * If a location truly had no contents, then start == end + 1. We don't recommend this. */ int getEnd(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasSourceLocation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasSourceLocation.java index 5b011f246..9c1c32cf9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasSourceLocation.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasSourceLocation.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java index 5af15d6f5..f50ab6d35 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java @@ -2,9 +2,9 @@ * Copyright (c) 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: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IUnwovenClassFile.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IUnwovenClassFile.java index 85ab7a16d..4cbf7831b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IUnwovenClassFile.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IUnwovenClassFile.java @@ -1,17 +1,17 @@ /* ******************************************************************* * Copyright (c) 2008 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 - * + * 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.weaver; /** * History: 246125 - * + * * @author Andy Clement */ public interface IUnwovenClassFile { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeaveRequestor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeaveRequestor.java index 60037c2e6..1a250e7cf 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeaveRequestor.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeaveRequestor.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 *******************************************************************************/ @@ -12,7 +12,7 @@ package org.aspectj.weaver; /** * @author colyer - * + * * This interface is implemented by clients driving weaving through the IClassFileProvider interface. It is used by the * weaver to return woven class file results back to the client. The client can correlate weave results with inputs since it * knows the last UnwovenClassFile returned by its iterator. diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java index 8f614addc..5a6d0795e 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java @@ -2,9 +2,9 @@ * Copyright (c) 2008 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://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/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java index fb86ee4f0..067d0937a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Iterators.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Iterators.java index 576ef9e34..63a979304 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Iterators.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Iterators.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java index 57171dd13..e058bb2ca 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.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.weaver; @@ -22,17 +22,17 @@ import org.aspectj.weaver.AjAttribute.EffectiveSignatureAttribute; /** * @author colyer Instances of this class are created by ResolvedMember.getSignatures() when collating all of the signatures for a * member. We need to create entries in the set for the "gaps" in the hierarchy. For example: - * + * * class A { void foo(); } - * + * * class B extends A {} - * + * * Join Point : call(* B.foo()) - * + * * has signatures: - * + * * B.foo() AND A.foo() B.foo() will be created as a ResolvedMemberWithSubstituteDeclaringType - * + * * Oh for a JDK 1.4 dynamic proxy.... we have to run on 1.3 :( */ public class JoinPointSignature implements ResolvedMember { @@ -90,7 +90,7 @@ public class JoinPointSignature implements ResolvedMember { public void setAnnotationTypes(ResolvedType[] annotationtypes) { realMember.setAnnotationTypes(annotationtypes); } - + public void setAnnotations(AnnotationAJ[] annotations) { realMember.setAnnotations(annotations); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignatureIterator.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignatureIterator.java index 639e4a080..4c10b0bdb 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignatureIterator.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignatureIterator.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.weaver; @@ -109,7 +109,7 @@ public class JoinPointSignatureIterator implements Iterator<JoinPointSignature> return; } - firstDefiningMember = (signaturesOfMember instanceof ResolvedMember ? + firstDefiningMember = (signaturesOfMember instanceof ResolvedMember ? (ResolvedMember) signaturesOfMember: signaturesOfMember.resolve(world)); if (firstDefiningMember == null) { @@ -244,7 +244,7 @@ public class JoinPointSignatureIterator implements Iterator<JoinPointSignature> /** * Returns true if the parent member is visible to the child member In the same declaring type this is always true, otherwise if * parent is private it is false. - * + * * @param childMember * @param parentMember * @return diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Lint.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Lint.java index 2dbca28e3..d2a5f0492 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Lint.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Lint.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -165,7 +165,7 @@ public class Lint { kind.setKind(messageKind); } } - + public void setFromMap(Map<String,String> lintOptionsMap) { for (String key: lintOptionsMap.keySet()) { String value = lintOptionsMap.get(key); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/LintMessage.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/LintMessage.java index f54e20e7d..52bb0a965 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/LintMessage.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/LintMessage.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002-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: - * 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: + * PARC initial implementation * AndyClement extracted as self contained type from Lint type (4-Aug-06) * ******************************************************************/ package org.aspectj.weaver; @@ -41,4 +41,4 @@ public class LintMessage extends Message { return lintKind; } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java index c11dad556..ea5a5b0be 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java @@ -2,9 +2,9 @@ * Copyright (c) 2002-2010 * 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 * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java index 8414c5707..f5f8cc96b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -138,17 +138,17 @@ public class MemberImpl implements Member { * returns an Object[] pair of UnresolvedType, UnresolvedType[] representing return type, argument types parsed from the JVM * bytecode signature of a method. Yes, this should actually return a nice statically-typed pair object, but we don't have one * of those. - * + * * <blockquote> - * + * * <pre> * UnresolvedType.signatureToTypes("()[Z")[0].equals(Type.forSignature("[Z")) * UnresolvedType.signatureToTypes("(JJ)I")[1] * .equals(UnresolvedType.forSignatures(new String[] {"J", "J"})) * </pre> - * + * * </blockquote> - * + * * @param erasedSignature the JVM bytecode method signature string we want to break apart * @return a pair of UnresolvedType, UnresolvedType[] representing the return types and parameter types. */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberKind.java index f1d5dfa0f..ea64fcc57 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberKind.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberKind.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -45,4 +45,4 @@ public class MemberKind extends TypeSafeEnum { } throw new BCException("Unexpected memberkind, should be (1-9) but was " + key); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberUtils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberUtils.java index 201eb758f..28b98cfa4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberUtils.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberUtils.java @@ -1,19 +1,19 @@ /* ******************************************************************* * Copyright (c) 2010 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: + * 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, SpringSource * ******************************************************************/ package org.aspectj.weaver; /** * Common utility methods for members. - * + * * @author Andy Clement */ public class MemberUtils { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MethodDelegateTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MethodDelegateTypeMunger.java index d07d8456f..16076b075 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MethodDelegateTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MethodDelegateTypeMunger.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/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java index da61ffd8b..8d3159dc5 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.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.weaver; @@ -21,7 +21,7 @@ import org.aspectj.bridge.context.CompilationAndWeavingContext; * When we try to resolve a type in the world that we require to be present, and then fail to find it, we return an instance of this * class. This class defers the production of the "can't find type error" until the first time that someone asks a question that * can't be answered solely from the signature. This enables the weaver to be more tolerant of missing types. - * + * */ public class MissingResolvedTypeWithKnownSignature extends ResolvedType { @@ -55,7 +55,7 @@ public class MissingResolvedTypeWithKnownSignature extends ResolvedType { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ResolvedType#getDeclaredFields() */ @Override @@ -66,7 +66,7 @@ public class MissingResolvedTypeWithKnownSignature extends ResolvedType { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ResolvedType#getDeclaredMethods() */ @Override @@ -107,7 +107,7 @@ public class MissingResolvedTypeWithKnownSignature extends ResolvedType { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ResolvedType#getSourceContext() */ @Override @@ -138,7 +138,7 @@ public class MissingResolvedTypeWithKnownSignature extends ResolvedType { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ResolvedType#isAssignableFrom(org.aspectj.weaver.ResolvedType) */ @Override @@ -155,10 +155,10 @@ public class MissingResolvedTypeWithKnownSignature extends ResolvedType { return isAssignableFrom(other); } } - + /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ResolvedType#isCoerceableFrom(org.aspectj.weaver.ResolvedType) */ @Override @@ -169,7 +169,7 @@ public class MissingResolvedTypeWithKnownSignature extends ResolvedType { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.AnnotatedElement#hasAnnotation(org.aspectj.weaver.UnresolvedType) */ @Override diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java index f696551f9..55be28a0d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewConstructorTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewConstructorTypeMunger.java index d7d1ba18d..133b16842 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewConstructorTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewConstructorTypeMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewFieldTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewFieldTypeMunger.java index ed8afc1e0..7e53c0f44 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewFieldTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewFieldTypeMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -22,9 +22,9 @@ import org.aspectj.weaver.AjAttribute.WeaverVersionInfo; /** * Code that created version one style ITD type mungers will be using direct field access from the dispatchers - * + * * @author Andy - * + * */ public class NewFieldTypeMunger extends ResolvedTypeMunger { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMemberClassTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMemberClassTypeMunger.java index c086c2c86..8189dc1ea 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMemberClassTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMemberClassTypeMunger.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2010 SpringSource, 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 + * 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.weaver; @@ -16,7 +16,7 @@ import org.aspectj.bridge.ISourceLocation; /** * Weaver representation of an intertype declared member class. The munger captures the name of the type being declared and the * target. - * + * * @author Andy Clement * @since 1.6.9 */ @@ -87,4 +87,4 @@ public class NewMemberClassTypeMunger extends ResolvedTypeMunger { && ((typeVariableAliases == null) ? (o.typeVariableAliases == null) : typeVariableAliases .equals(o.typeVariableAliases)); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMethodTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMethodTypeMunger.java index a6e0ffce7..d386f68bb 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMethodTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMethodTypeMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewParentTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewParentTypeMunger.java index cb3110073..6f672cb3b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewParentTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewParentTypeMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java index ce4348241..507717721 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java @@ -2,9 +2,9 @@ * Copyright (c) 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: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java index ad549417a..4380166b0 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005 IBM, 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: - * 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.weaver; @@ -82,5 +82,5 @@ public class PerTypeWithinTargetTypeMunger extends ResolvedTypeMunger { } return FuzzyBoolean.NO; } - + } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PersistenceSupport.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PersistenceSupport.java index d98c7678d..3529246ae 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PersistenceSupport.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PersistenceSupport.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * which accompanies this distribution and is available at - * http://www.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.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PoliceExtensionUse.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PoliceExtensionUse.java index e35a9b8a3..348d5dc7f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PoliceExtensionUse.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PoliceExtensionUse.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2006 IBM + * Copyright (c) 2006 IBM * 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: * Andy Clement - initial API and implementation @@ -77,4 +77,4 @@ public class PoliceExtensionUse extends AbstractPatternNodeVisitor { return node; } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Position.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Position.java index af9f38328..4857530b4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Position.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Position.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PrivilegedAccessMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PrivilegedAccessMunger.java index b09757ec9..a7b0f8f17 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PrivilegedAccessMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PrivilegedAccessMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -17,7 +17,7 @@ import java.io.IOException; /** * A privileged access munger is for handling privileged access to a member. It determines the names of the getter/setter that will * be used to access a private field in some type, or the special method that provides access to a private method. - * + * * There are two syntax styles for field access, the older style was in use up to AspectJ 1.6.9 and involves long named getters and * setters which include the requesting aspect and the target type. The short style syntax is use from AspectJ 1.6.9 onwards is * simply 'ajc$get$<fieldname>' and 'ajc$set$<fieldname>' - as the requesting aspect isn't included in the name they can be shared diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java index c40bf9f43..7dd98234b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002 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: - * 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: + * PARC initial implementation * Andy Clement - June 2005 - separated out from ResolvedType * ******************************************************************/ package org.aspectj.weaver; @@ -376,13 +376,13 @@ public class ReferenceType extends ResolvedType { if (this.isFinal() || other.isFinal()) { return false; } - + // 20170927: What is the block of code for? It mentions jls5.5 which isn't on this topic (old version of jls?) // Some possible references: http://docs.oracle.com/javase/specs/jls/se9/jls9.pdf 5.1.6 (narrowing reference conversion) // On Java 9 the test GenericsTests.testAfterReturningWithWildcardVar will fail because this code below // used to find Set and List were the same, but now finds they are not. (so it doesn't put out the unchecked // conversion message). However the code "List l = (List)someSet;" still compiles on 9 - so is this code bogus? - + // ??? needs to be Methods, not just declared methods? JLS 5.5 unclear ResolvedMember[] a = getDeclaredMethods(); ResolvedMember[] b = other.getDeclaredMethods(); @@ -1119,7 +1119,7 @@ public class ReferenceType extends ResolvedType { /** * a parameterized signature starts with a "P" in place of the "L", see the * comment on signatures in UnresolvedType. - * + * * @param aGenericType * @param someParameters * @return @@ -1245,7 +1245,7 @@ public class ReferenceType extends ResolvedType { * avoid creating an unnecessary new (duplicate) with the same information * in it. This method also cleans up any reference entries that have been * null'd by a GC. - * + * * @param typeParameters * the type parameters to use when searching for the derivative * type. @@ -1277,4 +1277,4 @@ public class ReferenceType extends ResolvedType { return newInterfaces != null; } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java index 3dcea23b9..10d648e0e 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvableTypeList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvableTypeList.java index 34e17b44a..24095cda3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvableTypeList.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvableTypeList.java @@ -1,13 +1,13 @@ /* ******************************************************************* * 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 - * 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.weaver; @@ -16,7 +16,7 @@ package org.aspectj.weaver; * and a ResolvedType array is passed on. Depending on the situation there may not be a need to resolve all the entries so this can * perform better. Note: the array elements are resolved in place, so the caller should not be surprised if elements and resolved * after the type list has been used. - * + * * @author Andy Clement */ public class ResolvableTypeList { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java index 39ab054b2..97a85652f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java @@ -3,9 +3,9 @@ * 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java index 7cd7e34cf..fd4cfa48d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2002-2010 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 + * 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.weaver; @@ -24,7 +24,7 @@ import org.aspectj.bridge.ISourceLocation; /** * Represent a resolved member. Components of it are expected to exist. This member will correspond to a real member *unless* it is * being used to represent the effect of an ITD. - * + * * @author PARC * @author Andy Clement */ @@ -88,13 +88,13 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso * in the hierarchy. A shadowMember can be created with a target type (declaring type) that does not actually define the member. * This is ok as long as the member is inherited in the declaring type. Each declaring type in the line to the actual declaring * type is added as an additional signature. For example: - * + * * class A { void foo(); } class B extends A {} - * + * * shadowMember : void B.foo() - * + * * gives { void B.foo(), void A.foo() } - * + * * @param joinPointSignature * @param inAWorld */ @@ -213,7 +213,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso /** * Returns true if the parent member is visible to the child member In the same declaring type this is always true, otherwise if * parent is private it is false. - * + * * @param childMember * @param parentMember * @return @@ -273,7 +273,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso * Check if this member has an annotation of the specified type. If the member has a backing generic member then this member * represents a parameterization of a member in a generic type and the annotations available on the backing generic member * should be used. - * + * * @param ofType the type of the annotation being searched for * @return true if the annotation is found on this member or its backing generic member */ @@ -340,7 +340,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso } throw new UnsupportedOperationException("You should resolve this member and call getAnnotationOfType() on the result..."); } - + public void setAnnotations(AnnotationAJ[] annotations) { this.annotations = annotations; } @@ -464,7 +464,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso /** * Return the member generic signature that would be suitable for inclusion in a class file Signature attribute. For: <T> * List<String> getThem(T t) {} we would create: <T:Ljava/lang/Object;>(TT;)Ljava/util/List<Ljava/lang/String;>;; - * + * * @return the generic signature for the member that could be inserted into a class file */ public String getSignatureForAttribute() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java index 500b30cd0..09d0f8ac4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -28,7 +28,7 @@ public class ResolvedPointcutDefinition extends ResolvedMemberImpl { /** * An instance which can be given a specific returnType, used f.e. in if() pointcut for @AJ - * + * * @param declaringType * @param modifiers * @param name diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java index 736564867..9f33cab4f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * Alexandre Vasseur @AspectJ ITDs * ******************************************************************/ @@ -230,7 +230,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl * <li>recur into superclass, all the way up, not touching interfaces</li> * <li>recur into all superinterfaces, in some unspecified order (but those 'closest' to this type are first)</li> * </ul> - * + * * @param wantGenerics is true if the caller would like all generics information, otherwise those methods are collapsed to their * erasure */ @@ -403,7 +403,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * Return a list of the types in the hierarchy of this type, starting with this type. The order in the list is the superclasses * followed by the super interfaces. - * + * * @param genericsAware should the list include parameterized/generic types (if not, they will be collapsed to raw)? * @return list of resolvedtypes in this types hierarchy, including this type first */ @@ -551,7 +551,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * described in JVM spec 2ed 5.4.3.3. Doesnt check ITDs. - * + * * <p> * Check the current type for the method. If it is not found, check the super class and any super interfaces. Taking care not to * process interfaces multiple times. @@ -635,7 +635,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl toSearch = getMethodsIncludingIntertypeDeclarations(!eraseGenerics, true); } else if (aMember.getKind()==Member.ADVICE) { return null; - } else { + } else { assert aMember.getKind() == Member.FIELD; toSearch = getFields(); } @@ -950,7 +950,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl public AnnotationAJ[] getAnnotations() { throw new RuntimeException("ResolvedType.getAnnotations() should never be called"); } - + public boolean hasAnnotations() { throw new RuntimeException("ResolvedType.getAnnotations() should never be called"); } @@ -1122,7 +1122,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl public final int getSize() { return size; } - + @Override public final int getModifiers() { return Modifier.PUBLIC | Modifier.FINAL; @@ -1358,7 +1358,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * as lookupMemberNoSupers, but does not include ITDs - * + * * @param member * @return */ @@ -1377,7 +1377,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * This lookup has specialized behaviour - a null result tells the EclipseTypeMunger that it should make a default * implementation of a method on this type. - * + * * @param member * @return */ @@ -1527,7 +1527,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * See PR70794. This method checks that if an abstract inter-type method declaration is made on an interface then it must also * be public. This is a compiler limitation that could be made to work in the future (if someone provides a worthwhile usecase) - * + * * @return indicates if the munger failed the check */ private boolean checkAbstractDeclaration(ConcreteTypeMunger munger) { @@ -1565,7 +1565,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl * given in JLS 13.1, where it guarantees that if you call getDeclaringType() repeatedly, you will eventually get the top-level * class, but it does not say anything about classes in between. * </p> - * + * * @return the declaring type, or null if it is not an nested type. */ public ResolvedType getDeclaringType() { @@ -1623,7 +1623,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * Look up the actual occurence of a particular type in the hierarchy for 'this' type. The input is going to be a generic type, * and the caller wants to know if it was used in its RAW or a PARAMETERIZED form in this hierarchy. - * + * * returns null if it can't be found. */ public ResolvedType discoverActualOccurrenceOfTypeInHierarchy(ResolvedType lookingFor) { @@ -1867,7 +1867,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * Compare the type transformer with the existing members. A clash may not be an error (the ITD may be the 'default * implementation') so returning false is not always a sign of an error. - * + * * @return true if there is a clash */ private boolean clashesWithExistingMember(ConcreteTypeMunger typeTransformer, Iterator<ResolvedMember> existingMembers) { @@ -1924,7 +1924,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl if (Modifier.isPrivate(typeTransformerSignature.getModifiers()) && Modifier.isPublic(existingMember.getModifiers())) { world.getMessageHandler().handleMessage(new Message("private intertype declaration '"+typeTransformerSignature.toString()+"' clashes with public member '"+existingMember.toString()+"'",existingMember.getSourceLocation(),true)); - } + } } } // existingMember dominates munger @@ -2095,7 +2095,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl } else { ResolvedType rtParentReturnType = parent.resolve(world).getGenericReturnType().resolve(world); ResolvedType rtChildReturnType = child.resolve(world).getGenericReturnType().resolve(world); - + incompatibleReturnTypes = !rtParentReturnType.equals(rtChildReturnType); } @@ -2495,7 +2495,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * Overridden by ReferenceType to return a sensible answer for parameterized and raw types. - * + * * @return */ public ReferenceType getGenericType() { @@ -2517,7 +2517,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl } /** - * Iff I am a parameterized type, and any of my parameters are type variable references (or nested parameterized types), + * Iff I am a parameterized type, and any of my parameters are type variable references (or nested parameterized types), * return a version with those type parameters replaced in accordance with the passed bindings. */ @Override @@ -2574,7 +2574,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * Similar to the above method, but accumulates the super types - * + * * @return */ // public ResolvedType[] getParameterizedSuperTypes() { @@ -2625,7 +2625,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl * from all types. A primitive type is convertable from X iff it's assignable from X. A reference type is convertable from X iff * it's coerceable from X. In other words, X isConvertableFrom Y iff the compiler thinks that _some_ value of Y could be * assignable to a variable of type X without loss of precision. - * + * * @param other the other type * @return true iff variables of this type could be assigned values of other with possible conversion */ @@ -2662,7 +2662,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * Determines if the variables of this type could be assigned values of another type without casting. This still allows for * assignment conversion as per JLS 2ed 5.2. For object types, this means supertypeOrEqual(THIS, OTHER). - * + * * @param other the other type * @return true iff variables of this type could be assigned values of other without casting * @throws NullPointerException if other is null @@ -2678,13 +2678,13 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl * This method should be commutative, i.e., for all UnresolvedType a, b and all World w: * </p> * <blockquote> - * + * * <pre> * a.isCoerceableFrom(b, w) == b.isCoerceableFrom(a, w) * </pre> - * + * * </blockquote> - * + * * @param other the other type * @return true iff values of other could possibly be cast to this type. * @throws NullPointerException if other is null. @@ -2876,7 +2876,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl /** * return the weaver version used to build this type - defaults to the most recent version unless discovered otherwise. - * + * * @return the (major) version, {@link WeaverVersionInfo} */ public int getCompilerVersion() { @@ -2913,7 +2913,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl } return (bits & IsGroovyObject) != 0; } - + public boolean isPrivilegedAspect() { if ((bits & IsPrivilegedBitInitialized) == 0) { AnnotationAJ privilegedAnnotation = getAnnotationOfType(UnresolvedType.AJC_PRIVILEGED); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedTypeMunger.java index 3614d45bb..cba168b4d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedTypeMunger.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 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: + * 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: * PARC initial implementation * Alexandre Vasseur @AspectJ ITDs * ******************************************************************/ @@ -73,7 +73,7 @@ public abstract class ResolvedTypeMunger { } } // boolean aChangeOccurred = false; - // + // // UnresolvedType rt = signature.getReturnType(); // if (rt.isParameterizedType() || rt.isGenericType()) {rt = rt.getRawType();aChangeOccurred=true;} // UnresolvedType[] pt = signature.getParameterTypes(); @@ -99,7 +99,7 @@ public abstract class ResolvedTypeMunger { // fromType is guaranteed to be a non-abstract aspect // public ConcreteTypeMunger concretize(World world, ResolvedType aspectType) { - // + // // ConcreteTypeMunger munger = world.concreteTypeMunger(this, aspectType); // return munger; // } @@ -477,10 +477,10 @@ public abstract class ResolvedTypeMunger { /** * Some type mungers are created purely to help with the implementation of shadow mungers. For example to support the cflow() * pointcut we create a new cflow field in the aspect, and that is added via a BcelCflowCounterFieldAdder. - * + * * During compilation we need to compare sets of type mungers, and if some only come into existence after the 'shadowy' type * things have been processed, we need to ignore them during the comparison. - * + * * Returning true from this method indicates the type munger exists to support 'shadowy' stuff - and so can be ignored in some * comparison. */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/RuntimeVersion.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/RuntimeVersion.java index 0cf90a9a2..4196e4ee7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/RuntimeVersion.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/RuntimeVersion.java @@ -2,9 +2,9 @@ * Copyright (c) 2018 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * ******************************************************************/ package org.aspectj.weaver; @@ -12,19 +12,19 @@ package org.aspectj.weaver; * Captures important runtime versions. Typically new versions are added here if something * changes in the runtime and the code generation may be able to do something different * (more optimal) for a later runtime. - * + * * @author Andy Clement */ public enum RuntimeVersion { - + V1_2("1.2"), V1_5("1.5"), V1_6_10("1.6.10"), V1_9("1.9"); - + private String[] aliases = null; RuntimeVersion(String... aliases) { this.aliases = aliases; } - + public static RuntimeVersion getVersionFor(String version) { for (RuntimeVersion candidateVersion: values()) { if (candidateVersion.name().equals(version)) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java index 14690ad35..5ab8feae0 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java @@ -2,9 +2,9 @@ * Copyright (c) 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: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ShadowMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ShadowMunger.java index 3a2a3a740..6d1cf74eb 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ShadowMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ShadowMunger.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -31,9 +31,9 @@ import org.aspectj.weaver.patterns.TypePattern; /** * For every shadow munger, nothing can be done with it until it is concretized. Then... - * + * * (Then we call fast match.) - * + * * For every shadow munger, for every shadow, first match is called, then (if match returned true) the shadow munger is specialized * for the shadow, which may modify state. Then implement is called. */ @@ -153,7 +153,7 @@ public abstract class ShadowMunger implements PartialOrder.PartialComparable, IH /** * Invoked when the shadow munger of a resolved type are processed. - * + * * @param aType */ public void setDeclaringType(ResolvedType aType) { @@ -252,7 +252,7 @@ public abstract class ShadowMunger implements PartialOrder.PartialComparable, IH /** * Implement this munger at the specified shadow, returning a boolean to indicate success. - * + * * @param shadow the shadow where this munger should be applied * @return true if the implement was successful */ @@ -268,7 +268,7 @@ public abstract class ShadowMunger implements PartialOrder.PartialComparable, IH /** * Does the munger have to check that its exception are accepted by the shadow ? It is not the case for annotation style around * advice, for example: that can throw Throwable, even if the advised method does not throw any exceptions. - * + * * @return true if munger has to check that its exceptions can be thrown based on the shadow */ public abstract boolean mustCheckExceptions(); @@ -303,11 +303,11 @@ public abstract class ShadowMunger implements PartialOrder.PartialComparable, IH // } // newShadowMunger.binaryFile = null; // } - + public boolean bindsProceedingJoinPoint() { return false; } - + public boolean isAroundAdvice() { return false; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java index b88084a47..4df6681aa 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2008 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: + * + * 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 - refactored out of MemberImpl * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java index 2fe37e2cb..9bbfab35c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement IBM initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SourceContextImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SourceContextImpl.java index 2ae91c649..775dd2921 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SourceContextImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SourceContextImpl.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java index 4ec4c14c3..8d6915396 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2008 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 - * + * 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.weaver; @@ -20,7 +20,7 @@ import java.util.Set; * This type represents the weavers abstraction of an annotation - it is not tied to any underlying BCI toolkit. The weaver actualy * handles these through AnnotationX wrapper objects - until we start transforming the BCEL annotations into this form (expensive) * or offer a clever visitor mechanism over the BCEL annotation stuff that builds these annotation types directly. - * + * * @author AndyClement */ public class StandardAnnotation extends AbstractAnnotationAJ { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StaticJoinPointFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StaticJoinPointFactory.java index 591e6c470..51ca28a0c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StaticJoinPointFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StaticJoinPointFactory.java @@ -1,23 +1,23 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; public class StaticJoinPointFactory { // int usedKeys; - // + // // List/*String*/ strings = new ArrayList(); // Map/*String,Integer*/ keysForStrings = new HashMap(); - // + // // public StaticJoinPointFactory() { // super(); // } @@ -28,15 +28,15 @@ public class StaticJoinPointFactory { // 'A', 'B', 'Z', //62 // '%', '$', //64 // }; - // + // // static int TWO_WORDS = 64*64-1; // static int WORD_MASK = 63; - // + // // public void write(String s, StringBuffer result) { // int i = getIndex(s); // encode(i, result); // } - // + // // void encode(int i, StringBuffer result) { // if (i > TWO_WORDS) { // throw new RuntimeException("unimplemented"); @@ -45,10 +45,10 @@ public class StaticJoinPointFactory { // result.append( encoding[i & WORD_MASK] ); // } // } - // + // // public String read(StringReader reader) { // int i = reader.read(); - // + // // } } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TemporaryTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TemporaryTypeMunger.java index 0e0a89fce..3f6befa3a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TemporaryTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TemporaryTypeMunger.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2008 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 - * + * 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.weaver; @@ -13,9 +13,9 @@ import java.util.Map; /** * Some methods need a temporary type munger (because ConcreteTypeMunger is abstract - dont ask...). - * + * * TODO ought to remove the need for this or at least sort out the two methods that are in it, they look weird... - * + * * @author AndyClement */ public class TemporaryTypeMunger extends ConcreteTypeMunger { @@ -34,4 +34,4 @@ public class TemporaryTypeMunger extends ConcreteTypeMunger { throw new UnsupportedOperationException("Cannot be called on a TemporaryTypeMunger"); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java index c747ffe53..b73c09f1c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2005-2010 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.weaver; @@ -19,7 +19,7 @@ public class TypeFactory { /** * Create a parameterized version of a generic type. - * + * * @param aBaseType * @param someTypeParameters note, in the case of an inner type of a parameterized type, this parameter may legitimately be null * @param inAWorld @@ -39,11 +39,11 @@ public class TypeFactory { } // else if someTypeParameters is null, then the base type is allowed to be non-generic, it's an inner } ResolvedType[] resolvedParameters = inAWorld.resolve(someTypeParameters); - + ReferenceType existingType = ((ReferenceType)baseType).findDerivativeType(resolvedParameters); - + ReferenceType pType = null; - + if (existingType!=null) { pType = existingType; } else { @@ -313,7 +313,7 @@ public class TypeFactory { } else { char nextChar = remainingToProcess.charAt(nextCharPos); if (!(nextChar=='+' || nextChar=='-')) { - // dont need to set endOfSig as the loop will increment + // dont need to set endOfSig as the loop will increment // it to the right place before it exits sigFound=true; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java index d9bd8c50c..1126fd43c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2005-2010 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.weaver; @@ -12,7 +12,7 @@ import java.io.IOException; /** * Represents a type variable with possible bounds. - * + * * @author Adrian Colyer * @author Andy Clement */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java index a8729bae5..630ac1fc5 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.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: * Andy Clement Initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReference.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReference.java index 138fbced7..6fabf39b6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReference.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReference.java @@ -1,19 +1,19 @@ /* ******************************************************************* * 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.weaver; /** * Implemented by Types that represent references to type variables - * + * */ public interface TypeVariableReference { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java index 43c3b5cdd..6672c475c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2005-2012 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.weaver; @@ -13,7 +13,7 @@ import java.util.Map; /** * ReferenceType pointing to a type variable. The delegate for this reference type is the upperbound on the type variable (so * Object if not otherwise specified). - * + * * @author Adrian Colyer * @author Andy Clement */ @@ -25,7 +25,7 @@ public class TypeVariableReferenceType extends ReferenceType implements TypeVari super(typeVariable.getGenericSignature(), typeVariable.getErasureSignature(), world); this.typeVariable = typeVariable; } - + @Override public boolean equals(Object other) { if (other instanceof TypeVariableReferenceType) { @@ -33,7 +33,7 @@ public class TypeVariableReferenceType extends ReferenceType implements TypeVari } return false; } - + @Override public int hashCode() { return typeVariable.hashCode(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java index 237cb05f8..1f314f713 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002,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://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * 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: + * PARC initial implementation * Andy Clement start of generics upgrade... * Adrian Colyer - overhaul * ******************************************************************/ @@ -215,27 +215,27 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * NOTE: Use forSignature() if you can, it'll be cheaper ! Constructs a UnresolvedType for a java language type name. For * example: - * + * * <blockquote> - * + * * <pre> * UnresolvedType.forName("java.lang.Thread[]") * UnresolvedType.forName("int") * </pre> - * + * * </blockquote> - * + * * Types may equivalently be produced by this or by {@link #forSignature(String)}. - * + * * <blockquote> - * + * * <pre> * UnresolvedType.forName("java.lang.Thread[]").equals(Type.forSignature("[Ljava/lang/Thread;") * UnresolvedType.forName("int").equals(Type.forSignature("I")) * </pre> - * + * * </blockquote> - * + * * @param name the java language type name in question. * @return a type object representing that java language type. */ @@ -246,7 +246,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Constructs a UnresolvedType for each java language type name in an incoming array. - * + * * @param names an array of java language type names. * @return an array of UnresolvedType objects. * @see #forName(String) @@ -326,7 +326,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Creates a new type array with a fresh type appended to the end. - * + * * @param types the left hand side of the new array * @param end the right hand side of the new array */ @@ -340,8 +340,8 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Creates a new type array with a fresh type inserted at the beginning. - * - * + * + * * @param start the left hand side of the new array * @param types the right hand side of the new array */ @@ -355,27 +355,27 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Constructs a Type for a JVM bytecode signature string. For example: - * + * * <blockquote> - * + * * <pre> * UnresolvedType.forSignature("[Ljava/lang/Thread;") * UnresolvedType.forSignature("I"); * </pre> - * + * * </blockquote> - * + * * Types may equivalently be produced by this or by {@link #forName(String)}. This method should not be passed P signatures. - * + * * <blockquote> - * + * * <pre> * UnresolvedType.forName("java.lang.Thread[]").equals(Type.forSignature("[Ljava/lang/Thread;") * UnresolvedType.forName("int").equals(Type.forSignature("I")) * </pre> - * + * * </blockquote> - * + * * @param signature the JVM bytecode signature string for the desired type. * @return a type object represnting that JVM bytecode signature. */ @@ -421,7 +421,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Constructs a UnresolvedType for each JVM bytecode type signature in an incoming array. - * + * * @param sigs an array of JVM bytecode type signatures * @return an array of UnresolvedType objects. * @see #forSignature(String) @@ -437,7 +437,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Returns the name of this type in java language form (e.g. java.lang.Thread or boolean[]). This produces a more aesthetically * pleasing string than {@link java.lang.Class#getName()}. - * + * * @return the java language name of this type. */ public String getName() { @@ -492,7 +492,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Returns an array of strings representing the java langauge names of an array of types. - * + * * @param types an array of UnresolvedType objects * @return an array of Strings fo the java language names of types. * @see #getName() @@ -507,25 +507,25 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Returns the name of this type in JVM signature form. For all UnresolvedType t: - * + * * <blockquote> - * + * * <pre> * UnresolvedType.forSignature(t.getSignature()).equals(t) * </pre> - * + * * </blockquote> - * + * * and for all String s where s is a lexically valid JVM type signature string: - * + * * <blockquote> - * + * * <pre> * UnresolvedType.forSignature(s).getSignature().equals(s) * </pre> - * + * * </blockquote> - * + * * @return the java JVM signature string for this type. */ public String getSignature() { @@ -559,10 +559,10 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Returns a UnresolvedType object representing the effective outermost enclosing type for a name type. For all other types, * this will return the type itself. - * + * * The only guarantee is given in JLS 13.1 where code generated according to those rules will have type names that can be split * apart in this way. - * + * * @return the outermost enclosing UnresolvedType object or this. */ public UnresolvedType getOutermostType() { @@ -581,7 +581,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Returns a UnresolvedType object representing the component type of this array, or null if this type does not represent an * array type. - * + * * @return the component UnresolvedType object, or null. */ public UnresolvedType getComponentType() { @@ -608,7 +608,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { /** * Returns a resolved version of this type according to a particular world. - * + * * @param world the {@link World} within which to resolve. * @return a resolved type representing this type in the appropriate world. */ @@ -747,7 +747,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { if (name.endsWith("[]")) { return "[" + nameToSignature(name.substring(0, name.length() - 2)); } - + // Sometimes the 'name' for an array is of the form: [Ljava.lang.String; if (name.charAt(0)=='[') { return name.replace('.','/'); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java index fbeb47164..57aac6b9f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2005-2010 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.weaver; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Utils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Utils.java index 2ca0173be..e89ed0a76 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Utils.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Utils.java @@ -1,16 +1,16 @@ /* ******************************************************************* * Copyright (c) 2008 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.weaver; /** - * + * * @author Andy Clement */ public class Utils { @@ -18,7 +18,7 @@ public class Utils { /** * Check if the annotations contain a SuppressAjWarnings annotation and if that annotation specifies that the given lint message * (identified by its key) should be ignored. - * + * */ public static boolean isSuppressing(AnnotationAJ[] anns, String lintkey) { if (anns == null) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/VersionedDataInputStream.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/VersionedDataInputStream.java index 38b2081b0..5c3574490 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/VersionedDataInputStream.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/VersionedDataInputStream.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2005-2010 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: + * 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 (IBM, SpringSource) * ******************************************************************/ @@ -21,7 +21,7 @@ import org.aspectj.weaver.AjAttribute.WeaverVersionInfo; /** * Lightweight subclass of DataInputStream that knows what version of the weaver was used to construct the data in it. The input * stream has a constant pool reader attached which enables it to decode constant pool references found within the data being read. - * + * * @author Andy Clement */ public class VersionedDataInputStream extends DataInputStream { @@ -84,4 +84,4 @@ public class VersionedDataInputStream extends DataInputStream { public String toString() { return "VersionedDataInputStream: version=" + version + " constantPoolReader?" + (constantPoolReader != null); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeakClassLoaderReference.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeakClassLoaderReference.java index ddca93202..64c2fc65c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeakClassLoaderReference.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeakClassLoaderReference.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2008 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: - * 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.weaver; @@ -28,8 +28,8 @@ import java.lang.ref.WeakReference; * WeakClassLoaderReference instances will not 'lose' their ClassLoader references until the top level ClassLoader reference is * null'd. This means there is no need to check for the null case on get() in this WeakReference logic below, because we shouldn't * be using this weaver if its associated ClassLoader has been collected. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=210470 - * - * + * + * * @author Andy Clement, Abraham Nevado */ public class WeakClassLoaderReference{ @@ -41,7 +41,7 @@ public class WeakClassLoaderReference{ public WeakClassLoaderReference(ClassLoader loader) { loaderRef = new WeakReference(loader); if(loader == null){ - // Bug: 363962 + // Bug: 363962 // Check that ClassLoader is not null, for instance when loaded from BootStrapClassLoader hashcode = System.identityHashCode(this); }else{ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverMessages.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverMessages.java index 5a64a77e8..e2109a6e1 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverMessages.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverMessages.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2004-2019 Contributors - * 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 *******************************************************************************/ package org.aspectj.weaver; @@ -142,7 +142,7 @@ public class WeaverMessages { public static final String CANT_DECP_TO_MAKE_ANNOTATION_SUPERTYPE = "cantDecpToMakeAnnotationSupertype"; public static final String REFERENCE_TO_NON_ANNOTATION_TYPE = "referenceToNonAnnotationType"; public static final String BINDING_NON_RUNTIME_RETENTION_ANNOTATION = "bindingNonRuntimeRetentionAnnotation"; - + public static final String UNSUPPORTED_ANNOTATION_VALUE_TYPE = "unsupportedAnnotationValueType"; public static final String INCORRECT_TARGET_FOR_DECLARE_ANNOTATION = "incorrectTargetForDeclareAnnotation"; @@ -185,7 +185,7 @@ public class WeaverMessages { public static final String HAS_MEMBER_NOT_ENABLED = "hasMemberNotEnabled"; public static final String MUST_KEEP_OVERWEAVING_ONCE_START = "mustKeepOverweavingOnceStart"; - + // @AspectJ public static final String RETURNING_FORMAL_NOT_DECLARED_IN_ADVICE = "returningFormalNotDeclaredInAdvice"; public static final String THROWN_FORMAL_NOT_DECLARED_IN_ADVICE = "thrownFormalNotDeclaredInAdvice"; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverStateInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverStateInfo.java index ed7043eb4..88d13256e 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverStateInfo.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverStateInfo.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002-2019 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -32,13 +32,13 @@ import org.aspectj.weaver.AjAttribute.WeaverVersionInfo; /** * WeaverStateInfo represents how a type was processed. It is used by the weaver to determine how a type was previously treated and * whether reweaving is allowed. The format in the data stream is: - * + * * Byte: Kind. UNTOUCHED|WOVEN|EXTENDED - If extended it can have two extra bits set 'REWEAVABLE' and 'REWEAVABLE_COMPRESSION_BIT' * Short: typeMungerCount - how many type mungers have affected this type <UnresolvedType & ResolvedTypeMunger>: The type mungers * themselves If we are reweavable then we also have: Short: Number of aspects that touched this type in some way when it was * previously woven <String> The fully qualified name of each type Int: Length of class file data (i.e. the unwovenclassfile) * Byte[]: The class file data, compressed if REWEAVABLE_COMPRESSION_BIT set. - * + * * @author Andy Clement */ public class WeaverStateInfo { @@ -233,12 +233,12 @@ public class WeaverStateInfo { } private final static byte[] NO_BYTES = new byte[0]; - + /** * If the weaver is ever invoked in over weaving mode, we should * not include the key when writing out, it won't be replaced later. * If we turn off the reweaving flag that unfortunately removes - * the 'what aspects have been woven into this type' list which we + * the 'what aspects have been woven into this type' list which we * want to keep as it helps overweaving avoid weaving an aspect in * twice. */ @@ -278,7 +278,7 @@ public class WeaverStateInfo { public byte[] getUnwovenClassFileData() { return unwovenClassFile; } - + public byte[] getUnwovenClassFileData(byte wovenClassFile[]) { if (unwovenClassFileIsADiff) { unwovenClassFile = applyDiff(wovenClassFile, unwovenClassFile); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WildcardedUnresolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WildcardedUnresolvedType.java index d3e609e7f..f76e7cdde 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WildcardedUnresolvedType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WildcardedUnresolvedType.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2008 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: - * 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.weaver; @@ -15,7 +15,7 @@ package org.aspectj.weaver; * Represents a wildcarded bound for a generic type, this can be unbounded '?' or bounded via extends '? extends Foo' or super '? * super Foo'. The signature for a ? is in fact "*" and the erasure signature is the upper bound which defaults to java.lang.Object * if nothing is specified. On resolution, this becomes a BoundedReferenceType - * + * * @author Andy Clement */ public class WildcardedUnresolvedType extends UnresolvedType { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java index 671693e30..b5e6fe362 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java @@ -3,9 +3,9 @@ * 2005,2020 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * ******************************************************************/ package org.aspectj.weaver; @@ -2036,4 +2036,4 @@ public abstract class World implements Dump.INode { // override if interested in write events } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ASTNode.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ASTNode.java index 7e8b08347..ba0d9fd9d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ASTNode.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ASTNode.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/And.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/And.java index 8679d48d0..02e777a87 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/And.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/And.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -26,7 +26,7 @@ public class And extends Test { public void accept(ITestVisitor v) { v.visit(this); } - + public String toString() { return "(" + left + " && " + right + ")"; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Call.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Call.java index 1a1b52abe..55431f979 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Call.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Call.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/CallExpr.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/CallExpr.java index e8191a42e..719d63627 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/CallExpr.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/CallExpr.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Expr.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Expr.java index 1b22c8f42..e38ebf586 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Expr.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Expr.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.ast; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGet.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGet.java index 2e145e3c2..b58e653e9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGet.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGet.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.ast; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGetCall.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGetCall.java index 64aaf4b1a..9a03618b0 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGetCall.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGetCall.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/HasAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/HasAnnotation.java index 885e9d083..b0e7fdef9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/HasAnnotation.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/HasAnnotation.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 *******************************************************************************/ @@ -17,13 +17,13 @@ public class HasAnnotation extends Test { private Var v; private ResolvedType annType; - + public HasAnnotation(Var v, ResolvedType annType) { super(); this.v = v; this.annType = annType; } - + /* (non-Javadoc) * @see org.aspectj.weaver.ast.Test#accept(org.aspectj.weaver.ast.ITestVisitor) */ @@ -43,7 +43,7 @@ public class HasAnnotation extends Test { return false; } } - + public int hashCode() { return v.hashCode()*37+annType.hashCode(); } @@ -54,6 +54,6 @@ public class HasAnnotation extends Test { public UnresolvedType getAnnotationType() { return annType; - } - + } + } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/IExprVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/IExprVisitor.java index 89e0b3d74..8b9cb973c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/IExprVisitor.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/IExprVisitor.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.ast; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ITestVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ITestVisitor.java index fc99272af..d11befe50 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ITestVisitor.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ITestVisitor.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Instanceof.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Instanceof.java index feec6a2be..206d78057 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Instanceof.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Instanceof.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -28,7 +28,7 @@ public class Instanceof extends Test { public void accept(ITestVisitor v) { v.visit(this); } - + public String toString() { return "(" + var + " instanceof " + type + ")"; } @@ -41,7 +41,7 @@ public class Instanceof extends Test { return false; } } - + public int hashCode() { return var.hashCode()*37+type.hashCode(); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Literal.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Literal.java index bb7968eb5..b08e17274 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Literal.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Literal.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -24,15 +24,15 @@ public final class Literal extends Test { this.val = val; this.noTest = noTest; } - + public void accept(ITestVisitor v) { v.visit(this); } - + public static final Literal TRUE = new Literal(true, false); public static final Literal FALSE = new Literal(false, false); // public static final Literal NO_TEST = new Literal(false, true); - + public String toString() { return noTest ? "NO_TEST" : val ? "TRUE" : "FALSE"; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Not.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Not.java index 366a193a4..b35402813 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Not.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Not.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -25,11 +25,11 @@ public class Not extends Test { public void accept(ITestVisitor v) { v.visit(this); } - + public Test getBody() { return test; } - + public String toString() { return "!" + test; } @@ -42,7 +42,7 @@ public class Not extends Test { return false; } } - + public int hashCode() { return test.hashCode(); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Or.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Or.java index b3143df73..495751fe5 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Or.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Or.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -25,7 +25,7 @@ public class Or extends Test { public void accept(ITestVisitor v) { v.visit(this); } - + public String toString() { return "(" + left + " || " + right + ")"; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Test.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Test.java index 8da7694e6..a3e8e8756 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Test.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Test.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -21,9 +21,9 @@ public abstract class Test extends ASTNode { public Test() { super(); } - + public abstract void accept(ITestVisitor v); - + public static Test makeAnd(Test a, Test b) { // if (a == Literal.NO_TEST) return b; // if (b == Literal.NO_TEST) return a; @@ -39,9 +39,9 @@ public abstract class Test extends ASTNode { return Literal.FALSE; } else { return new And(a, b); - } + } } - + public static Test makeOr(Test a, Test b) { // if (a == Literal.NO_TEST) return a; // if (b == Literal.NO_TEST) return b; @@ -53,9 +53,9 @@ public abstract class Test extends ASTNode { return Literal.TRUE; } else { return new Or(a, b); - } + } } - + public static Test makeNot(Test a) { if (a instanceof Not) { return ((Not) a).getBody(); @@ -69,27 +69,27 @@ public abstract class Test extends ASTNode { return new Not(a); } } - + // uses our special rules that anything matches object public static Test makeInstanceof(Var v, ResolvedType ty) { if (ty.equals(ResolvedType.OBJECT)) return Literal.TRUE; - + Test e; if (ty.isAssignableFrom(v.getType())) e = Literal.TRUE; else if (! ty.isCoerceableFrom(v.getType())) e = Literal.FALSE; else e = new Instanceof(v, ty); return e; } - + public static Test makeHasAnnotation(Var v, ResolvedType annTy) { return new HasAnnotation(v,annTy); } - + public static Test makeCall(Member m, Expr[] args) { return new Call(m, args); } public static Test makeFieldGetCall(Member f, Member m, Expr[] args) { return new FieldGetCall(f, m, args); } - + } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Var.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Var.java index 77fddb557..74371f271 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Var.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Var.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.ast; @@ -38,7 +38,7 @@ public class Var extends Expr { /** * For an annotation this will return a variable that can access a specific field of the annotation (of the specified type) TODO * what kind of behaviour happens for two annotation fields of the same type? - * + * * @param formalType * @param formalName * @return diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java index b5a78e0e6..f392942a6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.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.weaver.internal.tools; @@ -23,19 +23,19 @@ import org.aspectj.weaver.tools.ContextBasedMatcher; public class MatchingContextBasedTest extends Test { private final ContextBasedMatcher matcher; - + public MatchingContextBasedTest(ContextBasedMatcher pc) { this.matcher = pc; } - - + + /* (non-Javadoc) * @see org.aspectj.weaver.ast.Test#accept(org.aspectj.weaver.ast.ITestVisitor) */ public void accept(ITestVisitor v) { v.visit(this); } - + public boolean matches(MatchingContext context) { return this.matcher.matchesDynamically(context); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java index e5672dede..b7f7c10e4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.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.weaver.internal.tools; @@ -39,7 +39,7 @@ import org.aspectj.weaver.tools.MatchingContext; /** * Implementation of Pointcut that is backed by a user-extension pointcut designator handler. - * + * */ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { @@ -53,7 +53,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#getPointcutKind() */ public byte getPointcutKind() { @@ -62,7 +62,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#fastMatch(org.aspectj.weaver.patterns.FastMatchInfo) */ public FuzzyBoolean fastMatch(FastMatchInfo info) { @@ -80,7 +80,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { if (rtd instanceof ReflectionBasedReferenceTypeDelegate) { clazz = ((ReflectionBasedReferenceTypeDelegate)rtd).getClazz(); } - } + } } if (clazz == null) { return FuzzyBoolean.MAYBE; @@ -92,7 +92,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#couldMatchKinds() */ public int couldMatchKinds() { @@ -101,7 +101,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#matchInternal(org.aspectj.weaver.Shadow) */ protected FuzzyBoolean matchInternal(Shadow shadow) { @@ -121,7 +121,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#resolveBindings(org.aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings) */ @@ -131,7 +131,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#concretize1(org.aspectj.weaver.ResolvedType, org.aspectj.weaver.ResolvedType, * org.aspectj.weaver.IntMap) */ @@ -141,7 +141,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#findResidueInternal(org.aspectj.weaver.Shadow, * org.aspectj.weaver.patterns.ExposedState) */ @@ -157,7 +157,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#parameterizeWith(java.util.Map) */ public Pointcut parameterizeWith(Map typeVariableMap, World w) { @@ -166,7 +166,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.PatternNode#write(java.io.DataOutputStream) */ public void write(CompressingDataOutputStream s) throws IOException { @@ -175,7 +175,7 @@ public class PointcutDesignatorHandlerBasedPointcut extends Pointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.PatternNode#accept(org.aspectj.weaver.patterns.PatternNodeVisitor, java.lang.Object) */ public Object accept(PatternNodeVisitor visitor, Object data) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java index 822c78d9a..cad972987 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.internal.tools; @@ -72,7 +72,7 @@ public class PointcutExpressionImpl implements PointcutExpression { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.PointcutExpression#setMatchingContext(org.aspectj.weaver.tools.MatchingContext) */ public void setMatchingContext(MatchingContext aMatchContext) { @@ -329,7 +329,7 @@ public class PointcutExpressionImpl implements PointcutExpression { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.PointcutExpression#getPointcutExpression() */ public String getPointcutExpression() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java index a767ed18b..edc686c1f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.internal.tools; @@ -68,7 +68,7 @@ public class StandardPointcutExpressionImpl implements StandardPointcutExpressio /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.PointcutExpression#setMatchingContext(org.aspectj.weaver.tools.MatchingContext) */ public void setMatchingContext(MatchingContext aMatchContext) { @@ -272,7 +272,7 @@ public class StandardPointcutExpressionImpl implements StandardPointcutExpressio /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.PointcutExpression#getPointcutExpression() */ public String getPointcutExpression() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java index 8ce4bceea..960e9df0f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.internal.tools; @@ -22,11 +22,11 @@ public class TypePatternMatcherImpl implements TypePatternMatcher { public TypePatternMatcherImpl(TypePattern pattern, World world) { this.pattern = pattern; - this.world = world; + this.world = world; } - + public boolean matches(Class aClass) { - ResolvedType rt = + ResolvedType rt = ReflectionBasedReferenceTypeDelegateFactory.resolveTypeInWorld(aClass,world); return pattern.matchesStatically(rt); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java index 34efee3ee..01a177b4f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.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.weaver.patterns; @@ -15,7 +15,7 @@ import org.aspectj.weaver.patterns.Pointcut.MatchesNothingPointcut; /** * @author colyer - * + * */ public abstract class AbstractPatternNodeVisitor implements PatternNodeVisitor { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractSignaturePattern.java index cb87ee431..b9e3b962c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractSignaturePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractSignaturePattern.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2010 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: + * 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 - SpringSource * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -20,7 +20,7 @@ import org.aspectj.weaver.VersionedDataInputStream; /** * Implements common functions to be used across ISignaturePatterns. - * + * * @author Andy Clement * @since 1.6.9 */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java index c14f36025..fed3db0f6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -24,7 +24,7 @@ import org.aspectj.weaver.AjAttribute.WeaverVersionInfo; /** * @author colyer - * + * * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code * Templates */ @@ -54,7 +54,7 @@ public class AndAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.AnnotationTypePattern#resolveBindings(org.aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings, boolean) */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndPointcut.java index 20fc74734..b2b5bd0d6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndSignaturePattern.java index b374eea5a..b194974fd 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndSignaturePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndSignaturePattern.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2010 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: + * 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 - SpringSource * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -25,7 +25,7 @@ import org.aspectj.weaver.World; /** * Represents the AND of two other signature patterns. - * + * * @author Andy Clement * @since 1.6.9 */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java index f8b476e1a..1fc6d1be1 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -25,10 +25,10 @@ import org.aspectj.weaver.World; /** * left && right - * + * * <p> * any binding to formals is explicitly forbidden for any composite by the language - * + * * @author Erik Hilsdale * @author Jim Hugunin */ @@ -118,7 +118,7 @@ public class AndTypePattern extends TypePattern { right = right.resolveBindings(scope, bindings, false, false); return this; } - + @Override public TypePattern parameterizeWith(Map<String,UnresolvedType> typeVariableMap, World w) { TypePattern newLeft = left.parameterizeWith(typeVariableMap, w); @@ -171,7 +171,7 @@ public class AndTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ @Override diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java index f906a397e..1e80e1134 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -36,7 +36,7 @@ public class AnnotationPatternList extends PatternNode { new AnnotationTypePattern[] { AnnotationTypePattern.ELLIPSIS }); public AnnotationPatternList() { - typePatterns = new AnnotationTypePattern[0]; + typePatterns = new AnnotationTypePattern[0]; ellipsisCount = 0; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java index 9365d4cb8..292df0a8a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -44,7 +44,7 @@ import org.aspectj.weaver.ast.Var; * (at)Annotation((at)Foo) or (at)Annotation(foo)<br> * <p> * Matches any join point where the subject of the join point has an annotation matching the annotationTypePattern: - * + * * <br> * Join Point Kind - Subject <br> * ================================ <br> @@ -96,7 +96,7 @@ public class AnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#fastMatch(org.aspectj.weaver.patterns.FastMatchInfo) */ @Override @@ -110,7 +110,7 @@ public class AnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#match(org.aspectj.weaver.Shadow) */ @Override @@ -171,7 +171,7 @@ public class AnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#resolveBindings(org.aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings) */ @@ -188,7 +188,7 @@ public class AnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#concretize1(org.aspectj.weaver.ResolvedType, org.aspectj.weaver.IntMap) */ @Override @@ -256,7 +256,7 @@ public class AnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.NameBindingPointcut#getBindingAnnotationTypePatterns() */ @Override @@ -272,7 +272,7 @@ public class AnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.NameBindingPointcut#getBindingTypePatterns() */ @Override @@ -282,7 +282,7 @@ public class AnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.PatternNode#write(java.io.DataOutputStream) */ @Override diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationTypePattern.java index a2fcab87c..22f928359 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java index 769424311..b1cf8c785 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2008 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 - * + * 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 - extracted from AnnotationTypePattern * ******************************************************************/ @@ -71,4 +71,4 @@ public class AnyAnnotationTypePattern extends AnnotationTypePattern { public void setForParameterAnnotationMatch() { } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyTypePattern.java index 372891cf7..2f71e7312 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002, 2010 Palo Alto Research Center, Incorporated (PARC) and others. - * 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -31,7 +31,7 @@ public class AnyTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.TypePattern#couldEverMatchSameTypesAs(org.aspectj.weaver.patterns.TypePattern) */ @Override @@ -108,4 +108,4 @@ public class AnyTypePattern extends TypePattern { public TypePattern parameterizeWith(Map<String,UnresolvedType> arg0, World w) { return this; } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java index 8306ff6d0..eafc0ebc1 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002, 2010 Palo Alto Research Center, Incorporated (PARC) and others. - * 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -122,7 +122,7 @@ public class AnyWithAnnotationTypePattern extends TypePattern { public String toString() { return "(" + annotationPattern + " *)"; } - + public AnnotationTypePattern getAnnotationTypePattern() { return annotationPattern; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java index 349ebef79..02eff8395 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -34,7 +34,7 @@ import org.aspectj.weaver.ast.Var; /** * @author colyer - * + * * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code * Templates */ @@ -44,7 +44,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { private String declarationText; /** - * + * */ public ArgsAnnotationPointcut(AnnotationPatternList arguments) { super(); @@ -69,7 +69,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#fastMatch(org.aspectj.weaver.patterns.FastMatchInfo) */ public FuzzyBoolean fastMatch(FastMatchInfo info) { @@ -78,7 +78,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#match(org.aspectj.weaver.Shadow) */ protected FuzzyBoolean matchInternal(Shadow shadow) { @@ -89,7 +89,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#resolveBindings(org.aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings) */ @@ -107,7 +107,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#concretize1(org.aspectj.weaver.ResolvedType, org.aspectj.weaver.IntMap) */ protected Pointcut concretize1(ResolvedType inAspect, ResolvedType declaringType, IntMap bindings) { @@ -125,7 +125,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#findResidue(org.aspectj.weaver.Shadow, org.aspectj.weaver.patterns.ExposedState) */ protected Test findResidueInternal(Shadow shadow, ExposedState state) { @@ -209,7 +209,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#equals(java.lang.Object) */ public boolean equals(Object obj) { @@ -222,7 +222,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ public int hashCode() { @@ -231,7 +231,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#toString() */ private void buildDeclarationText() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsPointcut.java index 0522bb13c..8ff0e66f3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -36,7 +36,7 @@ import org.aspectj.weaver.ast.Test; /** * args(arguments) - * + * * @author Erik Hilsdale * @author Jim Hugunin */ @@ -238,7 +238,7 @@ public class ArgsPointcut extends NameBindingPointcut { /** * We need to find out if someone has put the @SuppressAjWarnings{"uncheckedArgument"} annotation somewhere. That somewhere is * going to be an a piece of advice that uses this pointcut. But how do we find it??? - * + * * @return */ private boolean isUncheckedArgumentWarningSuppressed() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicToken.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicToken.java index e6e201daf..c22b963ed 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicToken.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicToken.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -21,20 +21,20 @@ public final class BasicToken implements IToken { private int start; private int end; - + public static BasicToken makeOperator(String value, int start, int end) { return new BasicToken(value.intern(), false, null, start, end); } - + public static BasicToken makeIdentifier(String value, int start, int end) { return new BasicToken(value, true, null, start, end); } - + public static BasicToken makeLiteral(String value, String kind, int start, int end) { return new BasicToken(value, false, kind.intern(), start, end); } - - + + private BasicToken(String value, boolean isIdentifier, String literalKind, int start, int end) { this.value = value; this.isIdentifier = isIdentifier; @@ -42,11 +42,11 @@ public final class BasicToken implements IToken { this.start = start; this.end = end; } - + public int getStart() { return start; } public int getEnd() { return end; } public String getFileName() { return "unknown"; } - + public String getString() { return value; } @@ -54,18 +54,18 @@ public final class BasicToken implements IToken { public boolean isIdentifier() { return isIdentifier; } - + public Pointcut maybeGetParsedPointcut() { return null; } - - + + public String toString() { String s; if (isIdentifier) s = value; else s = "'" + value + "'"; - + return s + "@" + start + ":" + end; } public String getLiteralKind() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java index 15713e76d..7656bc2d8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -76,18 +76,18 @@ public class BasicTokenSource implements ITokenSource { buf.append("]"); return buf.toString(); } - - + + ////////////////////////////////////////////////////// // Convenience, maybe just for testing public static ITokenSource makeTokenSource(String input, ISourceContext context) { char[] chars = input.toCharArray(); - + int i = 0; List<BasicToken> tokens = new ArrayList<>(); - + while (i < chars.length) { - char ch = chars[i++]; + char ch = chars[i++]; switch(ch) { case ' ': case '\t': @@ -143,7 +143,7 @@ public class BasicTokenSource implements ITokenSource { throw new RuntimeException("bad " + ch); } continue; - + case '\"': int start0 = i-1; while (i < chars.length && !(chars[i]=='\"')) i++; @@ -154,12 +154,12 @@ public class BasicTokenSource implements ITokenSource { int start = i-1; while (i < chars.length && Character.isJavaIdentifierPart(chars[i])) { i++; } tokens.add(BasicToken.makeIdentifier(new String(chars, start, i-start), start, i-1)); - + } } //System.out.println(tokens); - + return new BasicTokenSource((IToken[])tokens.toArray(new IToken[0]), context); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java index 0cbd65a2d..bbb83e4ee 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2008 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: - * 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.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java index 142f6155e..50b64d180 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingPattern.java index 4d909ede5..1fe824b96 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingPattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingPattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingTypePattern.java index 900285038..d7921d589 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002, 2010 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: - * 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: + * PARC initial implementation * Nieraj Singh * ******************************************************************/ @@ -41,7 +41,7 @@ public class BindingTypePattern extends ExactTypePattern implements BindingPatte public int getFormalIndex() { return formalIndex; } - + public String getBindingName() { return bindingName; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java index 3b095c467..de86f5639 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java index b283a845f..bd7bdb952 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -50,7 +50,7 @@ public class CflowPointcut extends Pointcut { /** * Used to indicate that we're in the context of a cflow when concretizing if's - * + * * Will be removed or replaced with something better when we handle this as a non-error */ public static final ResolvedPointcutDefinition CFLOW_MARKER = new ResolvedPointcutDefinition(null, 0, null, diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java index 09208f9c2..79af11d7e 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Declare.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Declare.java index 48769fcb6..5325b94be 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Declare.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Declare.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareAnnotation.java index 8f7b26648..7a452ef05 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareAnnotation.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareAnnotation.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005 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: - * 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 * Andy Clement got it working * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -32,7 +32,7 @@ import org.aspectj.weaver.World; /** * Represents a declare annotation statement, one of atField, atMethod, atConstructor or atType. - * + * * @author Andy Clement */ public class DeclareAnnotation extends Declare { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java index 8251644ae..dae13ec1c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java index 440a9ce5d..f3f9f2b62 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2002-2019 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 + * 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.weaver.patterns; @@ -290,9 +290,9 @@ public class DeclareParents extends Declare { * that clashes with the new parent that the user wants to apply to the type. If it finds an existing parameterization that * matches the new one, it silently completes, if it finds one that clashes (e.g. a type already has A<String> when the user * wants to add A<Number>) then it will produce an error. - * + * * It uses recursion and exits recursion on hitting 'jlObject' - * + * * Related bugzilla entries: pr110788 */ private boolean verifyNoInheritedAlternateParameterization(ResolvedType typeToVerify, ResolvedType newParent, World world) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java index 9c2db1156..fc63a6e5e 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java @@ -2,9 +2,9 @@ * 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Andy Clement @@ -20,7 +20,7 @@ import org.aspectj.weaver.VersionedDataInputStream; /** * Constructed based on an @DeclareMixin being found in an aspect. - * + * * @author Andy Clement */ public class DeclareParentsMixin extends DeclareParents { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java index 678ea89e6..504a7e6c0 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java index 3714d5fdc..4b8be00de 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java index 9ac12de48..a6ae608c6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2010 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: - * 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.weaver.patterns; @@ -22,7 +22,7 @@ import org.aspectj.weaver.World; /** * For a declare error/warning that specified a type pattern rather than a pointcut. - * + * * @author Andy Clement * @since 1.6.9 */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/EllipsisTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/EllipsisTypePattern.java index 67c704dae..745edb9f1 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/EllipsisTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/EllipsisTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002, 2010 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -30,7 +30,7 @@ public class EllipsisTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.TypePattern#couldEverMatchSameTypesAs(org.aspectj.weaver.patterns.TypePattern) */ @Override @@ -76,7 +76,7 @@ public class EllipsisTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -86,7 +86,7 @@ public class EllipsisTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ @Override @@ -104,4 +104,4 @@ public class EllipsisTypePattern extends TypePattern { return this; } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java index 9d5fd8bd3..b13cb34e7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2008 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: - * 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.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java index 4b108cf16..007759618 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -261,7 +261,7 @@ public class ExactAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.AnnotationTypePattern#resolveBindings(org .aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings, boolean) */ @@ -362,7 +362,7 @@ public class ExactAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.PatternNode#write(java.io.DataOutputStream) */ @Override @@ -424,7 +424,7 @@ public class ExactAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -440,7 +440,7 @@ public class ExactAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ @Override diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java index b439de277..b75ad764f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java @@ -2,9 +2,9 @@ * Copyright (c) 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: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExposedState.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExposedState.java index 8ff7849af..00183a8e2 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExposedState.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExposedState.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FastMatchInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FastMatchInfo.java index a18830832..3899366ed 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FastMatchInfo.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FastMatchInfo.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * Jim Hugunin 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: + * Jim Hugunin initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -33,7 +33,7 @@ public class FastMatchInfo { /** * kind can be null to indicate that all kinds should be considered. This is usually done as a first pass - * + * * @return */ public Kind getKind() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FormalBinding.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FormalBinding.java index 36ff22198..37d674696 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FormalBinding.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FormalBinding.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -70,7 +70,7 @@ public class FormalBinding implements IHasPosition { /** * A marker class for bindings for which we want to ignore unbound issue and consider them as implicit binding - f.e. to handle * JoinPoint in @AJ advices - * + * * @author Alexandre Vasseur (alex AT gnilux DOT com) */ public static class ImplicitFormalBinding extends FormalBinding { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java index 3f92ab04a..0fa172ec7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java index c84cf3eee..38512a73f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.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 * Nieraj Singh * ******************************************************************/ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java index 5fb59503f..5a8f2c6ee 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.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.weaver.patterns; @@ -16,18 +16,18 @@ package org.aspectj.weaver.patterns; * usage : new HasMemberTypePatternFinder(pattern).hasMemberTypePattern() */ public class HasMemberTypePatternFinder extends AbstractPatternNodeVisitor { - + private boolean hasMemberTypePattern = false; - + public HasMemberTypePatternFinder(TypePattern aPattern) { aPattern.traverse(this, null); } - + public Object visit(HasMemberTypePattern node, Object data) { hasMemberTypePattern = true; return null; } - + public boolean hasMemberTypePattern() { return hasMemberTypePattern; } } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java index 66c395dd7..14603365c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2011 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: * Andy Clement Initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -37,7 +37,7 @@ import org.aspectj.weaver.ResolvedType; * they might match so just say 'true''. Note that returning true is just confirming whether the 'mightHaveAspect' interface (and * friends) are getting added. * </p> - * + * * @author Andy Clement */ public class HasMemberTypePatternForPerThisMatching extends HasMemberTypePattern { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java index 0b2b9b5fc..84c00033d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.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.weaver.patterns; @@ -21,7 +21,7 @@ public class HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatte extends AbstractPatternNodeVisitor { boolean ohYesItHas = false; - + /** * Is the Exact type parameterized? * Generic is ok as that just means we resolved a simple type pattern to a generic type @@ -43,7 +43,7 @@ public class HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatte if (node.getTypeParameters().size() != 0) ohYesItHas = true; return data; } - + public boolean wellHasItThen/*?*/() { return ohYesItHas; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IScope.java index 69ba19686..3acc194f9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IScope.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IScope.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java index 824bc602f..ad775d9ed 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java @@ -2,9 +2,9 @@ * Copyright (c) 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: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java index 577c97b2c..fcf6c54dc 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java @@ -2,9 +2,9 @@ * Copyright (c) 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: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java index 4247f6714..a22073306 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement IBM initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java index 4e614824a..e1e747e35 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java @@ -2,9 +2,9 @@ * Copyright (c) 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: * PARC initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java index 67d24672b..317899970 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -179,7 +179,7 @@ public class KindedPointcut extends Pointcut { // final WildTypePattern pattern = (WildTypePattern) this.getSignature().getDeclaringType(); // final ResolvedType type = info.getType(); // return pattern.matches(type, TypePattern.STATIC); - } + } } } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ModifiersPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ModifiersPattern.java index 259edfab1..4ac47c14b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ModifiersPattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ModifiersPattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NameBindingPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NameBindingPointcut.java index 34b25e207..0254dfee2 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NameBindingPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NameBindingPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -22,7 +22,7 @@ import org.aspectj.weaver.ast.Var; /** * Common super type for Pointcuts that can bind formal parameters. - * + * * @author Erik Hilsdale * @author Jim Hugunin */ @@ -44,7 +44,7 @@ public abstract class NameBindingPointcut extends Pointcut { } return Test.makeInstanceof(var, myType.resolve(world)); } - + public abstract List<BindingTypePattern> getBindingTypePatterns(); public abstract List<BindingPattern> getBindingAnnotationTypePatterns(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NamePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NamePattern.java index 52331d13e..fc5955591 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NamePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NamePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -182,7 +182,7 @@ public class NamePattern extends PatternNode { /** * Method maybeGetSimpleName. - * + * * @return String */ public String maybeGetSimpleName() { @@ -194,7 +194,7 @@ public class NamePattern extends PatternNode { /** * Method isAny. - * + * * @return boolean */ public boolean isAny() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NoTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NoTypePattern.java index da34bdf0d..aac64a1d6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NoTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NoTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002, 2010 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -28,7 +28,7 @@ public class NoTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.TypePattern#couldEverMatchSameTypesAs(org.aspectj.weaver.patterns.TypePattern) */ @Override @@ -88,7 +88,7 @@ public class NoTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -98,7 +98,7 @@ public class NoTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ @Override diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java index 0317b85a5..665d35281 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -33,7 +33,7 @@ public class NotAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.AnnotationTypePattern#matches(org.aspectj.weaver.AnnotatedElement) */ public FuzzyBoolean matches(AnnotatedElement annotated) { @@ -46,7 +46,7 @@ public class NotAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.AnnotationTypePattern#resolve(org.aspectj.weaver.World) */ public void resolve(World world) { @@ -55,7 +55,7 @@ public class NotAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.AnnotationTypePattern#resolveBindings(org.aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings, boolean) */ @@ -76,7 +76,7 @@ public class NotAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.PatternNode#write(java.io.DataOutputStream) */ public void write(CompressingDataOutputStream s) throws IOException { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotPointcut.java index 85d2cdb7a..2179f8b61 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotSignaturePattern.java index b6140ece1..8373dcfb1 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotSignaturePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotSignaturePattern.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2010 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: + * 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 - SpringSource * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -24,7 +24,7 @@ import org.aspectj.weaver.World; /** * Represents the NOT of a signature pattern - * + * * @author Andy Clement * @since 1.6.9 */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java index 0f8f82c21..8bb04673a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -26,10 +26,10 @@ import org.aspectj.weaver.World; /** * !TypePattern - * + * * <p> * any binding to formals is explicitly forbidden for any composite, ! is just the most obviously wrong case. - * + * * @author Erik Hilsdale * @author Jim Hugunin */ @@ -144,7 +144,7 @@ public class NotTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -157,7 +157,7 @@ public class NotTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ @Override diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java index 3cfe1de8b..c00a1dcbe 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrPointcut.java index dde02f726..a07f98831 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrSignaturePattern.java index 13244f70e..3d3fb865d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrSignaturePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrSignaturePattern.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2010 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: + * 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 - SpringSource * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -25,7 +25,7 @@ import org.aspectj.weaver.World; /** * Represents the OR of two other signature patterns. - * + * * @author Andy Clement * @since 1.6.9 */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java index b31a4e9ad..27c565c3f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -25,10 +25,10 @@ import org.aspectj.weaver.World; /** * left || right - * + * * <p> * any binding to formals is explicitly forbidden for any composite by the language - * + * * @author Erik Hilsdale * @author Jim Hugunin */ @@ -52,7 +52,7 @@ public class OrTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.TypePattern#couldEverMatchSameTypesAs(org.aspectj.weaver.patterns.TypePattern) */ protected boolean couldEverMatchSameTypesAs(TypePattern other) { @@ -123,7 +123,7 @@ public class OrTypePattern extends TypePattern { right = right.resolveBindings(scope, bindings, false, false); return this; } - + public TypePattern parameterizeWith(Map<String,UnresolvedType> typeVariableMap, World w) { TypePattern newLeft = left.parameterizeWith(typeVariableMap, w); TypePattern newRight = right.parameterizeWith(typeVariableMap, w); @@ -156,7 +156,7 @@ public class OrTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#equals(java.lang.Object) */ public boolean equals(Object obj) { @@ -169,7 +169,7 @@ public class OrTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ public int hashCode() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ParserException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ParserException.java index 036061f15..c03c0c7b0 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ParserException.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ParserException.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -15,12 +15,12 @@ import org.aspectj.weaver.IHasPosition; public class ParserException extends RuntimeException { private IHasPosition token; - + public ParserException(String message, IHasPosition token) { super(message); this.token = token; } - + public IHasPosition getLocation() { return token; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNode.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNode.java index 8a7aae097..913bde00c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNode.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNode.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNodeVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNodeVisitor.java index 98abec146..a595eaa1f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNodeVisitor.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNodeVisitor.java @@ -1,11 +1,11 @@ /******************************************************************************* * 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 - * + * 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: * Alexandre Vasseur initial implementation * Adrian Colyer refactoring for traversal and grouping by kind @@ -31,8 +31,8 @@ public interface PatternNodeVisitor { Object visit(WildAnnotationTypePattern node, Object data); Object visit(AnnotationPatternList node, Object data); - // Regular type patterns - Object visit(AndTypePattern node, Object data); + // Regular type patterns + Object visit(AndTypePattern node, Object data); Object visit(AnyTypePattern node, Object data); Object visit(AnyWithAnnotationTypePattern node, Object data); Object visit(EllipsisTypePattern node, Object data); @@ -44,7 +44,7 @@ public interface PatternNodeVisitor { Object visit(WildTypePattern node, Object data); Object visit(TypePatternList node, Object data); Object visit(HasMemberTypePattern node, Object data); - Object visit(TypeCategoryTypePattern node, Object data); + Object visit(TypeCategoryTypePattern node, Object data); // Pointcuts Object visit(AndPointcut node, Object data); @@ -74,7 +74,7 @@ public interface PatternNodeVisitor { Object visit(PerSingleton node, Object data); Object visit(PerTypeWithin node, Object data); - + // Declares Object visit(DeclareAnnotation node, Object data); Object visit(DeclareErrorOrWarning node, Object data); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java index 7bb806b39..e355f4a91 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2002,2010 - * 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: + * 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: * PARC initial implementation * Adrian Colyer, IBM * Andy Clement, IBM, SpringSource @@ -97,7 +97,7 @@ public class PatternParser { eat(")"); return new PerCflow(entry, isBelow); } - + public boolean moreToParse() { return tokenSource.hasMoreTokens(); } @@ -302,7 +302,7 @@ public class PatternParser { /** * Attempt to parse a pointcut, if that fails then try again for a type pattern. - * + * * @param isError true if it is declare error rather than declare warning * @return the new declare */ @@ -334,7 +334,7 @@ public class PatternParser { String message = parsePossibleStringSequence(true); return new DeclareErrorOrWarning(isError, pointcut, message); } - + public Pointcut parsePointcut(boolean shouldConsumeAllInput) { Pointcut p = parsePointcut(); if (shouldConsumeAllInput && tokenSource.hasMoreTokens()) { @@ -357,7 +357,7 @@ public class PatternParser { return p; } - + private Pointcut parseNotOrPointcut() { Pointcut p = parseAtomicPointcut(); if (maybeEat("&&")) { @@ -559,7 +559,7 @@ public class PatternParser { /** * Method parseWithinPointcut. - * + * * @return Pointcut */ private Pointcut parseWithinPointcut() { @@ -572,7 +572,7 @@ public class PatternParser { /** * Method parseThisOrTargetPointcut. - * + * * @return Pointcut */ private Pointcut parseThisOrTargetPointcut(String kind) { @@ -617,7 +617,7 @@ public class PatternParser { /** * Method parseArgsPointcut. - * + * * @return Pointcut */ private Pointcut parseArgsPointcut() { @@ -1052,7 +1052,7 @@ public class PatternParser { * Attempt to parse a typeIs(<category>) construct. If it cannot be parsed we just return null and that should cause the caller * to reset their position and attempt to consume it in another way. This means we won't have problems here: execution(* * typeIs(..)) because someone has decided to call a method the same as our construct. - * + * * @return a TypeIsTypePattern or null if could not be parsed */ public TypePattern parseIsTypePattern() { @@ -1686,7 +1686,7 @@ public class PatternParser { /** * Parse type variable declarations for a generic method or at the start of a signature pointcut to identify type variable names * in a generic type. - * + * * @return */ public TypeVariablePatternList maybeParseTypeVariableList() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerCflow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerCflow.java index 31975df77..ac52cec74 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerCflow.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerCflow.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerClause.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerClause.java index 62b2b1b85..aa073b9a8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerClause.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerClause.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -29,7 +29,7 @@ public abstract class PerClause extends Pointcut { else if (kind == PEROBJECT) return PerObject.readPerClause(s, context); else if (kind == FROMSUPER) return PerFromSuper.readPerClause(s, context); else if (kind == PERTYPEWITHIN) return PerTypeWithin.readPerClause(s,context); - + throw new BCException("unknown kind: " + kind); } @@ -38,14 +38,14 @@ public abstract class PerClause extends Pointcut { } public abstract PerClause concretize(ResolvedType inAspect); - + public abstract PerClause.Kind getKind(); - + public abstract String toDeclarationString(); - + public static class Kind extends TypeSafeEnum { public Kind(String name, int key) { super(name, key); } - + public static Kind read(VersionedDataInputStream s) throws IOException { int key = s.readByte(); switch(key) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerFromSuper.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerFromSuper.java index 9875291f3..2630d072c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerFromSuper.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerFromSuper.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerObject.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerObject.java index 237a64a8e..1a4600b73 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerObject.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerObject.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerSingleton.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerSingleton.java index f53c3a4a5..d265f6a95 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerSingleton.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerSingleton.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java index 100754a77..4df450cad 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java @@ -1,11 +1,11 @@ /******************************************************************************* * 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 - * + * 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: * Alexandre Vasseur initial implementation *******************************************************************************/ @@ -20,7 +20,7 @@ import org.aspectj.weaver.Shadow; * A visitor that turns a pointcut into a type pattern equivalent for a perthis or pertarget matching: - pertarget(target(Foo)) → * Foo+ (this one is a special case..) - pertarget(execution(* Foo.do()) → Foo - perthis(call(* Foo.do()) → * - perthis(!call(* * Foo.do()) → * (see how the ! has been absorbed here..) - * + * * @author Alexandre Vasseur (alex AT gnilux DOT com) */ public class PerThisOrTargetPointcutVisitor extends AbstractPatternNodeVisitor { @@ -225,7 +225,7 @@ public class PerThisOrTargetPointcutVisitor extends AbstractPatternNodeVisitor { /** * A MayBe type pattern that acts as ANY except that !MAYBE = MAYBE - * + * * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a> */ private static class TypePatternMayBe extends AnyTypePattern { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerTypeWithin.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerTypeWithin.java index d912b52ed..abe323ddb 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerTypeWithin.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerTypeWithin.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005 IBM - * 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.weaver.patterns; @@ -140,7 +140,7 @@ public class PerTypeWithin extends PerClause { // return // Test.makeCall(AjcMemberMaker.perTypeWithinHasAspectMethod(inAspect), // new Expr[] { getVar(shadow) }); - // + // return match(shadow).alwaysTrue() ? Literal.TRUE : Literal.FALSE; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Pointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Pointcut.java index 567488c66..a7fa5c3cf 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Pointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Pointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -36,37 +36,37 @@ import org.aspectj.weaver.ast.Test; /** * The lifecycle of Pointcuts is modeled by Pointcut.State. It has three things: - * + * * <p> * Creation -- SYMBOLIC -- then resolve(IScope) -- RESOLVED -- concretize(...) -- CONCRETE - * + * * @author Erik Hilsdale * @author Jim Hugunin - * + * * A day in the life of a pointcut.... - AMC. ========================================== - * + * * Pointcuts are created by the PatternParser, which is called by ajdt to parse a pointcut from the PseudoTokens AST node * (which in turn are part of a PointcutDesignator AST node). - * + * * Pointcuts are resolved by ajdt when an AdviceDeclaration or a PointcutDeclaration has its statements resolved. This * happens as part of completeTypeBindings in the AjLookupEnvironment which is called after the diet parse phase of the * compiler. Named pointcuts, and references to named pointcuts are instances of ReferencePointcut. - * + * * At the end of the compilation process, the pointcuts are serialized (write method) into attributes in the class file. - * + * * When the weaver loads the class files, it unpacks the attributes and deserializes the pointcuts (read). All aspects are * added to the world, by calling addOrReplaceAspect on the crosscutting members set of the world. When aspects are added or * replaced, the crosscutting members in the aspect are extracted as ShadowMungers (each holding a pointcut). The * ShadowMungers are concretized, which concretizes the pointcuts. At this stage ReferencePointcuts are replaced by their * declared content. - * + * * During weaving, the weaver processes type by type. It first culls potentially matching ShadowMungers by calling the * fastMatch method on their pointcuts. Only those that might match make it through to the next phase. At the next phase, * all of the shadows within the type are created and passed to the pointcut for matching (match). - * + * * When the actual munging happens, matched pointcuts are asked for their residue (findResidue) - the runtime test if any. * Because of negation, findResidue may be called on pointcuts that could never match the shadow. - * + * */ public abstract class Pointcut extends PatternNode { public static final class State extends TypeSafeEnum { @@ -242,10 +242,10 @@ public abstract class Pointcut extends PatternNode { /** * Resolves and removes ReferencePointcuts, replacing with basic ones - * + * * @param inAspect the aspect to resolve relative to * @param bindings a Map from formal index in the current lexical context → formal index in the concrete advice that will run - * + * * This must always return a new Pointcut object (even if the concretized Pointcut is identical to the resolved one). * That behavior is assumed in many places. XXX fix implementors to handle state */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java index 60f3989ea..3552f470d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -38,9 +38,9 @@ public class PointcutEvaluationExpenseComparator implements Comparator<Pointcut> /** * Compare 2 pointcuts based on an estimate of how expensive they may be to evaluate. - * + * * within - * + * * {@literal @}within staticinitialization [make sure this has a fast match method] adviceexecution handler get, set withincode * {@literal @}withincode execution, initialization, preinitialization call * {@literal @}annotation this, target @@ -90,7 +90,7 @@ public class PointcutEvaluationExpenseComparator implements Comparator<Pointcut> if (declaringTypePattern instanceof AnyTypePattern) { return CALL_WITHOUT_DECLARING_TYPE; } else { - return CALL_WITH_DECLARING_TYPE; + return CALL_WITH_DECLARING_TYPE; } } else if ((kind == Shadow.ConstructorExecution) || (kind == Shadow.MethodExecution) || (kind == Shadow.Initialization) || (kind == Shadow.PreInitialization)) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutRewriter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutRewriter.java index c0fed9aee..4e2085c76 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutRewriter.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutRewriter.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -19,7 +19,7 @@ import org.aspectj.weaver.patterns.Pointcut.MatchesNothingPointcut; /** * Performs term rewriting for pointcut expressions. - * + * * @author colyer * @author clement */ @@ -437,4 +437,4 @@ public class PointcutRewriter { return (pc instanceof OrPointcut); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java index 6a234d04c..404057756 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java index 537fb2c22..dd182f3df 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ScopeWithTypeVariables.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.weaver.patterns; @@ -30,13 +30,13 @@ public class ScopeWithTypeVariables implements IScope { private IScope delegateScope; private String[] typeVariableNames; private UnresolvedTypeVariableReferenceType[] typeVarTypeXs; - + public ScopeWithTypeVariables(String[] typeVarNames, IScope delegate) { this.delegateScope = delegate; this.typeVariableNames = typeVarNames; this.typeVarTypeXs = new UnresolvedTypeVariableReferenceType[typeVarNames.length]; } - + /* (non-Javadoc) * @see org.aspectj.weaver.patterns.IScope#lookupType(java.lang.String, org.aspectj.weaver.IHasPosition) */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java index d5203bc86..323308d79 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -386,7 +386,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { // if (subjectMatch && !matchesAnnotations(aMember, inAWorld).alwaysTrue()) { // return FuzzyBoolean.NO; // } else { - // + // // return matchesIgnoringAnnotations; // } @@ -428,7 +428,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { /** * Quickly detect if the joinpoint absolutely cannot match becaused the method parameters at the joinpoint cannot match against * this signature pattern. - * + * * @param methodJoinpoint the joinpoint to quickly match against * @return true if it is impossible for the joinpoint to match this signature */ @@ -557,7 +557,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { /** * Determine if any pattern in the parameter type pattern list is attempting to match on parameter annotations. - * + * * @return true if a parameter type pattern wants to match on a parameter annotation */ private boolean isMatchingParameterAnnotations() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SimpleScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SimpleScope.java index 1dfe1f6ec..f20c4d634 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SimpleScope.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SimpleScope.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java index 17b511f71..9e3fe33f8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -34,7 +34,7 @@ import org.aspectj.weaver.ast.Var; /** * @author colyer - * + * * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code * Templates */ @@ -65,7 +65,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { } /** - * + * */ public ThisOrTargetAnnotationPointcut(boolean isThis, ExactAnnotationTypePattern type) { super(); @@ -103,7 +103,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#fastMatch(org.aspectj.weaver.patterns.FastMatchInfo) */ @Override @@ -113,7 +113,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#match(org.aspectj.weaver.Shadow) */ @Override @@ -137,7 +137,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#resolveBindings(org.aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings) */ @@ -173,7 +173,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#concretize1(org.aspectj.weaver.ResolvedType, org.aspectj.weaver.IntMap) */ @Override @@ -198,7 +198,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#findResidue(org.aspectj.weaver.Shadow, org.aspectj.weaver.patterns.ExposedState) */ /** @@ -242,7 +242,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.NameBindingPointcut#getBindingAnnotationTypePatterns() */ @Override @@ -258,7 +258,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.NameBindingPointcut#getBindingTypePatterns() */ @Override @@ -268,7 +268,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.PatternNode#write(java.io.DataOutputStream) */ @Override @@ -289,7 +289,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -303,7 +303,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ @Override @@ -313,7 +313,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#toString() */ private void buildDeclarationText() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java index b4950975f..7008ffd73 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -36,11 +36,11 @@ import org.aspectj.weaver.ast.Var; /** * Corresponds to target or this pcd. - * + * * <p> * type is initially a WildTypePattern. If it stays that way, it's a this(Foo) type deal. however, the resolveBindings method may * convert it to a BindingTypePattern, in which case, it's a this(foo) type deal. - * + * * @author Erik Hilsdale * @author Jim Hugunin */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThrowsPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThrowsPattern.java index 93557d8c1..7b276516d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThrowsPattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThrowsPattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java index 80ffc7556..df8345e96 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2010 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 - * + * 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 * Nieraj Singh @@ -28,7 +28,7 @@ import org.aspectj.weaver.World; /** * A TypeCategoryTypePattern matches on the category of a type, one of class/interface/aspect/inner/anonymous/enum/annotation, and * these are specified in the pointcut via isClass() isInterface() isAspect() isInner() isAnonymous() isEnum() isAnnotation(). - * + * * @author Andy Clement * @since 1.6.9 */ @@ -52,7 +52,7 @@ public class TypeCategoryTypePattern extends TypePattern { super(false); this.category = category; } - + public int getTypeCategory() { return category; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePattern.java index 2d657dee2..d525ce6d2 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002, 2010 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: - * 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: + * PARC initial implementation * Nieraj Singh * ******************************************************************/ @@ -31,10 +31,10 @@ import org.aspectj.weaver.World; /** * On creation, type pattern only contains WildTypePattern nodes, not BindingType or ExactType. - * + * * <p> * Then we call resolveBindings() during compilation During concretization of enclosing pointcuts, we call remapAdviceFormals - * + * * @author Erik Hilsdale * @author Jim Hugunin */ @@ -231,7 +231,7 @@ public abstract class TypePattern extends PatternNode { // public boolean assertExactType(IMessageHandler m) { // if (this instanceof ExactTypePattern) return true; - // + // // //XXX should try harder to avoid multiple errors for one problem // m.handleMessage(MessageUtil.error("exact type pattern required", getSourceLocation())); // return false; @@ -270,15 +270,15 @@ public abstract class TypePattern extends PatternNode { * This is called during concretization of pointcuts, it is used by BindingTypePattern to return a new BindingTypePattern with a * formal index appropiate for the advice, rather than for the lexical declaration, i.e. this handles transforamtions through * named pointcuts. - * + * * <pre> * pointcut foo(String name): args(name); * --> This makes a BindingTypePattern(0) pointing to the 0th formal - * + * * before(Foo f, String n): this(f) && foo(n) { ... } * --> when resolveReferences is called on the args from the above, it * will return a BindingTypePattern(1) - * + * * before(Foo f): this(f) && foo(*) { ... } * --> when resolveReferences is called on the args from the above, it * will return an ExactTypePattern(String) diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java index fdbc40d12..1650514b0 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -107,10 +107,10 @@ public class TypePatternList extends PatternNode { // XXX shares much code with WildTypePattern and with NamePattern /** * When called with TypePattern.STATIC this will always return either FuzzyBoolean.YES or FuzzyBoolean.NO. - * + * * When called with TypePattern.DYNAMIC this could return MAYBE if at runtime it would be possible for arguments of the given * static types to dynamically match this, but it is not known for certain. - * + * * This method will never return FuzzyBoolean.NEVER */ public FuzzyBoolean matches(ResolvedType[] types, TypePattern.MatchKind kind, ResolvedType[][] parameterAnnotations) { @@ -420,7 +420,7 @@ public class TypePatternList extends PatternNode { /** * Return a version of this type pattern list in which all type variable references are replaced by their corresponding entry in * the map - * + * * @param typeVariableMap * @return */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java index b2d466565..be6d01a3b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -22,7 +22,7 @@ import org.aspectj.weaver.ResolvedType; public class TypePatternQuestions { private Map<Question,FuzzyBoolean> questionsAndAnswers = new HashMap<>(); - + public FuzzyBoolean askQuestion(TypePattern pattern, ResolvedType type, TypePattern.MatchKind kind) { @@ -34,7 +34,7 @@ public class TypePatternQuestions { questionsAndAnswers.put(question, answer); return answer; } - + public Question anyChanges() { for (Map.Entry<Question, FuzzyBoolean> entry : questionsAndAnswers.entrySet()) { Question question = (Question) entry.getKey(); @@ -46,10 +46,10 @@ public class TypePatternQuestions { return question; } } - + return null; } - + public String toString() { StringBuffer buf = new StringBuffer(); buf.append("TypePatternQuestions{"); @@ -64,13 +64,13 @@ public class TypePatternQuestions { buf.append("}"); return buf.toString(); } - - + + public class Question { TypePattern pattern; ResolvedType type; TypePattern.MatchKind kind; - + public Question(TypePattern pattern, ResolvedType type, TypePattern.MatchKind kind) { super(); @@ -78,25 +78,25 @@ public class TypePatternQuestions { this.type = type; this.kind = kind; } - + public FuzzyBoolean ask() { return pattern.matches(type, kind); } - + public boolean equals(Object other) { if (!(other instanceof Question)) return false; Question o = (Question)other; return o.pattern.equals(pattern) && o.type.equals(type) && o.kind == kind; } - + public int hashCode() { int result = 17; result = 37*result + kind.hashCode(); result = 37*result + pattern.hashCode(); result = 37*result + type.hashCode(); return result; - } - + } + public String toString() { return "?(" + pattern + ", " + type + ", " + kind + ")"; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java index 57377abb5..18b13172d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.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.weaver.patterns; @@ -52,7 +52,7 @@ public class TypeVariablePattern extends PatternNode { /** * Create a named type variable with the given upper bound and no lower bounds Use this constructor for the T extends Foo case - * + * * @param variableName * @param upperBound */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePatternList.java index 85dca44b4..d3402c4ed 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePatternList.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePatternList.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.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java index 11b385984..b7e56f613 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -59,7 +59,7 @@ public class WildAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.AnnotationTypePattern#matches(org.aspectj.weaver.AnnotatedElement) */ @Override @@ -69,7 +69,7 @@ public class WildAnnotationTypePattern extends AnnotationTypePattern { /** * Resolve any annotation values specified, checking they are all well formed (valid names, valid values) - * + * * @param annotationType the annotation type for which the values have been specified * @param scope the scope within which to resolve type references (eg. Color.GREEN) */ @@ -286,7 +286,7 @@ public class WildAnnotationTypePattern extends AnnotationTypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.AnnotationTypePattern#resolve(org.aspectj.weaver.World) */ @Override diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildChildFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildChildFinder.java index 500d281e2..75bdf93bb 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildChildFinder.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildChildFinder.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2019 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 - * + * 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.weaver.patterns; @@ -19,7 +19,7 @@ public class WildChildFinder extends AbstractPatternNodeVisitor { public WildChildFinder() { super(); } - + public boolean containedWildChild() { return wildChild; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java index e6ab455d2..43a59df10 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -45,32 +45,32 @@ import org.aspectj.weaver.World; * The PatternParser always creates WildTypePatterns for type patterns in pointcut expressions (apart from *, which is sometimes * directly turned into TypePattern.ANY). resolveBindings() tries to work out what we've really got and turn it into a type pattern * that we can use for matching. This will normally be either an ExactTypePattern or a WildTypePattern. - * + * * Here's how the process pans out for various generic and parameterized patterns: (see GenericsWildTypePatternResolvingTestCase) - * + * * Foo where Foo exists and is generic Parser creates WildTypePattern namePatterns={Foo} resolveBindings resolves Foo to RT(Foo - * raw) return ExactTypePattern(LFoo;) - * + * * Foo<String> where Foo exists and String meets the bounds Parser creates WildTypePattern namePatterns = {Foo}, * typeParameters=WTP{String} resolveBindings resolves typeParameters to ExactTypePattern(String) resolves Foo to RT(Foo) returns * ExactTypePattern(PFoo<String>; - parameterized) - * + * * Foo<Str*> where Foo exists and takes one bound Parser creates WildTypePattern namePatterns = {Foo}, typeParameters=WTP{Str*} * resolveBindings resolves typeParameters to WTP{Str*} resolves Foo to RT(Foo) returns WildTypePattern(name = Foo, typeParameters = * WTP{Str*} isGeneric=false) - * + * * Fo*<String> Parser creates WildTypePattern namePatterns = {Fo*}, typeParameters=WTP{String} resolveBindings resolves * typeParameters to ETP{String} returns WildTypePattern(name = Fo*, typeParameters = ETP{String} isGeneric=false) - * - * + * + * * Foo<?> - * + * * Foo<? extends Number> - * + * * Foo<? extends Number+> - * + * * Foo<? super Number> - * + * */ public class WildTypePattern extends TypePattern { private static final String GENERIC_WILDCARD_CHARACTER = "?"; // signature of ? is * @@ -166,7 +166,7 @@ public class WildTypePattern extends TypePattern { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.TypePattern#couldEverMatchSameTypesAs(org.aspectj.weaver.patterns.TypePattern) */ @Override @@ -534,7 +534,7 @@ public class WildTypePattern extends TypePattern { /** * Method maybeExtractName. - * + * * @param string * @return boolean */ @@ -551,7 +551,7 @@ public class WildTypePattern extends TypePattern { /** * If this type pattern has no '.' or '*' in it, then return a simple string - * + * * otherwise, this will return null; */ public String maybeGetSimpleName() { @@ -625,9 +625,9 @@ public class WildTypePattern extends TypePattern { /** * Need to determine if I'm really a pattern or a reference to a formal - * + * * We may wish to further optimize the case of pattern vs. non-pattern - * + * * We will be replaced by what we return */ @Override @@ -924,7 +924,7 @@ public class WildTypePattern extends TypePattern { * We resolved the type to a type variable declared in the pointcut designator. Now we have to create either an exact type * pattern or a wild type pattern for it, with upper and lower bounds set accordingly. XXX none of this stuff gets serialized * yet - * + * * @param scope * @param tvrType * @return @@ -994,7 +994,7 @@ public class WildTypePattern extends TypePattern { * parameters. Time to perform some basic checks: - can the base type be parameterized? (is it generic) - can the type parameter * pattern list match the number of parameters on the base type - do all parameter patterns meet the bounds of the respective * type variables If any of these checks fail, a warning message is issued and we return false. - * + * * @return */ private boolean verifyTypeParameters(ResolvedType baseType, IScope scope, boolean requireExactType) { @@ -1117,7 +1117,7 @@ public class WildTypePattern extends TypePattern { // if (ut.isTypeVariableReference()) { // continueCheck = false; // } - // + // // if (continueCheck && // !tvs[i].canBeBoundTo(ut.resolve(scope.getWorld()))) { // // issue message that type parameter does not meet specification diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java index 777191f88..b1a93a21f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -35,7 +35,7 @@ import org.aspectj.weaver.ast.Var; /** * @author colyer - * + * * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code * Templates */ @@ -45,7 +45,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { private String declarationText; /** - * + * */ public WithinAnnotationPointcut(AnnotationTypePattern type) { super(); @@ -77,7 +77,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#fastMatch(org.aspectj.weaver.patterns.FastMatchInfo) */ @Override @@ -87,7 +87,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#match(org.aspectj.weaver.Shadow) */ @Override @@ -109,7 +109,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#resolveBindings(org.aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings) */ @@ -126,7 +126,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#concretize1(org.aspectj.weaver.ResolvedType, org.aspectj.weaver.IntMap) */ @Override @@ -139,7 +139,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#findResidue(org.aspectj.weaver.Shadow, org.aspectj.weaver.patterns.ExposedState) */ @Override @@ -193,7 +193,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -207,7 +207,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#hashCode() */ @Override @@ -217,7 +217,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see java.lang.Object#toString() */ private void buildDeclarationText() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java index 69cc9b7ac..af65c8165 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -37,7 +37,7 @@ import org.aspectj.weaver.ast.Var; /** * @author colyer - * + * * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code * Templates */ @@ -86,7 +86,7 @@ public class WithinCodeAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#fastMatch(org.aspectj.weaver.patterns.FastMatchInfo) */ public FuzzyBoolean fastMatch(FastMatchInfo info) { @@ -95,7 +95,7 @@ public class WithinCodeAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#match(org.aspectj.weaver.Shadow) */ protected FuzzyBoolean matchInternal(Shadow shadow) { @@ -116,7 +116,7 @@ public class WithinCodeAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#resolveBindings(org.aspectj.weaver.patterns.IScope, * org.aspectj.weaver.patterns.Bindings) */ @@ -132,7 +132,7 @@ public class WithinCodeAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#concretize1(org.aspectj.weaver.ResolvedType, org.aspectj.weaver.IntMap) */ protected Pointcut concretize1(ResolvedType inAspect, ResolvedType declaringType, IntMap bindings) { @@ -144,7 +144,7 @@ public class WithinCodeAnnotationPointcut extends NameBindingPointcut { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.patterns.Pointcut#findResidue(org.aspectj.weaver.Shadow, org.aspectj.weaver.patterns.ExposedState) */ protected Test findResidueInternal(Shadow shadow, ExposedState state) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinPointcut.java index e5461b67e..4d4373e6d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinPointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java index bb4a1e72c..edf77f4c6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java index 040d73d49..35ee598c1 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.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://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * ******************************************************************/ package org.aspectj.weaver.reflect; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java index fce972348..5a49ed7e6 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.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.weaver.reflect; @@ -14,18 +14,18 @@ package org.aspectj.weaver.reflect; import org.aspectj.weaver.UnresolvedType; /** - * This interface exists to support two different strategies for answering + * This interface exists to support two different strategies for answering * generic signature related questions on Java 5 and pre-Java 5. */ public interface GenericSignatureInformationProvider { UnresolvedType[] getGenericParameterTypes(ReflectionBasedResolvedMemberImpl resolvedMember); - + UnresolvedType getGenericReturnType(ReflectionBasedResolvedMemberImpl resolvedMember); boolean isBridge(ReflectionBasedResolvedMemberImpl resolvedMember); - + boolean isVarArgs(ReflectionBasedResolvedMemberImpl resolvedMember); - + boolean isSynthetic(ReflectionBasedResolvedMemberImpl resolvedMember); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java index e835c4664..e534ec9d3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Ron Bodkin initial implementation diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java index 91b32ff0e..679900926 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.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.weaver.reflect; @@ -34,14 +34,14 @@ public class Java14GenericSignatureInformationProvider implements ReflectionBasedResolvedMemberImpl resolvedMember) { return resolvedMember.getReturnType(); } - + /* (non-Javadoc) * @see org.aspectj.weaver.reflect.GenericSignatureInformationProvider#isBridge() */ public boolean isBridge(ReflectionBasedResolvedMemberImpl resolvedMember) { return false; } - + /* (non-Javadoc) * @see org.aspectj.weaver.reflect.GenericSignatureInformationProvider#isVarArgs() @@ -49,7 +49,7 @@ public class Java14GenericSignatureInformationProvider implements public boolean isVarArgs(ReflectionBasedResolvedMemberImpl resolvedMember) { return false; } - + /* (non-Javadoc) * @see org.aspectj.weaver.reflect.GenericSignatureInformationProvider#isSynthetic() */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/JoinPointMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/JoinPointMatchImpl.java index 69a5f4577..18a7f1ff9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/JoinPointMatchImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/JoinPointMatchImpl.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.weaver.reflect; @@ -22,20 +22,20 @@ public class JoinPointMatchImpl implements JoinPointMatch { public final static JoinPointMatch NO_MATCH = new JoinPointMatchImpl(); private final static PointcutParameter[] NO_BINDINGS = new PointcutParameter[0]; - + private boolean match; private PointcutParameter[] bindings; - + public JoinPointMatchImpl(PointcutParameter[] bindings) { this.match = true; this.bindings = bindings; } - + private JoinPointMatchImpl() { this.match = false; this.bindings = NO_BINDINGS; } - + /* (non-Javadoc) * @see org.aspectj.weaver.tools.JoinPointMatch#matches() */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/PointcutParameterImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/PointcutParameterImpl.java index 722d64839..ba93e142d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/PointcutParameterImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/PointcutParameterImpl.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.weaver.reflect; @@ -18,12 +18,12 @@ public class PointcutParameterImpl implements PointcutParameter { String name; Class type; Object binding; - + public PointcutParameterImpl(String name, Class type) { this.name = name; this.type = type; } - + public String getName() { return name; } @@ -35,9 +35,9 @@ public class PointcutParameterImpl implements PointcutParameter { public Object getBinding() { return binding; } - + void setBinding(Object boundValue) { this.binding = boundValue; } - -}
\ No newline at end of file + +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java index 2aa83c957..39f989a69 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.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.weaver.reflect; @@ -74,7 +74,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega public Class<?> getClazz() { return this.myClass; } - + protected Class getBaseClass() { return this.myClass; } @@ -95,7 +95,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#isAnnotationStyleAspect() */ public boolean isAnnotationStyleAspect() { @@ -115,7 +115,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#isAnnotationWithRuntimeRetention () */ public boolean isAnnotationWithRuntimeRetention() { @@ -147,7 +147,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#isGeneric() */ public boolean isGeneric() { @@ -173,7 +173,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#isExposedToWeaver() */ public boolean isExposedToWeaver() { @@ -183,7 +183,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#hasAnnotation(org.aspectj.weaver .UnresolvedType) */ public boolean hasAnnotation(UnresolvedType ofType) { @@ -193,21 +193,21 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getAnnotations() */ public AnnotationAJ[] getAnnotations() { // no annotations in Java 1.4 return AnnotationAJ.EMPTY_ARRAY; } - + public boolean hasAnnotations() { return false; } /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getAnnotationTypes() */ public ResolvedType[] getAnnotationTypes() { @@ -217,7 +217,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getDeclaredFields() */ public ResolvedMember[] getDeclaredFields() { @@ -234,7 +234,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getDeclaredInterfaces() */ public ResolvedType[] getDeclaredInterfaces() { @@ -255,7 +255,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getDeclaredMethods() */ public ResolvedMember[] getDeclaredMethods() { @@ -277,7 +277,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getDeclaredPointcuts() */ public ResolvedMember[] getDeclaredPointcuts() { @@ -286,7 +286,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getTypeVariables() */ public TypeVariable[] getTypeVariables() { @@ -296,7 +296,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getPerClause() */ public PerClause getPerClause() { @@ -314,7 +314,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getPrivilegedAccesses() */ public Collection getPrivilegedAccesses() { @@ -324,7 +324,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getModifiers() */ public int getModifiers() { @@ -333,7 +333,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getSuperclass() */ public ResolvedType getSuperclass() { @@ -348,7 +348,7 @@ public class ReflectionBasedReferenceTypeDelegate implements ReferenceTypeDelega /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ReferenceTypeDelegate#getWeaverState() */ public WeaverStateInfo getWeaverState() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java index a56950261..8da8151cf 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.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.weaver.reflect; @@ -44,7 +44,7 @@ public class ReflectionBasedReferenceTypeDelegateFactory { return null; } } - + public static ReflectionBasedReferenceTypeDelegate createDelegate(ReferenceType forReferenceType, World inWorld, Class<?> clazz) { ReflectionBasedReferenceTypeDelegate rbrtd = create15Delegate(forReferenceType, clazz, clazz.getClassLoader(), inWorld); @@ -119,7 +119,7 @@ public class ReflectionBasedReferenceTypeDelegateFactory { /** * convert a java.lang.reflect.Member into a resolved member in the world - * + * * @param reflectMember * @param inWorld * @return diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java index ba8f1330e..832a2d7df 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java @@ -1,11 +1,11 @@ /* ******************************************************************* * Copyright (c) 2005, 2017 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.weaver.reflect; @@ -20,7 +20,7 @@ import org.aspectj.weaver.UnresolvedType; /** * Subtype of ResolvedMemberImpl used in reflection world. Knows how to get annotations from a java.lang.reflect.Member - * + * * @author Adrian Colyer * @author Andy Clement */ @@ -28,7 +28,7 @@ public class ReflectionBasedResolvedMemberImpl extends ResolvedMemberImpl { private AnnotationFinder annotationFinder = null; private GenericSignatureInformationProvider gsigInfoProvider = new Java14GenericSignatureInformationProvider(); - + /** * If true then only runtime visible annotations have been resolved via reflection. If class retention * annotations are also required (later) then the cache will have to be rebuilt using a more detailed diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java index eb891c3bf..a06e22dc3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java @@ -1,12 +1,12 @@ /* ******************************************************************* * 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 - * 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.weaver.reflect; @@ -19,7 +19,7 @@ import org.aspectj.weaver.tools.MatchingContext; /** * An implementation of FastMatchInfo that can also expose a MatchingContext. - * + * * @author Adrian Colyer * @since 1.5.1 */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionShadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionShadow.java index 0c6277e59..f92a51301 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionShadow.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionShadow.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.weaver.reflect; @@ -29,7 +29,7 @@ import org.aspectj.weaver.tools.MatchingContext; /** * @author colyer - * + * */ public class ReflectionShadow extends Shadow { @@ -175,7 +175,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getIWorld() */ public World getIWorld() { @@ -184,7 +184,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getThisVar() */ public Var getThisVar() { @@ -196,7 +196,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getTargetVar() */ public Var getTargetVar() { @@ -208,7 +208,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getEnclosingType() */ public UnresolvedType getEnclosingType() { @@ -217,7 +217,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getArgVar(int) */ public Var getArgVar(int i) { @@ -261,7 +261,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getWithinAnnotationVar(org.aspectj.weaver.UnresolvedType) */ public Var getWithinAnnotationVar(UnresolvedType forAnnotationType) { @@ -275,7 +275,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getWithinCodeAnnotationVar(org.aspectj.weaver.UnresolvedType) */ public Var getWithinCodeAnnotationVar(UnresolvedType forAnnotationType) { @@ -289,7 +289,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getThisAnnotationVar(org.aspectj.weaver.UnresolvedType) */ public Var getThisAnnotationVar(UnresolvedType forAnnotationType) { @@ -301,7 +301,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getTargetAnnotationVar(org.aspectj.weaver.UnresolvedType) */ public Var getTargetAnnotationVar(UnresolvedType forAnnotationType) { @@ -313,7 +313,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getArgAnnotationVar(int, org.aspectj.weaver.UnresolvedType) */ public Var getArgAnnotationVar(int i, UnresolvedType forAnnotationType) { @@ -333,7 +333,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getEnclosingCodeSignature() */ public Member getEnclosingCodeSignature() { @@ -353,7 +353,7 @@ public class ReflectionShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getSourceLocation() */ public ISourceLocation getSourceLocation() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionVar.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionVar.java index 59876a737..e403f5c3d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionVar.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionVar.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.weaver.reflect; @@ -30,9 +30,9 @@ public final class ReflectionVar extends Var { static final int AT_WITHIN_VAR = 6; static final int AT_WITHINCODE_VAR = 7; static final int AT_ANNOTATION_VAR = 8; - + private AnnotationFinder annotationFinder = null; - + // static { // try { // Class java15AnnotationFinder = Class.forName("org.aspectj.weaver.reflect.Java15AnnotationFinder"); @@ -46,54 +46,54 @@ public final class ReflectionVar extends Var { // throw new RuntimeException("AspectJ internal error",ex); // } // } - + private int argsIndex = 0; private int varType; - + public static ReflectionVar createThisVar(ResolvedType type,AnnotationFinder finder) { ReflectionVar ret = new ReflectionVar(type,finder); ret.varType = THIS_VAR; return ret; } - + public static ReflectionVar createTargetVar(ResolvedType type, AnnotationFinder finder) { ReflectionVar ret = new ReflectionVar(type,finder); ret.varType = TARGET_VAR; - return ret; + return ret; } - + public static ReflectionVar createArgsVar(ResolvedType type, int index, AnnotationFinder finder) { ReflectionVar ret = new ReflectionVar(type,finder); ret.varType = ARGS_VAR; ret.argsIndex = index; - return ret; + return ret; } - + public static ReflectionVar createThisAnnotationVar(ResolvedType type, AnnotationFinder finder) { ReflectionVar ret = new ReflectionVar(type,finder); ret.varType = AT_THIS_VAR; return ret; } - + public static ReflectionVar createTargetAnnotationVar(ResolvedType type, AnnotationFinder finder) { ReflectionVar ret = new ReflectionVar(type,finder); ret.varType = AT_TARGET_VAR; - return ret; + return ret; } - + public static ReflectionVar createArgsAnnotationVar(ResolvedType type, int index, AnnotationFinder finder) { ReflectionVar ret = new ReflectionVar(type,finder); ret.varType = AT_ARGS_VAR; ret.argsIndex = index; - return ret; + return ret; } - + public static ReflectionVar createWithinAnnotationVar(ResolvedType annType, AnnotationFinder finder) { ReflectionVar ret = new ReflectionVar(annType,finder); ret.varType = AT_WITHIN_VAR; return ret; } - + public static ReflectionVar createWithinCodeAnnotationVar(ResolvedType annType, AnnotationFinder finder) { ReflectionVar ret = new ReflectionVar(annType,finder); ret.varType = AT_WITHINCODE_VAR; @@ -110,8 +110,8 @@ public final class ReflectionVar extends Var { super(type); this.annotationFinder = finder; } - - + + public Object getBindingAtJoinPoint(Object thisObject, Object targetObject, Object[] args) { return getBindingAtJoinPoint(thisObject,targetObject,args,null,null,null); } @@ -124,8 +124,8 @@ public final class ReflectionVar extends Var { * @return */ public Object getBindingAtJoinPoint( - Object thisObject, - Object targetObject, + Object thisObject, + Object targetObject, Object[] args, Member subject, Member withinCode, @@ -162,7 +162,7 @@ public final class ReflectionVar extends Var { return annotationFinder.getAnnotationFromMember(getType(), subject); } else return null; } - + return null; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java index 464aba367..71a229388 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2005-2017 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.weaver.reflect; @@ -28,7 +28,7 @@ import org.aspectj.weaver.World; /** * A ReflectionWorld is used solely for purposes of type resolution based on the runtime classpath (java.lang.reflect). It does not * support weaving operations (creation of mungers etc..). - * + * * @author Adrian Colyer * @author Andy Clement */ @@ -40,15 +40,15 @@ public class ReflectionWorld extends World implements IReflectionWorld { private AnnotationFinder annotationFinder; private boolean mustUseOneFourDelegates = false; // for testing private Map<String,Class<?>> inProgressResolutionClasses = new HashMap<>(); - + public static ReflectionWorld getReflectionWorldFor(WeakClassLoaderReference classLoaderReference) { - + // Temporarily do as before. Although the cache makes things faster it needs a bit more thought because // if the world has pointcutdesignators registered then someone may inadvertently register additional // ones on reusing a world (when they would be expecting a clean world). We can't automatically // clear them because we don't know when they are finished with. return new ReflectionWorld(classLoaderReference); - + /* synchronized (rworlds) { // Tidyup any no longer relevant entries... @@ -71,13 +71,13 @@ public class ReflectionWorld extends World implements IReflectionWorld { } */ } - + public static void cleanUpWorlds() { synchronized (rworlds) { rworlds.clear(); } } - + private ReflectionWorld() { // super(); // this.setMessageHandler(new ExceptionBasedMessageHandler()); @@ -88,7 +88,7 @@ public class ReflectionWorld extends World implements IReflectionWorld { // makeAnnotationFinderIfAny(classLoaderReference.getClassLoader(), // this); } - + public ReflectionWorld(WeakClassLoaderReference classloaderRef) { this.setMessageHandler(new ExceptionBasedMessageHandler()); setBehaveInJava5Way(true); @@ -154,7 +154,7 @@ public class ReflectionWorld extends World implements IReflectionWorld { return world.resolve(className); } } - + /** * Resolve a type using the specified class. Normal resolution in a reflection * world uses Class.forName() via the classloader (attached to this world) @@ -162,17 +162,17 @@ public class ReflectionWorld extends World implements IReflectionWorld { * type delegate based on that. For some classes generated at runtime (e.g. * proxy or lambda representation) the forName() call will not work. In those * situations we should just use the clazz we have. - * + * * Should the whole thing switch from using forName() to using the clazz objects? * Possibly but that introduces a lot of change and we don't have a lot * of test coverage for this scenario (reflection world). What we are doing * right now is that this can optionally be used if the regular resolution * scheme did not work. - * + * * Although AspectJ is *not* multi threaded or re-entrant, Spring doesn't * always respect that. There might be an issue here if two attempts are * made to resolve the same thing at the same time via this method. - * + * * @param clazz the class to use as the delegate for the resolved type */ public ResolvedType resolveUsingClass(Class<?> clazz) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ShadowMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ShadowMatchImpl.java index 350a77ba9..a18f5c639 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ShadowMatchImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ShadowMatchImpl.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.weaver.reflect; @@ -93,7 +93,7 @@ public class ShadowMatchImpl implements ShadowMatch { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.ShadowMatch#setMatchingContext(org.aspectj.weaver.tools.MatchingContext) */ public void setMatchingContext(MatchingContext aMatchContext) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadow.java index c151b228e..59fcb9082 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadow.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadow.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.weaver.reflect; @@ -31,7 +31,7 @@ import org.aspectj.weaver.tools.MatchingContext; /** * @author colyer - * + * */ public class StandardShadow extends Shadow { @@ -204,7 +204,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getIWorld() */ public World getIWorld() { @@ -213,7 +213,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getThisVar() */ public Var getThisVar() { @@ -225,7 +225,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getTargetVar() */ public Var getTargetVar() { @@ -237,7 +237,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getEnclosingType() */ public UnresolvedType getEnclosingType() { @@ -246,7 +246,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getArgVar(int) */ public Var getArgVar(int i) { @@ -265,7 +265,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getThisJoinPointVar() */ public Var getThisJoinPointVar() { @@ -296,7 +296,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getWithinAnnotationVar(org.aspectj.weaver.UnresolvedType) */ public Var getWithinAnnotationVar(UnresolvedType forAnnotationType) { @@ -310,7 +310,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getWithinCodeAnnotationVar(org.aspectj.weaver.UnresolvedType) */ public Var getWithinCodeAnnotationVar(UnresolvedType forAnnotationType) { @@ -324,7 +324,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getThisAnnotationVar(org.aspectj.weaver.UnresolvedType) */ public Var getThisAnnotationVar(UnresolvedType forAnnotationType) { @@ -336,7 +336,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getTargetAnnotationVar(org.aspectj.weaver.UnresolvedType) */ public Var getTargetAnnotationVar(UnresolvedType forAnnotationType) { @@ -348,7 +348,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getArgAnnotationVar(int, org.aspectj.weaver.UnresolvedType) */ public Var getArgAnnotationVar(int i, UnresolvedType forAnnotationType) { @@ -368,7 +368,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getEnclosingCodeSignature() */ public Member getEnclosingCodeSignature() { @@ -388,7 +388,7 @@ public class StandardShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getSourceLocation() */ public ISourceLocation getSourceLocation() { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java index baeab0334..8f724e765 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadowMatchImpl.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.weaver.reflect; @@ -90,7 +90,7 @@ public class StandardShadowMatchImpl implements ShadowMatch { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.tools.ShadowMatch#setMatchingContext(org.aspectj.weaver.tools.MatchingContext) */ public void setMatchingContext(MatchingContext aMatchContext) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java index bca1985e7..a141b5b4c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTrace.java index 25562c050..caef68318 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTrace.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTrace.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: * Matthew Webster - initial implementation *******************************************************************************/ @@ -17,13 +17,13 @@ public class CommonsTrace extends AbstractTrace { private Log log; private String className; - + public CommonsTrace (Class clazz) { super(clazz); this.log = LogFactory.getLog(clazz); this.className = tracedClass.getName(); } - + public void enter(String methodName, Object thiz, Object[] args) { if (log.isDebugEnabled()) { log.debug(formatMessage(">", className, methodName, thiz, args)); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTraceFactory.java index 8f9f91e98..a239ea993 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTraceFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTraceFactory.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: * Matthew Webster - initial implementation *******************************************************************************/ @@ -15,7 +15,7 @@ import org.apache.commons.logging.LogFactory; public class CommonsTraceFactory extends TraceFactory { private LogFactory logFactory = LogFactory.getFactory(); - + public Trace getTrace(Class clazz) { return new CommonsTrace(clazz); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ContextBasedMatcher.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ContextBasedMatcher.java index fc247dc90..073f16cd7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ContextBasedMatcher.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ContextBasedMatcher.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.weaver.tools; @@ -18,7 +18,7 @@ package org.aspectj.weaver.tools; * matching method for matching based on context * information over and above that normally used * by AspectJ. - * + * * @see MatchingContext * */ @@ -30,7 +30,7 @@ public interface ContextBasedMatcher { * @deprecated use couldMatchJoinPointsInType(Class,MatchingContext) instead */ boolean couldMatchJoinPointsInType(Class aClass); - + /** * return true iff this matcher could ever match * a join point in the given type, may also use any @@ -38,7 +38,7 @@ public interface ContextBasedMatcher { * @since 1.5.1 */ boolean couldMatchJoinPointsInType(Class aClass, MatchingContext matchContext); - + /** * return true if matchesStatically can ever return * FuzzyBoolean.MAYBE (necessitating a per-join point test @@ -48,18 +48,18 @@ public interface ContextBasedMatcher { /** * Return FuzzyBoolean.YES if a join point with the given - * matching context is always matched. + * matching context is always matched. * Return FuzzyBoolean.NO if a join point with the given * matching context is never matched. * Return FuzzyBoolean.MAYBE if a match cannot be determined * statically (whilst generating a ShadowMatch), and must - * be determined on a per-join point basis. + * be determined on a per-join point basis. */ FuzzyBoolean matchesStatically(MatchingContext matchContext); /** * Called during processing of ShadowMatch.matchesJoinPoint - * when matchesStatically returned FuzzyBoolean.MAYBE. + * when matchesStatically returned FuzzyBoolean.MAYBE. */ boolean matchesDynamically(MatchingContext matchContext); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultMatchingContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultMatchingContext.java index fa47a87a3..293696a92 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultMatchingContext.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultMatchingContext.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.weaver.tools; @@ -21,7 +21,7 @@ import java.util.Map; public class DefaultMatchingContext implements MatchingContext { private Map contextMap = new HashMap(); - + /* (non-Javadoc) * @see org.aspectj.weaver.tools.MatchingContext#hasContextParameter(java.lang.String) */ @@ -35,7 +35,7 @@ public class DefaultMatchingContext implements MatchingContext { public Object getBinding(String contextParameterName) { return this.contextMap.get(contextParameterName); } - + /** * Add a context binding with the given name and value * @param name @@ -44,7 +44,7 @@ public class DefaultMatchingContext implements MatchingContext { public void addContextBinding(String name, Object value) { this.contextMap.put(name, value); } - + /** * Remove the context binding with the given name * @param name diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTrace.java index 7e2ab0d8f..dea36bacb 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTrace.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTrace.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: * Matthew Webster - initial implementation *******************************************************************************/ @@ -99,7 +99,7 @@ public class DefaultTrace extends AbstractTrace { /** * Template method that allows choice of destination for output - * + * * @param s * message to be traced */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTraceFactory.java index c7860589a..5f036ffe8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTraceFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTraceFactory.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: * Matthew Webster - initial implementation *******************************************************************************/ @@ -35,11 +35,11 @@ public class DefaultTraceFactory extends TraceFactory { } } } - + public boolean isEnabled() { return tracingEnabled; } - + public Trace getTrace (Class clazz) { DefaultTrace trace = new DefaultTrace(clazz); trace.setTraceEnabled(tracingEnabled); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/FuzzyBoolean.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/FuzzyBoolean.java index 77079c094..f29dd9ced 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/FuzzyBoolean.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/FuzzyBoolean.java @@ -1,37 +1,37 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * 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 - * + * 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.weaver.tools; -/** +/** * This class implements a boolean that includes a "maybe" */ public final class FuzzyBoolean { - + // Note :- this implementation is not safe under serialization / deserialization private String name; - + public static final FuzzyBoolean YES = new FuzzyBoolean("YES"); public static final FuzzyBoolean NO = new FuzzyBoolean("NO"); public static final FuzzyBoolean MAYBE = new FuzzyBoolean("MAYBE"); - + public static final FuzzyBoolean fromBoolean(boolean b) { return b ? YES : NO; } public String toString() { return name; } - + private FuzzyBoolean() {} - + private FuzzyBoolean(String n) { this.name = n; } } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java index 97fc994b3..ad82ac916 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java @@ -2,9 +2,9 @@ * 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 + * 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, Adrian Colyer, diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java index 2201964e4..e4a0e186a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/JoinPointMatch.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/JoinPointMatch.java index 588b3c0bc..a6beefa12 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/JoinPointMatch.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/JoinPointMatch.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.weaver.tools; @@ -18,13 +18,13 @@ package org.aspectj.weaver.tools; public interface JoinPointMatch { /** - * True if the pointcut expression has matched at this join point, and false + * True if the pointcut expression has matched at this join point, and false * otherwise */ boolean matches(); - + /** - * Get the parameter bindings at the matched join point. + * Get the parameter bindings at the matched join point. * If the join point was not matched an empty array is returned. */ PointcutParameter[] getParameterBindings(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/MatchingContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/MatchingContext.java index e668a30b7..f068e5093 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/MatchingContext.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/MatchingContext.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.weaver.tools; @@ -20,7 +20,7 @@ package org.aspectj.weaver.tools; * interface provides an extension point for the specification * of additional shadow and join point context that can be * taken into account during the matching process. - * + * * @see DefaultMatchingContext */ public interface MatchingContext { @@ -31,11 +31,11 @@ public interface MatchingContext { * @param contextParameterName */ boolean hasContextBinding(String contextParameterName); - + /** - * returns the binding associated with the + * returns the binding associated with the * given context parameter name (or null if - * there is no such context). + * there is no such context). * @param contextParameterName * @return */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutDesignatorHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutDesignatorHandler.java index 63f4a81e2..ea5771b1d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutDesignatorHandler.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutDesignatorHandler.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.weaver.tools; @@ -15,7 +15,7 @@ package org.aspectj.weaver.tools; /** * The PointcutDesignator interface allows extension of the * AspectJ pointcut language so that third-party tools integrating - * with AspectJ can add easily their own custom + * with AspectJ can add easily their own custom * domain-specific designators and have them interoperate seamlessly * with the standard AspectJ designators. * @@ -31,12 +31,12 @@ public interface PointcutDesignatorHandler { * @return */ String getDesignatorName() ; - + /** * Parse the given expression string * and return a ContextBasedMatcher that can be used * for matching. - * @param expression the body of the pointcut expression. + * @param expression the body of the pointcut expression. * For example, given the expression "bean(*DAO)" the parse * method will be called with the argument "*DAO". * @return a pointcut expression that can be used for @@ -45,5 +45,5 @@ public interface PointcutDesignatorHandler { * is ill-formed. */ ContextBasedMatcher parse(String expression); - + } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutExpression.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutExpression.java index a2016980d..6d1bb6272 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutExpression.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutExpression.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.tools; @@ -28,33 +28,33 @@ public interface PointcutExpression { * @see MatchingContext */ void setMatchingContext(MatchingContext aMatchContext); - + /** * Determine whether or not this pointcut could ever match a join point in the given class. * @param aClass the candidate class - * @return true iff this pointcut <i>may</i> match a join point within(aClass), and false otherwise + * @return true iff this pointcut <i>may</i> match a join point within(aClass), and false otherwise */ boolean couldMatchJoinPointsInType(Class aClass); - + /** * Returns true iff this pointcut contains any expression that might necessitate a dynamic test * at some join point (e.g. args) */ boolean mayNeedDynamicTest(); - + /** * Determine whether or not this pointcut matches the execution of a given method. * @param aMethod the method being executed * @return a ShadowMatch indicating whether the pointcut always, sometimes, or never - * matches join points representing the execution of the method. + * matches join points representing the execution of the method. */ ShadowMatch matchesMethodExecution(Method aMethod ); - + /** * Determine whether or not this pointcut matches the execution of a given constructor. * @param aConstructor the constructor being executed * @return a ShadowMatch indicating whether the pointcut always, sometimes, or never - * matches join points representing the execution of the constructor. + * matches join points representing the execution of the constructor. */ ShadowMatch matchesConstructorExecution(Constructor aConstructor); @@ -66,35 +66,35 @@ public interface PointcutExpression { * matchs join points representing the static initialization of the given type */ ShadowMatch matchesStaticInitialization(Class aClass); - + /** * Determine whether or not this pointcut matches the execution of a given piece of advice. * @param anAdviceMethod a method representing the advice being executed * @return a ShadowMatch indicating whether the pointcut always, sometimes, or never - * matches join points representing the execution of the advice. - */ + * matches join points representing the execution of the advice. + */ ShadowMatch matchesAdviceExecution(Method anAdviceMethod); - + /** * Determine whether or not this pointcut matches the initialization of an * object initiated by a call to the given constructor. * @param aConstructor the constructor initiating the initialization * @return a ShadowMatch indicating whether the pointcut always, sometimes, or never - * matches join points representing initialization via the given constructor. - */ + * matches join points representing initialization via the given constructor. + */ ShadowMatch matchesInitialization(Constructor aConstructor); - + /** * Determine whether or not this pointcut matches the pre-initialization of an * object initiated by a call to the given constructor. * @param aConstructor the constructor initiating the initialization * @return a ShadowMatch indicating whether the pointcut always, sometimes, or never - * matches join points representing pre-initialization via the given constructor. - */ + * matches join points representing pre-initialization via the given constructor. + */ ShadowMatch matchesPreInitialization(Constructor aConstructor); - + /** - * Determine whether or not this pointcut matches a method call to the given method, made during + * Determine whether or not this pointcut matches a method call to the given method, made during * the execution of the given method or constructor. * @param aMethod the method being called * @param withinCode the Method or Constructor from within which the call is made @@ -104,7 +104,7 @@ public interface PointcutExpression { ShadowMatch matchesMethodCall(Method aMethod, Member withinCode); /** - * Determine whether or not this pointcut matches a method call to the given method, made outside + * Determine whether or not this pointcut matches a method call to the given method, made outside * of the scope of any method or constructor, but within the callerType (for example, during * static initialization of the type). * @param aMethod the method being called @@ -115,7 +115,7 @@ public interface PointcutExpression { ShadowMatch matchesMethodCall(Method aMethod, Class callerType); /** - * Determine whether or not this pointcut matches a method call to the given constructor, made during + * Determine whether or not this pointcut matches a method call to the given constructor, made during * the execution of the given method or constructor. * @param aConstructor the constructor being called * @param withinCode the Method or Constructor from within which the call is made @@ -125,7 +125,7 @@ public interface PointcutExpression { ShadowMatch matchesConstructorCall(Constructor aConstructor, Member withinCode); /** - * Determine whether or not this pointcut matches a method call to the given constructor, made outside + * Determine whether or not this pointcut matches a method call to the given constructor, made outside * of the scope of any method or constructor, but within the callerType. * @param aConstructor the cosstructor being called * @param callerType the declared type of the caller @@ -139,21 +139,21 @@ public interface PointcutExpression { * handler within the given method or constructor * @param exceptionType the static type of the exception being handled * @param withinCode the method or constructor in which the catch block is declared - * @return a ShadowMatch indicating whether the pointcut always, sometimes, or + * @return a ShadowMatch indicating whether the pointcut always, sometimes, or * never matches join points representing the handling of the given exception - */ + */ ShadowMatch matchesHandler(Class exceptionType, Member withinCode); - + /** * Determine whether or not this pointcut matches the execution of a given exception * handler outside of the scope of any method or constructor, but within the handling type. * @param exceptionType the static type of the exception being handled * @param handlingType the type in which the handler block is executing - * @return a ShadowMatch indicating whether the pointcut always, sometimes, or + * @return a ShadowMatch indicating whether the pointcut always, sometimes, or * never matches join points representing the handling of the given exception - */ + */ ShadowMatch matchesHandler(Class exceptionType, Class handlingType); - + /** * Determine whether or not this pointcut matches a set of the given field from within the given * method or constructor. @@ -163,7 +163,7 @@ public interface PointcutExpression { * never matches field set join points for the given field and call site. */ ShadowMatch matchesFieldSet(Field aField, Member withinCode); - + /** * Determine whether or not this pointcut matches a set of the given field outside of the * scope of any method or constructor, but within the given type (for example, during @@ -174,7 +174,7 @@ public interface PointcutExpression { * never matches field set join points for the given field and call site. */ ShadowMatch matchesFieldSet(Field aField, Class withinType); - + /** * Determine whether or not this pointcut matches a get of the given field from within the given * method or constructor. @@ -195,7 +195,7 @@ public interface PointcutExpression { * never matches field get join points for the given field and call site. */ ShadowMatch matchesFieldGet(Field aField, Class withinType); - + /** * Return a string representation of this pointcut expression. */ diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParameter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParameter.java index a0eaa108a..5bdcebd2f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParameter.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParameter.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.weaver.tools; @@ -23,14 +23,14 @@ public interface PointcutParameter { * The name of this parameter */ String getName(); - + /** * The type of the parameter */ Class getType(); - + /** - * At a matched join point, the parameter binding. + * At a matched join point, the parameter binding. */ Object getBinding(); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java index 5c4a4d27d..80612362c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2004, 2017 Contributors - * 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 *******************************************************************************/ @@ -51,7 +51,7 @@ import org.aspectj.weaver.reflect.ReflectionWorld; /** * A PointcutParser can be used to build PointcutExpressions for a user-defined subset of AspectJ's pointcut language - * + * * @author Adrian Colyer * @author Andy Clement */ @@ -121,7 +121,7 @@ public class PointcutParser { * <p> * When resolving types in pointcut expressions, the context classloader is used to find types. * </p> - * + * * @param supportedPointcutKinds a set of PointcutPrimitives this parser should support * @throws UnsupportedOperationException if the set contains if, cflow, or cflow below */ @@ -161,7 +161,7 @@ public class PointcutParser { * <p> * When resolving types in pointcut expressions, the given classloader is used to find types. * </p> - * + * * @param supportedPointcutKinds a set of PointcutPrimitives this parser should support * @throws UnsupportedOperationException if the set contains if, cflow, or cflow below */ @@ -193,7 +193,7 @@ public class PointcutParser { * <li>Pointcut expressions must be self-contained :- they cannot contain references to other named pointcuts * <li>The pointcut expression must be anonymous with no formals allowed. * </ul> - * + * * @param supportedPointcutKinds a set of PointcutPrimitives this parser should support * @throws UnsupportedOperationException if the set contains if, cflow, or cflow below */ @@ -214,17 +214,17 @@ public class PointcutParser { /** * Set the classloader that this parser should use for type resolution. - * + * * @param aLoader */ protected void setClassLoader(ClassLoader aLoader) { this.classLoaderReference = new WeakClassLoaderReference(aLoader); world = ReflectionWorld.getReflectionWorldFor(this.classLoaderReference); } - + /** * Set the classloader that this parser should use for type resolution. - * + * * @param aLoader * @param shareWorlds if true then two PointcutParsers operating using the same classloader will share a ReflectionWorld */ @@ -239,7 +239,7 @@ public class PointcutParser { /** * Set the lint properties for this parser from the given resource on the classpath. - * + * * @param resourcePath path to a file containing aspectj lint properties */ public void setLintProperties(String resourcePath) throws IOException { @@ -252,7 +252,7 @@ public class PointcutParser { /** * Set the lint properties for this parser from the given properties set. - * + * * @param properties */ public void setLintProperties(Properties properties) { @@ -262,7 +262,7 @@ public class PointcutParser { /** * Register a new pointcut designator handler with this parser. This provides an extension mechansim for the integration of * domain-specific pointcut designators with the AspectJ pointcut language. - * + * * @param designatorHandler */ public void registerPointcutDesignatorHandler(PointcutDesignatorHandler designatorHandler) { @@ -274,7 +274,7 @@ public class PointcutParser { /** * Create a pointcut parameter of the given name and type. - * + * * @param name * @param type * @return @@ -286,7 +286,7 @@ public class PointcutParser { /** * Parse the given pointcut expression. A global scope is assumed for resolving any type references, and the pointcut must * contain no formals (variables to be bound). - * + * * @throws UnsupportedPointcutPrimitiveException if the parser encounters a primitive pointcut expression of a kind not * supported by this PointcutParser. * @throws IllegalArgumentException if the expression is not a well-formed pointcut expression @@ -300,7 +300,7 @@ public class PointcutParser { * Parse the given pointcut expression. The pointcut is resolved as if it had been declared inside the inScope class (this * allows the pointcut to contain unqualified references to other pointcuts declared in the same type for example). The pointcut * may contain zero or more formal parameters to be bound at matched join points. - * + * * @throws UnsupportedPointcutPrimitiveException if the parser encounters a primitive pointcut expression of a kind not * supported by this PointcutParser. * @throws IllegalArgumentException if the expression is not a well-formed pointcut expression @@ -351,7 +351,7 @@ public class PointcutParser { /** * Parse the given aspectj type pattern, and return a matcher that can be used to match types using it. - * + * * @param typePattern an aspectj type pattern * @return a type pattern matcher that matches using the given pattern * @throws IllegalArgumentException if the type pattern cannot be successfully parsed. @@ -578,5 +578,5 @@ public class PointcutParser { msg.append("\n"); return msg.toString(); } - + } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutPrimitive.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutPrimitive.java index ae3f607ff..0157b61e4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutPrimitive.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutPrimitive.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.tools; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ShadowMatch.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ShadowMatch.java index 55e2581df..4a726f8b9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ShadowMatch.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ShadowMatch.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.weaver.tools; @@ -23,7 +23,7 @@ public interface ShadowMatch { * shadow (for example, any call to the given method). */ boolean alwaysMatches(); - + /** * True if the pointcut expression may match some join points at this * shadow (for example, some calls to the given method may match, depending @@ -31,14 +31,14 @@ public interface ShadowMatch { * <p>If alwaysMatches is true, then maybeMatches is always true.</p> */ boolean maybeMatches(); - + /** * True iff the pointcut expression can never match any join point at this * shadow (for example, the pointcut will never match a call to the given * method). */ boolean neverMatches(); - + /** * Return the result of matching a join point at this shadow with the given * this, target, and args. @@ -48,7 +48,7 @@ public interface ShadowMatch { * @return */ JoinPointMatch matchesJoinPoint(Object thisObject, Object targetObject, Object[] args); - + /** * Set a matching context to be used when matching * join points. diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutExpression.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutExpression.java index 6ea1eefd1..ba6c22fb8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutExpression.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutExpression.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.tools; @@ -21,14 +21,14 @@ public interface StandardPointcutExpression { /** * Set the matching context to be used for subsequent calls to match. - * + * * @see MatchingContext */ void setMatchingContext(MatchingContext aMatchContext); /** * Determine whether or not this pointcut could ever match a join point in the given class. - * + * * @param aClass the candidate class * @return true iff this pointcut <i>may</i> match a join point within(aClass), and false otherwise */ @@ -41,7 +41,7 @@ public interface StandardPointcutExpression { /** * Determine whether or not this pointcut matches the execution of a given method. - * + * * @param aMethod the method being executed * @return a ShadowMatch indicating whether the pointcut always, sometimes, or never matches join points representing the * execution of the method. @@ -59,7 +59,7 @@ public interface StandardPointcutExpression { // /** * Determine whether or not this pointcut matches the static initialization of the given class. - * + * * @param aType the class being statically initialized * @return a ShadowMatch indicating whether the pointcut always, sometimes, or never matchs join points representing the static * initialization of the given type @@ -109,7 +109,7 @@ public interface StandardPointcutExpression { /** * Determine whether or not this pointcut matches a method call to the given method, made during the execution of the given * method or constructor. - * + * * @param aMethod the method being called * @param withinCode the Method or Constructor from within which the call is made * @return a ShadowMatch indicating whether the pointcut always, sometimes, or never matches join points representing a call to diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java index 38a18e1ad..1fdb29055 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.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 *******************************************************************************/ @@ -112,7 +112,7 @@ public class StandardPointcutParser { * <p> * When resolving types in pointcut expressions, the given classloader is used to find types. * </p> - * + * * @param supportedPointcutKinds a set of PointcutPrimitives this parser should support * @throws UnsupportedOperationException if the set contains if, cflow, or cflow below */ @@ -142,7 +142,7 @@ public class StandardPointcutParser { * <li>Pointcut expressions must be self-contained :- they cannot contain references to other named pointcuts * <li>The pointcut expression must be anonymous with no formals allowed. * </ul> - * + * * @param supportedPointcutKinds a set of PointcutPrimitives this parser should support * @throws UnsupportedOperationException if the set contains if, cflow, or cflow below */ @@ -173,7 +173,7 @@ public class StandardPointcutParser { /** * Set the lint properties for this parser from the given properties set. - * + * * @param properties */ public void setLintProperties(Properties properties) { @@ -183,7 +183,7 @@ public class StandardPointcutParser { /** * Register a new pointcut designator handler with this parser. This provides an extension mechansim for the integration of * domain-specific pointcut designators with the AspectJ pointcut language. - * + * * @param designatorHandler */ public void registerPointcutDesignatorHandler(PointcutDesignatorHandler designatorHandler) { @@ -195,7 +195,7 @@ public class StandardPointcutParser { /** * Create a pointcut parameter of the given name and type. - * + * * @param name * @param type * @return @@ -207,7 +207,7 @@ public class StandardPointcutParser { /** * Parse the given pointcut expression. A global scope is assumed for resolving any type references, and the pointcut must * contain no formals (variables to be bound). - * + * * @throws UnsupportedPointcutPrimitiveException if the parser encounters a primitive pointcut expression of a kind not * supported by this PointcutParser. * @throws IllegalArgumentException if the expression is not a well-formed pointcut expression @@ -221,7 +221,7 @@ public class StandardPointcutParser { * Parse the given pointcut expression. The pointcut is resolved as if it had been declared inside the inScope class (this * allows the pointcut to contain unqualified references to other pointcuts declared in the same type for example). The pointcut * may contain zero or more formal parameters to be bound at matched join points. - * + * * @throws UnsupportedPointcutPrimitiveException if the parser encounters a primitive pointcut expression of a kind not * supported by this PointcutParser. * @throws IllegalArgumentException if the expression is not a well-formed pointcut expression @@ -273,7 +273,7 @@ public class StandardPointcutParser { /** * Parse the given aspectj type pattern, and return a matcher that can be used to match types using it. - * + * * @param typePattern an aspectj type pattern * @return a type pattern matcher that matches using the given pattern * @throws IllegalArgumentException if the type pattern cannot be successfully parsed. diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java index c0ce182a2..b08b7b5cf 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java index 8190d67a3..815463653 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java @@ -1,32 +1,32 @@ /******************************************************************************* * 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: * Matthew Webster - initial implementation *******************************************************************************/ package org.aspectj.weaver.tools; public abstract class TraceFactory { - + public final static String DEBUG_PROPERTY = "org.aspectj.tracing.debug"; public final static String FACTORY_PROPERTY = "org.aspectj.tracing.factory"; public final static String DEFAULT_FACTORY_NAME = "default"; - - protected static boolean debug = getBoolean(DEBUG_PROPERTY,false); + + protected static boolean debug = getBoolean(DEBUG_PROPERTY,false); private static TraceFactory instance; - + public Trace getTrace (Class clazz) { return instance.getTrace(clazz); } - + public static TraceFactory getTraceFactory () { return instance; } - + protected static boolean getBoolean(String name, boolean def) { String defaultValue = String.valueOf(def); String value = System.getProperty(name,defaultValue); @@ -34,9 +34,9 @@ public abstract class TraceFactory { } static { - + /* - * Allow user to override default behaviour or specify their own factory + * Allow user to override default behaviour or specify their own factory */ String factoryName = System.getProperty(FACTORY_PROPERTY); if (factoryName != null) try { @@ -51,7 +51,7 @@ public abstract class TraceFactory { catch (Throwable th) { if (debug) th.printStackTrace(); } - + /* * Try to load external trace infrastructure using supplied factories */ @@ -66,12 +66,12 @@ public abstract class TraceFactory { } /* - * Use default trace + * Use default trace */ if (instance == null) { instance = new DefaultTraceFactory(); } - + if (debug) System.err.println("TraceFactory.instance=" + instance); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java index 5971e9eb4..0da394a29 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java @@ -1,9 +1,9 @@ /******************************************************************************* * 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 + * 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 diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java index 3ea8a756e..a2a39ccaa 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java @@ -2,9 +2,9 @@ * 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 + * 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 * * ******************************************************************/ package org.aspectj.weaver.tools; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java index 6e0bbd661..997e40182 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.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.weaver.tools; @@ -21,9 +21,9 @@ public class UnsupportedPointcutPrimitiveException extends RuntimeException { private static final long serialVersionUID = 3258689888517043251L; - private PointcutPrimitive unsupportedPrimitive; + private PointcutPrimitive unsupportedPrimitive; private String pointcutExpression; - + public UnsupportedPointcutPrimitiveException(String pcExpression, PointcutPrimitive primitive) { super(WeaverMessages.format(WeaverMessages.UNSUPPORTED_POINTCUT_PRIMITIVE,pcExpression,primitive.getName())); this.pointcutExpression = pcExpression; @@ -36,9 +36,9 @@ public class UnsupportedPointcutPrimitiveException extends RuntimeException { public PointcutPrimitive getUnsupportedPrimitive() { return unsupportedPrimitive; } - + public String getInvalidPointcutExpression() { return pointcutExpression; } - + } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java index 38e801616..b73520da5 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java @@ -2,9 +2,9 @@ * 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 + * 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, Adrian Colyer, diff --git a/org.aspectj.matcher/src/main/resources/org/aspectj/weaver/weaver-messages.properties b/org.aspectj.matcher/src/main/resources/org/aspectj/weaver/weaver-messages.properties index 2745ae9e7..0b9d8c310 100644 --- a/org.aspectj.matcher/src/main/resources/org/aspectj/weaver/weaver-messages.properties +++ b/org.aspectj.matcher/src/main/resources/org/aspectj/weaver/weaver-messages.properties @@ -1,10 +1,10 @@ ##################################################################### # Copyright (c) 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 +# 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 version @@ -198,4 +198,4 @@ annotationsRequireJava5=annotation type patterns are only supported at Java 5 co # @AspectJ returningFormalNotDeclaredInAdvice=the last parameter of this advice must be named ''{0}'' to bind the returning value -thrownFormalNotDeclaredInAdvice=the last parameter of this advice must be named ''{0}'' and be of a subtype of Throwable
\ No newline at end of file +thrownFormalNotDeclaredInAdvice=the last parameter of this advice must be named ''{0}'' and be of a subtype of Throwable diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/MatcherModuleTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/MatcherModuleTests.java index eb8f88c5e..c9c7faa65 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/MatcherModuleTests.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/MatcherModuleTests.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002-2008 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.matcher; diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java index 4175425ef..1411d430b 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2008 Contributors - * 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 *******************************************************************************/ @@ -22,9 +22,9 @@ import org.aspectj.weaver.tools.StandardPointcutParser; * Test the use of the pointcut parser and matching infrastructure. The org.aspectj.matcher.tools infrastructure used should not be * aware of what kind of World it is working with and only operate in terms of the type abstraction expressed in the * org.aspectj.matcher project (so Members, etc). These tests require some testdata types. - * + * * This is based on the Reflection oriented PointcutExpressionTest in the weaver project. - * + * * @author Andy Clement */ public abstract class CommonAdvancedPointcutExpressionTests extends TestCase { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java index 748de7ce5..29d12850d 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2008 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: * Andy Clement diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/CommonWorldTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/CommonWorldTests.java index 613437346..cf9a944fb 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/CommonWorldTests.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/CommonWorldTests.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2002-2008 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: - * PARC initial implementation - * Andy Clement + * 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: + * PARC initial implementation + * Andy Clement * ******************************************************************/ package org.aspectj.weaver; @@ -27,7 +27,7 @@ import org.aspectj.testing.util.TestUtil; /** * An abstract set of tests that any World implementation should be able to pass. To run it against your World, subclass it and * implement getWorld(). - * + * * @author Andy Clement */ public abstract class CommonWorldTests extends TestCase { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestShadow.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestShadow.java index 0a5249245..64c6778fc 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestShadow.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestShadow.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver; @@ -76,7 +76,7 @@ public class TestShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getKindedAnnotationVar() */ public Var getKindedAnnotationVar(UnresolvedType annotationType) { @@ -85,7 +85,7 @@ public class TestShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getWithinAnnotationVar() */ public Var getWithinAnnotationVar(UnresolvedType annotationType) { @@ -94,7 +94,7 @@ public class TestShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getWithinCodeAnnotationVar() */ public Var getWithinCodeAnnotationVar(UnresolvedType annotationType) { @@ -103,7 +103,7 @@ public class TestShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getThisAnnotationVar() */ public Var getThisAnnotationVar(UnresolvedType annotationType) { @@ -112,7 +112,7 @@ public class TestShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getTargetAnnotationVar() */ public Var getTargetAnnotationVar(UnresolvedType annotationType) { @@ -121,7 +121,7 @@ public class TestShadow extends Shadow { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.Shadow#getArgAnnotationVar(int) */ public Var getArgAnnotationVar(int i, UnresolvedType annotationType) { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestUtils.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestUtils.java index 69bc674ef..655d5d338 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestUtils.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestUtils.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2008 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: - * 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.weaver; @@ -24,10 +24,10 @@ public class TestUtils { // * more easily compare delegate implementations. // */ // public String stringifyDelegate() { - // + // // StringBuffer result = new StringBuffer(); // result.append("=== Delegate for "+getResolvedTypeX().getName()+"\n"); - // + // // result.append("isAspect?"+isAspect()+"\n"); // result.append("isAnnotationStyleAspect?"+isAnnotationStyleAspect()+"\n"); // result.append("isInterface?"+isInterface()+"\n"); @@ -49,7 +49,7 @@ public class TestUtils { // } // result.append("isAnnotationWithRuntimeRetention?"+isAnnotationWithRuntimeRetention()+"\n"); // result.append("-\n"); - // + // // result.append("isAnonymous?"+isAnonymous()+"\n"); // result.append("isNested?"+isNested()+"\n"); // result.append("-\n"); @@ -57,7 +57,7 @@ public class TestUtils { // result.append("isGeneric?"+isGeneric()+"\n"); // result.append("declaredGenericSignature="+getDeclaredGenericSignature()+"\n"); // result.append("-\n"); - // + // // AnnotationX[] axs = getAnnotations(); // if (axs!=null && axs.length>0) { // result.append("getAnnotations() returns: "+axs.length+" annotations\n"); @@ -78,12 +78,12 @@ public class TestUtils { // } else { // result.append("getAnnotationTypes() returns nothing\n"); // } - // + // // result.append("isExposedToWeaver?"+isExposedToWeaver()+"\n"); // result.append("getSuperclass?"+getSuperclass()+"\n"); // result.append("getResolvedTypeX?"+getResolvedTypeX()+"\n"); // result.append("--\n"); - // + // // ResolvedMember[] fields = getDeclaredFields(); // if (fields!=null && fields.length>0) { // result.append("The fields: "+fields.length+"\n"); @@ -110,20 +110,20 @@ public class TestUtils { // } // // result.append("getModifiers?"+getModifiers()+"\n"); - // + // // result.append("perclause="+getPerClause()+"\n"); - // + // // result.append("aj:weaverstate="+getWeaverState()+"\n"); - // + // // ResolvedMember[] pointcuts = getDeclaredPointcuts(); // if (pointcuts!=null && pointcuts.length>0) { // result.append("The pointcuts: "+pointcuts.length+"\n"); - // + // // // Sort the damn things // List sortedSetOfPointcuts = new ArrayList(); // for (int i = 0; i < pointcuts.length; i++) {sortedSetOfPointcuts.add(pointcuts[i]);} // Collections.sort(sortedSetOfPointcuts); - // + // // int i =0; // for (Iterator iter = sortedSetOfPointcuts.iterator(); iter.hasNext();) { // ResolvedMember member = (ResolvedMember) iter.next(); @@ -131,16 +131,16 @@ public class TestUtils { // i++; // } // } - // + // // Collection declares = getDeclares(); // if (declares.size()>0) { // result.append("The declares: "+declares.size()+"\n"); - // + // // // // Sort the damn things // // List sortedSetOfPointcuts = new ArrayList(); // // for (int i = 0; i < pointcuts.length; i++) {sortedSetOfPointcuts.add(pointcuts[i]);} // // Collections.sort(sortedSetOfPointcuts); - // + // // int i=0; // for (Iterator iter = declares.iterator(); iter.hasNext();) { // Declare dec = (Declare) iter.next(); @@ -148,7 +148,7 @@ public class TestUtils { // i++; // } // } - // + // // TypeVariable[] tv = getTypeVariables(); // if (tv!=null && tv.length>0) { // result.append("The type variables: "+tv.length+"\n"); @@ -156,7 +156,7 @@ public class TestUtils { // result.append("tv"+i+") "+tv[i]+"\n"); // } // } - // + // // Collection tmungers = getTypeMungers(); // if (tmungers.size()>0) { // List sorted = new ArrayList(); @@ -176,7 +176,7 @@ public class TestUtils { // } // // result.append("doesNotExposeShadowMungers?"+doesNotExposeShadowMungers()+"\n"); - // + // // Collection pas = getPrivilegedAccesses(); // if (pas!=null && pas.size()>0) { // // List sorted = new ArrayList(); @@ -203,11 +203,11 @@ public class TestUtils { /** * Build a member from a string representation: <blockquote> - * + * * <pre> * static? TypeName TypeName.Id * </pre> - * + * * </blockquote> */ public static MemberImpl fieldFromString(String str) { @@ -236,11 +236,11 @@ public class TestUtils { /** * Build a member from a string representation: <blockquote> - * + * * <pre> * (static|interface|private)? TypeName TypeName . Id ( TypeName , ...) * </pre> - * + * * </blockquote> */ diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTest.java index 845272366..df3cb3154 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTest.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTest.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2010 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.weaver; @@ -12,7 +12,7 @@ import junit.framework.TestCase; /** * Check signature to type mapping. - * + * * @author Andy Clement */ public class TypeFactoryTest extends TestCase { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/AndOrNotTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/AndOrNotTestCase.java index 909db8e6a..1617374ab 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/AndOrNotTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/AndOrNotTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -23,7 +23,7 @@ import org.aspectj.weaver.reflect.ReflectionWorld; /** * @author hugunin - * + * */ public class AndOrNotTestCase extends PatternsTestCase { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java index 13376d676..96ef0b511 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.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 *******************************************************************************/ @@ -22,7 +22,7 @@ import org.aspectj.weaver.tools.ShadowMatch; /** * @author colyer - * + * */ public class ArgsTestCase extends TestCase { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/BindingTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/BindingTestCase.java index 132512e5a..224ba3ec1 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/BindingTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/BindingTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -88,7 +88,7 @@ public class BindingTestCase extends PatternsTestCase { /** * Method checkBindingFailure. (assumes an env where "a" and "b" are formals). - * + * * @param string */ private void checkBindingFailure(String pattern, String prefix) { @@ -110,7 +110,7 @@ public class BindingTestCase extends PatternsTestCase { /** * Method checkBindings. - * + * * @param string * @param i */ diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ConstantPoolSimulator.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ConstantPoolSimulator.java index 1583900f4..4d476642e 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ConstantPoolSimulator.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ConstantPoolSimulator.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2010 Contributors - * 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 (SpringSource) - initial implementation *******************************************************************************/ @@ -32,4 +32,4 @@ public class ConstantPoolSimulator implements ConstantPoolWriter, ConstantPoolRe return list.get(constantPoolIndex); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java index ab5f6e6f2..d416cafbe 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DumpPointcutVisitor.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DumpPointcutVisitor.java index 2b0e01888..131e9db2d 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DumpPointcutVisitor.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DumpPointcutVisitor.java @@ -2,12 +2,12 @@ * Copyright (c) 2007-2008 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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: - * Alexandre Vasseur + * Alexandre Vasseur * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -15,7 +15,7 @@ import org.aspectj.weaver.Member; /** * A sample toString like visitor that helps understanding the AST tree structure organization - * + * * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a> */ public class DumpPointcutVisitor implements PatternNodeVisitor { @@ -36,7 +36,7 @@ public class DumpPointcutVisitor implements PatternNodeVisitor { /** * This method helps maintaining the API and raises warning when PatternNode subclasses do not implement the visitor pattern - * + * * @param node * @param data * @return @@ -554,4 +554,4 @@ public class DumpPointcutVisitor implements PatternNodeVisitor { } } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java index 8c8a89035..d360339b7 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -85,7 +85,7 @@ public class ModifiersPatternTestCase extends PatternsTestCase { /** * Method checkSerialization. - * + * * @param string */ private void checkSerialization(String string) throws IOException { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternParserTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternParserTestCase.java index f1bec0837..442e49885 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternParserTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternParserTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -16,7 +16,7 @@ import junit.framework.TestCase; /** * @author hugunin - * + * * To change this generated comment edit the template variable * "typecomment": Window>Preferences>Java>Templates. To enable and * disable the creation of type comments go to @@ -25,7 +25,7 @@ import junit.framework.TestCase; public class NamePatternParserTestCase extends TestCase { /** * Constructor for PatternTestCase. - * + * * @param name */ public NamePatternParserTestCase(String name) { @@ -53,7 +53,7 @@ public class NamePatternParserTestCase extends TestCase { /** * Method checkMatch. - * + * * @param string * @param matchAll * @param b diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternTestCase.java index d26395038..2c3d53691 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -23,7 +23,7 @@ import org.aspectj.weaver.VersionedDataInputStream; /** * @author hugunin - * + * * To change this generated comment edit the template variable "typecomment": Window>Preferences>Java>Templates. To enable * and disable the creation of type comments go to Window>Preferences>Java>Code Generation. */ @@ -38,7 +38,7 @@ public class NamePatternTestCase extends TestCase { /** * Constructor for PatternTestCase. - * + * * @param name */ public NamePatternTestCase(String name) { @@ -58,7 +58,7 @@ public class NamePatternTestCase extends TestCase { /** * Method checkMatch. - * + * * @param string * @param matchAll * @param b diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java index f3609b7d7..31897365f 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -26,7 +26,7 @@ import org.aspectj.weaver.reflect.ReflectionWorld; /** * @author hugunin - * + * * To change this generated comment edit the template variable "typecomment": Window>Preferences>Java>Templates. To enable * and disable the creation of type comments go to Window>Preferences>Java>Code Generation. */ diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PointcutRewriterTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PointcutRewriterTest.java index 9003b4b43..66106de3e 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PointcutRewriterTest.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PointcutRewriterTest.java @@ -1,11 +1,11 @@ /* ******************************************************************* * 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 - * + * 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.weaver.patterns; @@ -18,7 +18,7 @@ import org.aspectj.weaver.Shadow; /** * Testing the pointcut rewriter. - * + * * @author Adrian Colyer * @author Andy Clement */ @@ -106,7 +106,7 @@ public class PointcutRewriterTest extends TestCase { /** * spec is reverse polish notation with operators and, or , not, anyorder, delimiter is "%" (not whitespace). - * + * * @param spec * @param pc */ diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java index 756a53d7f..124bf93fd 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * 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 - * 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.weaver.patterns; diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternTestCase.java index 1920646e4..4a9551b35 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternTestCase.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * 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://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -71,13 +71,13 @@ public class SignaturePatternTestCase extends PatternsTestCase { * signaturePattern.matches(objectToString, world, false); } long stime = System.currentTimeMillis(); for (int i = 0; i < * 2000000; i++) { boolean matches = signaturePattern.matches(objectToString, world, false); } long etime = * System.currentTimeMillis(); System.out.println("Took " + (etime - stime) + "ms for 2,000,000");// 4081 - * + * * signaturePattern = makeMethodPat("* *())"); signaturePattern = signaturePattern.resolveBindings(new TestScope(world, new * FormalBinding[0]), new Bindings(0)); for (int i = 0; i < 1000; i++) { boolean matches = * signaturePattern.matches(objectToString, world, false); } stime = System.currentTimeMillis(); for (int i = 0; i < 2000000; * i++) { boolean matches = signaturePattern.matches(objectToString, world, false); } etime = System.currentTimeMillis(); * System.out.println("Took " + (etime - stime) + "ms for 2,000,000");// 4081 } - * + * * public void testInstanceMethodMatchSpeed2() throws IOException { // Member objectToString = * TestUtils.methodFromString("java.lang.String java.lang.Object.toString()"); Member objectToString = * TestUtils.methodFromString( diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTest.java index f4ae843dc..7c2fec4d1 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTest.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTest.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TestScope.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TestScope.java index e65bf2797..2303b001a 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TestScope.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TestScope.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ @@ -18,10 +18,10 @@ import org.aspectj.weaver.patterns.FormalBinding; import org.aspectj.weaver.patterns.SimpleScope; public class TestScope extends SimpleScope { - + public TestScope( World world, - FormalBinding[] bindings) + FormalBinding[] bindings) { super(world, bindings); } diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java index be9caeedf..7aa901238 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java @@ -1,15 +1,15 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * 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://www.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: * PARC initial implementation - * Adrian Colyer, runtime reflection extensions + * Adrian Colyer, runtime reflection extensions * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -27,7 +27,7 @@ import org.aspectj.weaver.tools.ShadowMatch; /** * @author hugunin - * + * * To change this generated comment edit the template variable "typecomment": Window>Preferences>Java>Templates. To enable * and disable the creation of type comments go to Window>Preferences>Java>Code Generation. */ @@ -53,7 +53,7 @@ public class ThisOrTargetTestCase extends TestCase { /** * Constructor for PatternTestCase. - * + * * @param name */ public ThisOrTargetTestCase(String name) { @@ -140,7 +140,7 @@ public class ThisOrTargetTestCase extends TestCase { /** * Method checkSerialization. - * + * * @param string */ // private void checkSerialization(String string) throws IOException { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternListTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternListTestCase.java index 8d43fcce2..78bd2076f 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternListTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternListTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -26,7 +26,7 @@ import org.aspectj.weaver.reflect.ReflectionWorld; /** * @author hugunin - * + * * To change this generated comment edit the template variable "typecomment": Window>Preferences>Java>Templates. To enable * and disable the creation of type comments go to Window>Preferences>Java>Code Generation. */ @@ -150,7 +150,7 @@ public class TypePatternListTestCase extends PatternsTestCase { /** * Method checkSerialization. - * + * * @param string */ private void checkSerialization(String string) throws IOException { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternTestCase.java index 5ec92e1ec..03e80befa 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -242,7 +242,7 @@ public class TypePatternTestCase extends PatternsTestCase { /** * Method checkSerialization. - * + * * @param string */ private void checkSerialization(String string) throws IOException { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/VisitorTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/VisitorTestCase.java index 7fd131528..d3a5304fe 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/VisitorTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/VisitorTestCase.java @@ -1,11 +1,11 @@ /******************************************************************************* * 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 - * + * 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: * Alexandre Vasseur initial implementation *******************************************************************************/ diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/WithinTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/WithinTestCase.java index b8138b067..b029f9b6e 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/WithinTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/WithinTestCase.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 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: - * 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: + * PARC initial implementation * ******************************************************************/ package org.aspectj.weaver.patterns; @@ -65,7 +65,7 @@ public class WithinTestCase extends PatternsTestCase { // public void testMatchJP() { // Factory f = new Factory("WithinTestCase.java",WithinTestCase.class); - // + // // JoinPoint.StaticPart inString = f.makeSJP(JoinPoint.CONSTRUCTOR_EXECUTION,f.makeConstructorSig(0,String.class,new Class[] // {String.class},new String[]{"s"},new Class[0]),1); // JoinPoint.StaticPart inObject = f.makeSJP(JoinPoint.CONSTRUCTOR_EXECUTION,f.makeConstructorSig(0,Object.class,new Class[] @@ -74,7 +74,7 @@ public class WithinTestCase extends PatternsTestCase { // Pointcut withinString = new PatternParser("within(String)").parsePointcut().resolve(); // Pointcut withinObject = new PatternParser("within(Object)").parsePointcut().resolve(); // Pointcut withinObjectPlus = new PatternParser("within(Object+)").parsePointcut().resolve(); - // + // // checkMatches(withinString,inString,FuzzyBoolean.YES); // checkMatches(withinString,inObject,FuzzyBoolean.NO); // checkMatches(withinObject,inString,FuzzyBoolean.NO); @@ -82,11 +82,11 @@ public class WithinTestCase extends PatternsTestCase { // checkMatches(withinObjectPlus,inString,FuzzyBoolean.YES); // checkMatches(withinObjectPlus,inObject,FuzzyBoolean.YES); // } - // + // // private void checkMatches(Pointcut p, JoinPoint.StaticPart jpsp, FuzzyBoolean expected) { // assertEquals(expected,p.match(null,jpsp)); // } - // + // public Pointcut makePointcut(String pattern) { Pointcut pointcut0 = Pointcut.fromString(pattern); diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java index 7325bcfc9..579719468 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java @@ -1,12 +1,12 @@ /* ******************************************************************* * Copyright (c) 2002-2008 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: + * 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 * ******************************************************************/ package org.aspectj.weaver.reflect; diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java index 1d3083602..c7598cadf 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.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.weaver.reflect; |