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 /weaver/src/main | |
| 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 'weaver/src/main')
82 files changed, 551 insertions, 551 deletions
diff --git a/weaver/src/main/java/org/aspectj/weaver/IClassFileProvider.java b/weaver/src/main/java/org/aspectj/weaver/IClassFileProvider.java index 029bba7c6..32b42ff7e 100644 --- a/weaver/src/main/java/org/aspectj/weaver/IClassFileProvider.java +++ b/weaver/src/main/java/org/aspectj/weaver/IClassFileProvider.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 *******************************************************************************/ @@ -16,7 +16,7 @@ import org.aspectj.weaver.bcel.UnwovenClassFile; /** * @author colyer - * + * * Clients implementing the IClassFileProvider can have a set of class files under their control woven by a weaver, by * calling the weave(IClassFileProvider source) method. The contract is that a call to getRequestor().acceptResult() is * providing a result for the class file most recently returned from the getClassFileIterator(). @@ -26,7 +26,7 @@ public interface IClassFileProvider { /** * Answer an iterator that can be used to iterate over a set of UnwovenClassFiles to be woven. During a weave, this method may * be called multiple times. - * + * * @return iterator over UnwovenClassFiles. */ Iterator<UnwovenClassFile> getClassFileIterator(); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java b/weaver/src/main/java/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java index 60aa84125..0408b3694 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.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.bcel; @@ -31,7 +31,7 @@ import org.aspectj.weaver.UnresolvedType; /** * An AnnotationAccessVar represents access to a particular annotation, whilst an AnnotationAccessFieldVar represents access to a * specific field of that annotation. - * + * * @author Andy Clement */ class AnnotationAccessFieldVar extends BcelVar { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/AnnotationAccessVar.java b/weaver/src/main/java/org/aspectj/weaver/bcel/AnnotationAccessVar.java index f84d5e05e..81c4e0a60 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/AnnotationAccessVar.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/AnnotationAccessVar.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2005-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.bcel; @@ -260,7 +260,7 @@ public class AnnotationAccessVar extends BcelVar { /** * Return an object that can access a particular value of this annotation. - * + * * @param valueType The type from the annotation that is of interest * @param formalName the formal name expressed in the pointcut, can be used to disambiguate * @return a variable that represents access to that annotation value diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/AspectInstanceVar.java b/weaver/src/main/java/org/aspectj/weaver/bcel/AspectInstanceVar.java index 37633b71f..46fb74460 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/AspectInstanceVar.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/AspectInstanceVar.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://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/vmware * ******************************************************************/ package org.aspectj.weaver.bcel; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/AtAjAttributes.java b/weaver/src/main/java/org/aspectj/weaver/bcel/AtAjAttributes.java index 6072c0232..7fb18abcd 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/AtAjAttributes.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/AtAjAttributes.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.java index a32ea69b7..6bc5cb4a0 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAccessForInlineMunger.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/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAdvice.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAdvice.java index 85cd66e54..320b22c1e 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAdvice.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAdvice.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 @@ -808,4 +808,4 @@ class BcelAdvice extends Advice { thrownExceptions = Collections.emptyList(); // !!! interaction with unit tests } -}
\ No newline at end of file +} diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAnnotation.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAnnotation.java index 73699f2a0..0db2ba905 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAnnotation.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAnnotation.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.bcel; @@ -27,7 +27,7 @@ import org.aspectj.weaver.World; /** * Wraps a Bcel Annotation object and uses it to answer AnnotationAJ method calls. This is cheaper than translating all Bcel * annotations into AnnotationAJ objects. - * + * * @author AndyClement */ public class BcelAnnotation extends AbstractAnnotationAJ { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowAccessVar.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowAccessVar.java index 2640edd95..9675486dc 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowAccessVar.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowAccessVar.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.bcel; @@ -23,7 +23,7 @@ import org.aspectj.weaver.ResolvedType; /** * XXX Erik and I need to discuss this hierarchy. Having FieldRef extend Var is convenient, but hopefully there's a better design. - * + * * This is always a static reference. */ public class BcelCflowAccessVar extends BcelVar { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowCounterFieldAdder.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowCounterFieldAdder.java index a70a5d8a9..586147827 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowCounterFieldAdder.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowCounterFieldAdder.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 * (Andy Clement) diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java index 455edd174..710014985 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.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.bcel; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelClassWeaver.java index edf7a0c48..4aa8d2485 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelClassWeaver.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelClassWeaver.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/weaver/src/main/java/org/aspectj/weaver/bcel/BcelConstantPoolReader.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelConstantPoolReader.java index 2deaf57c1..00ad47b5d 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelConstantPoolReader.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelConstantPoolReader.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) * ******************************************************************/ @@ -16,7 +16,7 @@ import org.aspectj.weaver.ConstantPoolReader; /** * An implementation of the constant pool reader that speaks Bcel. - * + * * @author Andy Clement */ public class BcelConstantPoolReader implements ConstantPoolReader { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelConstantPoolWriter.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelConstantPoolWriter.java index 634764901..bf1fcd81f 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelConstantPoolWriter.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelConstantPoolWriter.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) * ******************************************************************/ @@ -16,7 +16,7 @@ import org.aspectj.weaver.ConstantPoolWriter; /** * An implementation of the constant pool writer that speaks Bcel. - * + * * @author Andy Clement */ class BcelConstantPoolWriter implements ConstantPoolWriter { @@ -31,4 +31,4 @@ class BcelConstantPoolWriter implements ConstantPoolWriter { return pool.addUtf8(name); } -}
\ No newline at end of file +} diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelField.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelField.java index c88e8519f..4428fdf42 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelField.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelField.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.bcel; @@ -34,7 +34,7 @@ import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXConverter.GenericSigna /** * An AspectJ Field object that is backed by a Bcel Field object. - * + * * @author PARC * @author Andy Clement */ @@ -304,4 +304,4 @@ final class BcelField extends ResolvedMemberImpl { field = null; } } -}
\ No newline at end of file +} diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelFieldRef.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelFieldRef.java index a5a2a79ec..246f258d6 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelFieldRef.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelFieldRef.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.bcel; @@ -20,7 +20,7 @@ import org.aspectj.weaver.ResolvedType; /** * XXX Erik and I need to discuss this hierarchy. Having FieldRef extend Var is convenient, but hopefully there's a better design. - * + * * This is always a static reference. */ public class BcelFieldRef extends BcelVar { @@ -78,7 +78,7 @@ public class BcelFieldRef extends BcelVar { // Utility.appendConversion(il, fact, storee.getType(), convertToType); // il.append(fact.createArrayStore(BcelWorld.makeBcelType(convertToType))); // } - // + // // InstructionList createConvertableArrayStore( // InstructionFactory fact, // int index, diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java index 70ea191cb..c5c7cfbd6 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.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.bcel; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelMethod.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelMethod.java index 08651412c..abf1b3c1a 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelMethod.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelMethod.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.bcel; @@ -48,7 +48,7 @@ import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.World; import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXConverter.GenericSignatureFormatException; -//public final +//public final class BcelMethod extends ResolvedMemberImpl { private final static String ASPECTJ_ANNOTATION_PACKAGE = "org.aspectj.lang.annotation"; @@ -694,7 +694,7 @@ class BcelMethod extends ResolvedMemberImpl { /** * Return true if the method represents the default constructor. Hard to determine this from bytecode, but the existence of the * MethodDeclarationLineNumber attribute should tell us. - * + * * @return true if this BcelMethod represents the default constructor */ @Override @@ -709,4 +709,4 @@ class BcelMethod extends ResolvedMemberImpl { } } -}
\ No newline at end of file +} diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelObjectType.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelObjectType.java index 41b1f3fa6..d1c4a9f42 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelObjectType.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelObjectType.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 * RonBodkin/AndyClement optimizations for memory consumption/speed * ******************************************************************/ @@ -132,7 +132,7 @@ public class BcelObjectType extends AbstractReferenceTypeDelegate { /* * Notes: note(1): in some cases (perclause inheritance) we encounter unpacked state when calling getPerClause - * + * * note(2): A BcelObjectType is 'damaged' if it has been modified from what was original constructed from the bytecode. This * currently happens if the parents are modified or an annotation is added - ideally BcelObjectType should be immutable but * that's a bigger piece of work. XXX @@ -356,7 +356,7 @@ public class BcelObjectType extends AbstractReferenceTypeDelegate { /** * Check if the type is an @AJ aspect (no matter if used from an LTW point of view). Such aspects are annotated with @Aspect - * + * * @return true for @AJ aspect */ public boolean isAnnotationStyleAspect() { @@ -588,7 +588,7 @@ public class BcelObjectType extends AbstractReferenceTypeDelegate { ensureAnnotationsUnpacked(); return annotations; } - + public boolean hasAnnotations() { ensureAnnotationsUnpacked(); return annotations.length != 0; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java index cca34bc12..bafe80f42 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Alexandre Vasseur diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelRenderer.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelRenderer.java index a18047812..38f61ee0a 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelRenderer.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelRenderer.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.bcel; @@ -82,16 +82,16 @@ public final class BcelRenderer implements ITestVisitor, IExprVisitor { /* * Get the instructions representing this test. - * + * * @param e test to render - * + * * @param sk instructionHandle to jump to if our rendered check succeeds (typically start of advice) - * + * * @param fk instructionHandle to jump to if our rendered check fails (typically after end of advice) - * + * * @param next instructionHandle that will follow this generated code. Passing in null will generate one unnecessary GOTO * instruction. - * + * * @returns the instruction list representing this expression */ public static InstructionList renderTest(InstructionFactory fact, BcelWorld world, Test e, InstructionHandle sk, @@ -170,7 +170,7 @@ public final class BcelRenderer implements ITestVisitor, IExprVisitor { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.ast.ITestVisitor#visit(org.aspectj.weaver.internal.tools.MatchingContextBasedTest) */ public void visit(MatchingContextBasedTest matchingContextTest) { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java index 5144976d3..c64ffde82 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.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/weaver/src/main/java/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelTypeMunger.java index 8f4009eea..b8552dbb2 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelTypeMunger.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelTypeMunger.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 * ******************************************************************/ @@ -757,7 +757,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { LazyMethodGen ret = new LazyMethodGen(member.getModifiers(), returnType, member.getName(), parameterTypes, UnresolvedType.getNames(member .getExceptions()), gen); - + // 43972 : Static crosscutting makes interfaces unusable for javac // ret.makeSynthetic(); return ret; @@ -1291,7 +1291,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { /** * Create a bridge method for a particular munger. - * + * * @param world * @param munger * @param unMangledInterMethod the method to bridge 'to' that we have already created in the 'subtype' @@ -1307,7 +1307,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { int pos = 0; // The bridge method in this type will have the same signature as the one in the supertype - LazyMethodGen bridgeMethod = makeMethodGen(clazz, theBridgeMethod); + LazyMethodGen bridgeMethod = makeMethodGen(clazz, theBridgeMethod); bridgeMethod.setAccessFlags(bridgeMethod.getAccessFlags() | 0x00000040 /* BRIDGE = 0x00000040 */); // UnresolvedType[] newParams = munger.getSignature().getParameterTypes(); Type returnType = BcelWorld.makeBcelType(theBridgeMethod.getReturnType()); @@ -1777,7 +1777,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { body.append(InstructionConstants.RETURN); addNeededSuperCallMethods(weaver, onType, munger.getSuperMethodsCalled()); - + return true; } @@ -1905,7 +1905,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { if (Modifier.isStatic(field.getModifiers())) { throw new RuntimeException("unimplemented"); } - + boolean alreadyExists = false; // only need to check for version 2 style mungers if (munger.version==NewFieldTypeMunger.VersionTwo) { @@ -1916,11 +1916,11 @@ public class BcelTypeMunger extends ConcreteTypeMunger { } } } - + // FieldGen fg = makeFieldGen(gen, AjcMemberMaker.interFieldInterfaceField(field, onType, aspectType)); ResolvedMember newField = AjcMemberMaker.interFieldInterfaceField(field, onType, aspectType, munger.version == NewFieldTypeMunger.VersionTwo); String fieldName = newField.getName(); - + Type fieldType = BcelWorld.makeBcelType(field.getType()); if (!alreadyExists) { weaver.addInitializer(this); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelVar.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelVar.java index ce45fdf12..69d022243 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelVar.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelVar.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.bcel; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeakClassLoaderReference.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeakClassLoaderReference.java index aac294fa4..c369ec736 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeakClassLoaderReference.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeakClassLoaderReference.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.bcel; @@ -29,8 +29,8 @@ import org.aspectj.weaver.WeakClassLoaderReference; * 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 */ public class BcelWeakClassLoaderReference extends WeakClassLoaderReference implements ClassLoaderReference { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java index 110d58c88..12b8cb2c0 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java @@ -2,9 +2,9 @@ * 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 + * 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.bcel; @@ -95,7 +95,7 @@ import org.aspectj.weaver.tools.Trace; import org.aspectj.weaver.tools.TraceFactory; /** - * + * * @author PARC * @author Andy Clement * @author Alexandre Vasseur @@ -143,7 +143,7 @@ public class BcelWeaver { /** * Add the given aspect to the weaver. The type is resolved to support DOT for static inner classes as well as DOLLAR - * + * * @param aspectName * @return aspect */ @@ -221,13 +221,13 @@ public class BcelWeaver { } else { IMessage message = new Message("Cannot register '"+aspectName+"' because the type found with that name is not an aspect", null, true); world.getMessageHandler().handleMessage(message); - } + } return null; } } /** - * + * * @param inFile directory containing classes or zip/jar class archive */ public void addLibraryJarFile(File inFile) throws IOException { @@ -279,7 +279,7 @@ public class BcelWeaver { /** * Look for .class files that represent aspects in the supplied directory - return the list of accumulated aspects. - * + * * @param directory the directory in which to look for Aspect .class files * @return the list of discovered aspects * @throws FileNotFoundException @@ -307,7 +307,7 @@ public class BcelWeaver { /** * Determine if the supplied bytes represent an aspect, if they do then create a ResolvedType instance for the aspect and return * it, otherwise return null - * + * * @param classbytes the classbytes that might represent an aspect * @param name the name of the class * @param directory directory which contained the class file @@ -347,7 +347,7 @@ public class BcelWeaver { /** * Add any .class files in the directory to the outdir. Anything other than .class files in the directory (or its * subdirectories) are considered resources and are also copied. - * + * */ public List<UnwovenClassFile> addDirectoryContents(File inFile, File outDir) throws IOException { List<UnwovenClassFile> addedClassFiles = new ArrayList<>(); @@ -1084,7 +1084,7 @@ public class BcelWeaver { if (classFile.shouldBeWoven()) { String className = classFile.getClassName(); BcelObjectType classType = getClassType(className); - + // null return from getClassType() means the delegate is an eclipse // source type - so // there *cant* be any reweavable state... (he bravely claimed...) @@ -1143,7 +1143,7 @@ public class BcelWeaver { if (theType.isAspect()) { BcelObjectType classType = BcelWorld.getBcelObjectType(theType); if (classType == null) { - + // Sometimes.. if the Bcel Delegate couldn't be found then a // problem occurred at compile time - on // a previous compiler run. In this case I assert the @@ -1155,7 +1155,7 @@ public class BcelWeaver { if (theDelegate.getClass().getName().endsWith("EclipseSourceType")) { continue; } - + throw new BCException("Can't find bcel delegate for " + className + " type=" + theType.getClass()); } weaveAndNotify(classFile, classType, requestor); @@ -1177,16 +1177,16 @@ public class BcelWeaver { if (!theType.isAspect()) { BcelObjectType classType = BcelWorld.getBcelObjectType(theType); if (classType == null) { - + // bug 119882 - see above comment for bug 113531 ReferenceTypeDelegate theDelegate = ((ReferenceType) theType).getDelegate(); - + // TODO urgh - put a method on the interface to check this, // string compare is hideous if (theDelegate.getClass().getName().endsWith("EclipseSourceType")) { continue; } - + throw new BCException("Can't find bcel delegate for " + className + " type=" + theType.getClass()); } weaveAndNotify(classFile, classType, requestor); @@ -1296,7 +1296,7 @@ public class BcelWeaver { * 'typeToWeave' is one from the 'typesForWeaving' list. This routine ensures we process supertypes (classes/interfaces) of * 'typeToWeave' that are in the 'typesForWeaving' list before 'typeToWeave' itself. 'typesToWeave' is then removed from the * 'typesForWeaving' list. - * + * * Note: Future gotcha in here ... when supplying partial hierarchies, this algorithm may break down. If you have a hierarchy * A>B>C and only give A and C to the weaver, it may choose to weave them in either order - but you'll probably have other * problems if you are supplying partial hierarchies like that ! @@ -1328,7 +1328,7 @@ public class BcelWeaver { } ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.PROCESSING_DECLARE_PARENTS, resolvedTypeToWeave.getName()); - // If A was processed before B (and was declared 'class A implements B') then there is no need to complete B again, it + // If A was processed before B (and was declared 'class A implements B') then there is no need to complete B again, it // will have been done whilst processing A. if (!resolvedTypeToWeave.isTypeHierarchyComplete()) { weaveParentTypeMungers(resolvedTypeToWeave); @@ -1397,7 +1397,7 @@ public class BcelWeaver { WeaverMessages.format(WeaverMessages.MUST_KEEP_OVERWEAVING_ONCE_START, className))); // onType.getName(), annoX.getTypeName(), annoX.getValidTargets()), -// decA.getSourceLocation())); +// decA.getSourceLocation())); } else { byte[] bytes = wsi.getUnwovenClassFileData(classType.getJavaClass().getBytes()); JavaClass newJavaClass = Utility.makeJavaClass(classType.getJavaClass().getFileName(), bytes); @@ -1468,7 +1468,7 @@ public class BcelWeaver { /** * Weaves new parents and annotations onto a type ("declare parents" and "declare @type") - * + * * Algorithm: 1. First pass, do parents then do annotations. During this pass record: - any parent mungers that don't match but * have a non-wild annotation type pattern - any annotation mungers that don't match 2. Multiple subsequent passes which go over * the munger lists constructed in the first pass, repeatedly applying them until nothing changes. FIXME asc confirm that @@ -1945,7 +1945,7 @@ public class BcelWeaver { /** * Perform a fast match of the specified list of shadowmungers against the specified type. A subset of those that might match is * returned. - * + * * @param list list of all shadow mungers that might match * @param type the target type * @return a list of shadow mungers that might match with those that cannot (according to fast match rules) removed diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeavingSupport.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeavingSupport.java index 120df80c2..801f8f8b6 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeavingSupport.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeavingSupport.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.bcel; @@ -25,7 +25,7 @@ import org.aspectj.weaver.patterns.Pointcut; /** * Bcel implementation of the weaving support required in a BcelWorld which will actually modify bytecode. - * + * * @author Andy Clement */ public class BcelWeavingSupport implements IWeavingSupport { @@ -47,7 +47,7 @@ public class BcelWeavingSupport implements IWeavingSupport { /** * Register a munger for perclause @AJ aspect so that we add aspectOf(..) to them as needed - * + * * @param aspect * @param kind * @return munger diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.java index 65c3da11a..e7fdb4a10 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.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 @@ -299,7 +299,7 @@ public class BcelWorld extends World implements Repository { /** * Build a World from a ClassLoader, for LTW support - * + * * @param loader * @param handler * @param xrefHandler @@ -355,7 +355,7 @@ public class BcelWorld extends World implements Repository { } return ret; } - + public static Type makeBcelType(String type) { return Type.getType(type); } @@ -624,7 +624,7 @@ public class BcelWorld extends World implements Repository { UnresolvedType declaringType = null; String signature = ii.getSignature(cpg); - + // 307147 if (name.startsWith("ajc$privMethod$")) { // The invoke is on a privileged accessor. These may be created for different @@ -833,7 +833,7 @@ public class BcelWorld extends World implements Repository { } return didSomething; } - + /** * Apply the specified declare @field construct to any matching fields in the specified type. * @param deca the declare annotation targeting fields @@ -854,7 +854,7 @@ public class BcelWorld extends World implements Repository { } return changedType; } - + /** * Checks for an @target() on the annotation and if found ensures it allows the annotation to be attached to the target type * that matched. @@ -904,7 +904,7 @@ public class BcelWorld extends World implements Repository { anAnnotationChangeOccurred = true; } } - + // apply declare @field for (DeclareAnnotation deca: getCrosscuttingMembersSet().getDeclareAnnotationOnFields()) { if (applyDeclareAtField(deca,onType)) { @@ -928,7 +928,7 @@ public class BcelWorld extends World implements Repository { anAnnotationChangeOccurred = true; } } - + for (DeclareAnnotation deca: getCrosscuttingMembersSet().getDeclareAnnotationOnFields()) { if (applyDeclareAtField(deca, onType)) { anAnnotationChangeOccurred = true; @@ -936,7 +936,7 @@ public class BcelWorld extends World implements Repository { } decpToRepeat = decpToRepeatNextTime; } - + } @Override @@ -979,7 +979,7 @@ public class BcelWorld extends World implements Repository { /** * These are aop.xml files that can be used to alter the aspects that actually apply from those passed in - and also their scope * of application to other files in the system. - * + * * @param xmlFiles list of File objects representing any aop.xml files passed in to configure the build process */ public void setXmlFiles(List<File> xmlFiles) { @@ -1068,7 +1068,7 @@ public class BcelWorld extends World implements Repository { // Record that it has an invalid type reference aspectRequiredTypes.put(aspectName,requiredTypeName); } - } + } if (anythingMissing) { return true; } @@ -1127,7 +1127,7 @@ public class BcelWorld extends World implements Repository { * it will initialize and transform those definitions into an optimized set of values (eg. resolve type patterns and string * names to real entities). It can then answer questions quickly: (1) is this aspect included in the weaving? (2) Is there a * scope specified for this aspect and does it include type X? - * + * */ static class WeavingXmlConfig { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/ClassPathManager.java b/weaver/src/main/java/org/aspectj/weaver/bcel/ClassPathManager.java index 2b8cc5ceb..a090e7189 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/ClassPathManager.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/ClassPathManager.java @@ -2,9 +2,9 @@ * Copyright (c) 2002, 2017 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: * Palo Alto Research Center, Incorporated (PARC). diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/ExceptionRange.java b/weaver/src/main/java/org/aspectj/weaver/bcel/ExceptionRange.java index 5e74627c3..06ac1f03a 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/ExceptionRange.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/ExceptionRange.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.bcel; @@ -21,7 +21,7 @@ import org.aspectj.weaver.UnresolvedType; * used when we pack the exception table into a method... the exception table should be sorted from high to low priority. Exceptions * we generate for advice is either high priority (higher than anything coming from the original method... most kinds of * non-execution advice) or low priority (lower than anything coming from the original method, for execution advice). - * + * * <p> * ??? This does not account for handler, or any other "statement-level" advice. When such statement level advice happens, we may * want to go to a float level, so we can set the priority of advice to be lower than anything it encloses, and higher than anything @@ -41,7 +41,7 @@ public final class ExceptionRange extends Range { /** * After this constructor is called, this range is not well situated unless {@link #associateWithTargets} is called - * + * * XXX priority should be fixed */ public ExceptionRange(InstructionList body, UnresolvedType exceptionType, int priority) { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/ExtensibleURLClassLoader.java b/weaver/src/main/java/org/aspectj/weaver/bcel/ExtensibleURLClassLoader.java index 76bd4b84b..54aefa4b8 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/ExtensibleURLClassLoader.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/ExtensibleURLClassLoader.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2004 IBM Corporation - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Matthew Webster, Adrian Colyer, - * Martin Lippert 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: + * Matthew Webster, Adrian Colyer, + * Martin Lippert initial implementation * Andy Clement * Roy Varghese - Bug 473555 * ******************************************************************/ @@ -103,7 +103,7 @@ public abstract class ExtensibleURLClassLoader extends URLClassLoader { int offset = className.lastIndexOf('.'); return (offset == -1) ? null : className.substring(0, offset); } - + @Override public void close() throws IOException { super.close(); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/FakeAnnotation.java b/weaver/src/main/java/org/aspectj/weaver/bcel/FakeAnnotation.java index 4194e66e9..7ffc717b1 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/FakeAnnotation.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/FakeAnnotation.java @@ -2,9 +2,9 @@ * Copyright (c) 2005 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * initial implementation Andy Clement diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/IfFinder.java b/weaver/src/main/java/org/aspectj/weaver/bcel/IfFinder.java index c66aa8939..df0f3baf2 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/IfFinder.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/IfFinder.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 initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java index 22c7945f0..80eb20acf 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java @@ -2,9 +2,9 @@ * 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 + * 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/weaver/src/main/java/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyMethodGen.java index 7bac02dad..a6c8dd2ea 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyMethodGen.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyMethodGen.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.bcel; @@ -67,12 +67,12 @@ import org.aspectj.weaver.tools.Traceable; /** * A LazyMethodGen should be treated as a MethodGen. It's our way of abstracting over the low-level Method objects. It converts * through {@link MethodGen} to create and to serialize, but that's it. - * + * * <p> * At any rate, there are two ways to create LazyMethodGens. One is from a method, which does work through MethodGen to do the * correct thing. The other is the creation of a completely empty LazyMethodGen, and it is used when we're constructing code from * scratch. - * + * * <p> * We stay away from targeters for rangey things like Shadows and Exceptions. */ @@ -97,7 +97,7 @@ public final class LazyMethodGen implements Traceable { int highestLineNumber = 0; boolean wasPackedOptimally = false; private Method savedMethod = null; - + // Some tools that may post process the output bytecode do not long local variable tables // to be generated as one reason the tables may be missing in the first place is because // the bytecode is odd. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=470658 @@ -105,14 +105,14 @@ public final class LazyMethodGen implements Traceable { /* * We use LineNumberTags and not Gens. - * + * * This option specifies whether we let the BCEL classes create LineNumberGens and LocalVariableGens or if we make it create * LineNumberTags and LocalVariableTags. Up until 1.5.1 we always created Gens - then on return from the MethodGen ctor we took * them apart, reprocessed them all and created Tags. (see unpackLocals/unpackLineNumbers). As we have our own copy of Bcel, why * not create the right thing straightaway? So setting this to true will call the MethodGen ctor() in such a way that it creates * Tags - removing the need for unpackLocals/unpackLineNumbers - HOWEVER see the ensureAllLineNumberSetup() method for some * other relevant info. - * + * * Whats the difference between a Tag and a Gen? A Tag is more lightweight, it doesn't know which instructions it targets, it * relies on the instructions targettingit - this reduces the amount of targeter manipulation we have to do. */ @@ -129,14 +129,14 @@ public final class LazyMethodGen implements Traceable { List<BcelShadow> matchedShadows; // Used for interface introduction - this is the type of the interface the method is technically on public ResolvedType definingType = null; - + static class LightweightBcelMethod extends BcelMethod { LightweightBcelMethod(BcelObjectType declaringType, Method method) { super(declaringType, method); // TODO Auto-generated constructor stub } - + } public LazyMethodGen(int modifiers, Type returnType, String name, Type[] paramTypes, String[] declaredExceptions, @@ -319,7 +319,7 @@ public final class LazyMethodGen implements Traceable { memberView.addParameterAnnotation(parameterNumber, anno); } } - + public ResolvedType[] getAnnotationTypes() { initialize(); if (memberView == null && newAnnotations!=null && newAnnotations.size()!=0) { @@ -332,7 +332,7 @@ public final class LazyMethodGen implements Traceable { } return null; } - + public AnnotationAJ[] getAnnotations() { initialize(); if (memberView == null && newAnnotations!=null && newAnnotations.size()!=0) { @@ -1019,15 +1019,15 @@ public final class LazyMethodGen implements Traceable { } else { packBody(gen); } - - gen.setMaxLocals(true); + + gen.setMaxLocals(true); gen.setMaxStack(); } else { gen.setInstructionList(null); } return gen; } - + private boolean hasAttribute(String attributeName) { for (Attribute attr: attributes) { if (attr.getName().equals(attributeName)) { @@ -1584,7 +1584,7 @@ public final class LazyMethodGen implements Traceable { /** * A good body is a body with the following properties: - * + * * <ul> * <li>For each branch instruction S in body, target T of S is in body. * <li>For each branch instruction S in body, target T of S has S as a targeter. @@ -1597,7 +1597,7 @@ public final class LazyMethodGen implements Traceable { * <li>For each exception range R in body, let T := R.handler. T is in body, and R is one of T's targeters * <li>All ranges are properly nested: For all ranges Q and R, if Q.start preceeds R.start, then R.end preceeds Q.end. * </ul> - * + * * Where the shorthand "R is in body" means "R.start is in body, R.end is in body, and any InstructionHandle stored in a field * of R (such as an exception handle) is in body". */ diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/Range.java b/weaver/src/main/java/org/aspectj/weaver/bcel/Range.java index eaebad695..2ca002b6b 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/Range.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/Range.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.bcel; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/ShadowRange.java b/weaver/src/main/java/org/aspectj/weaver/bcel/ShadowRange.java index d25a4b1ee..2aa7a7f16 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/ShadowRange.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/ShadowRange.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.bcel; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/TypeAnnotationAccessVar.java b/weaver/src/main/java/org/aspectj/weaver/bcel/TypeAnnotationAccessVar.java index e23174389..d982fd4b4 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/TypeAnnotationAccessVar.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/TypeAnnotationAccessVar.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.bcel; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/TypeDelegateResolver.java b/weaver/src/main/java/org/aspectj/weaver/bcel/TypeDelegateResolver.java index 2a29c927a..8935efeb4 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/TypeDelegateResolver.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/TypeDelegateResolver.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://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Andy Clement, SpringSource @@ -17,8 +17,8 @@ import org.aspectj.weaver.ReferenceTypeDelegate; /** * A type delegate resolver is able to create type delegates for a named reference type. A type delegate will implement * ReferenceTypeDelegate. There are three kind of delegate already in existence: those created for eclipse structures, those - * created for bytecode structures, and those created based on reflection. - * + * created for bytecode structures, and those created based on reflection. + * * @author Andy Clement */ public interface TypeDelegateResolver { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/UnwovenClassFile.java b/weaver/src/main/java/org/aspectj/weaver/bcel/UnwovenClassFile.java index 7076316f7..a33053424 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/UnwovenClassFile.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/UnwovenClassFile.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.bcel; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/UnwovenClassFileWithThirdPartyManagedBytecode.java b/weaver/src/main/java/org/aspectj/weaver/bcel/UnwovenClassFileWithThirdPartyManagedBytecode.java index 18edc8413..832912704 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/UnwovenClassFileWithThirdPartyManagedBytecode.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/UnwovenClassFileWithThirdPartyManagedBytecode.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 *******************************************************************************/ diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/Utility.java b/weaver/src/main/java/org/aspectj/weaver/bcel/Utility.java index 368c6b34c..d9fc3396b 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/Utility.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/Utility.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.bcel; @@ -201,7 +201,7 @@ public class Utility { if (m.getEnclosingClass().isInterface()) { if (m.isStatic()) { // For static methods on interfaces - kind = Constants.INVOKESTATIC; + kind = Constants.INVOKESTATIC; } else { kind = Constants.INVOKEINTERFACE; } @@ -218,7 +218,7 @@ public class Utility { /** * Create an invoke instruction - * + * * @param fact * @param kind INVOKEINTERFACE, INVOKEVIRTUAL.. * @param member @@ -478,7 +478,7 @@ public class Utility { /** * replace an instruction handle with another instruction, in this case, a branch instruction. - * + * * @param ih the instruction handle to replace. * @param replacementInstructions the branch instruction to replace ih with * @param enclosingMethod where to find ih's instruction list. @@ -493,7 +493,7 @@ public class Utility { /** * delete an instruction handle and retarget all targeters of the deleted instruction to the next instruction. Obviously, this * should not be used to delete a control transfer instruction unless you know what you're doing. - * + * * @param ih the instruction handle to delete. * @param enclosingMethod where to find ih's instruction list. */ @@ -503,7 +503,7 @@ public class Utility { /** * delete an instruction handle and retarget all targeters of the deleted instruction to the provided target. - * + * * @param ih the instruction handle to delete * @param retargetTo the instruction handle to retarget targeters of ih to. * @param enclosingMethod where to find ih's instruction list. @@ -523,11 +523,11 @@ public class Utility { /** * Fix for Bugzilla #39479, #40109 patch contributed by Andy Clement - * + * * Need to manually copy Select instructions - if we rely on the the 'fresh' object created by copy(), the InstructionHandle * array 'targets' inside the Select object will not have been deep copied, so modifying targets in fresh will modify the * original Select - not what we want ! (It is a bug in BCEL to do with cloning Select objects). - * + * * <pre> * declare error: * call(* Instruction.copy()) && within(org.aspectj.weaver) @@ -713,4 +713,4 @@ public class Utility { return new Unknown(nameIndex, length, bytes, pool); } -}
\ No newline at end of file +} diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/asm/AsmDetector.java b/weaver/src/main/java/org/aspectj/weaver/bcel/asm/AsmDetector.java index 5fa7bd006..86571a0c7 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/asm/AsmDetector.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/asm/AsmDetector.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 diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java b/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java index 07f3435ae..2610174df 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java @@ -2,9 +2,9 @@ * Copyright (c) 2008, 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 * * Contributors: * Andy Clement diff --git a/weaver/src/main/java/org/aspectj/weaver/loadtime/IWeavingContext.java b/weaver/src/main/java/org/aspectj/weaver/loadtime/IWeavingContext.java index e2dfd928e..2561a9c6c 100644 --- a/weaver/src/main/java/org/aspectj/weaver/loadtime/IWeavingContext.java +++ b/weaver/src/main/java/org/aspectj/weaver/loadtime/IWeavingContext.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: * David Knibb initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/Definition.java b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/Definition.java index e706b240e..962051e74 100644 --- a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/Definition.java +++ b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/Definition.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 @@ -18,7 +18,7 @@ import java.util.Map; /** * A POJO that contains raw strings from the XML (sort of XMLBean for our simple LTW DTD) - * + * * @author Alexandre Vasseur (alex AT gnilux DOT com) */ public class Definition { @@ -156,16 +156,16 @@ public class Definition { public enum AdviceKind { Before, After, AfterReturning, AfterThrowing, Around; } - + public enum DeclareAnnotationKind { Method, Field, Type; } - + public static class DeclareAnnotation { public final DeclareAnnotationKind declareAnnotationKind; public final String pattern; public final String annotation; - + public DeclareAnnotation(DeclareAnnotationKind kind, String pattern, String annotation) { this.declareAnnotationKind = kind; this.pattern = pattern; diff --git a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.java b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.java index cdecd6aaa..eddc5bd32 100644 --- a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.java +++ b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.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 @@ -32,7 +32,7 @@ import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.XMLReaderFactory; /** - * + * * @author Alexandre Vasseur * @author A. Nevado * @author Andy Clement diff --git a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/LightXMLParser.java b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/LightXMLParser.java index e93bc896c..119ba8a51 100644 --- a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/LightXMLParser.java +++ b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/LightXMLParser.java @@ -2,9 +2,9 @@ * 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 + * 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: * Abraham Nevado - Lucierna initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java index 8d912a317..c73b51af1 100644 --- a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java +++ b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java @@ -2,13 +2,13 @@ * 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 + * 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: * Abraham Nevado - Lucierna initial implementation - * Just a slight variation of current DocumentParser.java from Alexandre Vasseur. + * Just a slight variation of current DocumentParser.java from Alexandre Vasseur. *******************************************************************************/ package org.aspectj.weaver.loadtime.definition; @@ -26,7 +26,7 @@ import org.xml.sax.SAXException; /** * This class has been created to avoid deadlocks when instrumenting SAXParser. * So it is used as a wrapper for the ligthweigh XML parser LightXMLParser. - * + * * @author A. Nevado */ public class SimpleAOPParser { @@ -183,7 +183,7 @@ public class SimpleAOPParser { } } } - + } } else if (BEFORE_ELEMENT.equals(qName) && m_inAspects ) { diff --git a/weaver/src/main/java/org/aspectj/weaver/ltw/LTWWorld.java b/weaver/src/main/java/org/aspectj/weaver/ltw/LTWWorld.java index ca4779526..7dc8b7dd4 100644 --- a/weaver/src/main/java/org/aspectj/weaver/ltw/LTWWorld.java +++ b/weaver/src/main/java/org/aspectj/weaver/ltw/LTWWorld.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: * Ron Bodkin Initial implementation * ******************************************************************/ package org.aspectj.weaver.ltw; @@ -35,14 +35,14 @@ import org.aspectj.weaver.reflect.ReflectionWorld; /** * @author adrian * @author Ron Bodkin - * + * * For use in LT weaving - * + * * Backed by both a BcelWorld and a ReflectionWorld - * + * * Needs a callback when a woven class is defined This is the trigger for us to ditch the class from Bcel and cache it in * the reflective world instead. - * + * * Create by passing in a classloader, message handler */ public class LTWWorld extends BcelWorld implements IReflectionWorld { @@ -156,7 +156,7 @@ public class LTWWorld extends BcelWorld implements IReflectionWorld { /** * Remove this class from the typeMap. Call back to be made from a publishing class loader The class loader should, ideally, * make this call on each not yet working - * + * * @param clazz */ public void loadedClass(Class clazz) { @@ -170,7 +170,7 @@ public class LTWWorld extends BcelWorld implements IReflectionWorld { /* * (non-Javadoc) - * + * * @see org.aspectj.weaver.reflect.IReflectionWorld#resolve(java.lang.Class) */ public ResolvedType resolve(Class aClass) { diff --git a/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipProvider.java b/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipProvider.java index cf9bb1b94..0dbae4188 100644 --- a/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipProvider.java +++ b/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipProvider.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.model; @@ -929,12 +929,12 @@ public class AsmRelationshipProvider { /** * Finds or creates a code IProgramElement for the given shadow. - * + * * The byteCodeName of the created node is set to 'shadowSig.getName() + "!" + counter', eg "println!3". The counter is the * occurence count of children within the enclosingNode which have the same name. So, for example, if a method contains two * System.out.println statements, the first one will have byteCodeName 'println!1' and the second will have byteCodeName * 'println!2'. This is to ensure the two nodes have unique handles when the handles do not depend on sourcelocations. - * + * * Currently the shadows are examined in the sequence they appear in the source file. This means that the counters are * consistent over incremental builds. All aspects are compiled up front and any new aspect created will force a full build. * Moreover, if the body of the enclosingShadow is changed, then the model for this is rebuilt from scratch. diff --git a/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipUtils.java b/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipUtils.java index 01cedfaa6..053a88abe 100644 --- a/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipUtils.java +++ b/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipUtils.java @@ -1,11 +1,11 @@ /******************************************************************** - * 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: IBM Corporation - initial API and implementation + * Copyright (c) 2006 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: IBM Corporation - initial API and implementation * Helen Hawkins - initial version *******************************************************************/ package org.aspectj.weaver.model; diff --git a/weaver/src/main/java/org/aspectj/weaver/reflect/ArgNameFinder.java b/weaver/src/main/java/org/aspectj/weaver/reflect/ArgNameFinder.java index 25945a90a..f40ef1983 100644 --- a/weaver/src/main/java/org/aspectj/weaver/reflect/ArgNameFinder.java +++ b/weaver/src/main/java/org/aspectj/weaver/reflect/ArgNameFinder.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; diff --git a/weaver/src/main/java/org/aspectj/weaver/reflect/DeferredResolvedPointcutDefinition.java b/weaver/src/main/java/org/aspectj/weaver/reflect/DeferredResolvedPointcutDefinition.java index b0af93f16..aafe91fa0 100644 --- a/weaver/src/main/java/org/aspectj/weaver/reflect/DeferredResolvedPointcutDefinition.java +++ b/weaver/src/main/java/org/aspectj/weaver/reflect/DeferredResolvedPointcutDefinition.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 * ******************************************************************/ @@ -21,9 +21,9 @@ import org.aspectj.weaver.UnresolvedType; * algorithm proceeds in two phases, first we create and store instances of this class in the pointcuts array, and once that is * done, we come back round and resolve the actual pointcut expression. This means that if we recurse doing resolution, we will find * the named pointcut we are looking for! - * + * * @author adrian colyer - * + * */ public class DeferredResolvedPointcutDefinition extends ResolvedPointcutDefinition { diff --git a/weaver/src/main/java/org/aspectj/weaver/reflect/InternalUseOnlyPointcutParser.java b/weaver/src/main/java/org/aspectj/weaver/reflect/InternalUseOnlyPointcutParser.java index 8d81d7b08..90364493c 100644 --- a/weaver/src/main/java/org/aspectj/weaver/reflect/InternalUseOnlyPointcutParser.java +++ b/weaver/src/main/java/org/aspectj/weaver/reflect/InternalUseOnlyPointcutParser.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 * ******************************************************************/ @@ -23,21 +23,21 @@ public class InternalUseOnlyPointcutParser extends PointcutParser { setClassLoader(classLoader); setWorld(world); } - + public InternalUseOnlyPointcutParser(ClassLoader classLoader) { super(); setClassLoader(classLoader); } - + public Pointcut resolvePointcutExpression( - String expression, + String expression, Class inScope, PointcutParameter[] formalParameters) { return super.resolvePointcutExpression(expression, inScope, formalParameters); } - + public Pointcut concretizePointcutExpression(Pointcut pc, Class inScope, PointcutParameter[] formalParameters) { return super.concretizePointcutExpression(pc, inScope, formalParameters); } - + } diff --git a/weaver/src/main/java/org/aspectj/weaver/reflect/Java15AnnotationFinder.java b/weaver/src/main/java/org/aspectj/weaver/reflect/Java15AnnotationFinder.java index 842863ae3..6cfc4fb77 100644 --- a/weaver/src/main/java/org/aspectj/weaver/reflect/Java15AnnotationFinder.java +++ b/weaver/src/main/java/org/aspectj/weaver/reflect/Java15AnnotationFinder.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; @@ -31,7 +31,7 @@ import org.aspectj.weaver.bcel.BcelAnnotation; import org.aspectj.weaver.bcel.BcelWeakClassLoaderReference; /** - * + * * @author Adrian Colyer * @author Andy Clement */ @@ -43,7 +43,7 @@ public class Java15AnnotationFinder implements AnnotationFinder, ArgNameFinder { private BcelWeakClassLoaderReference classLoaderRef; private World world; private static boolean useCachingClassLoaderRepository; - + static { try { useCachingClassLoaderRepository = System.getProperty("Xset:bcelRepositoryCaching","true").equalsIgnoreCase("true"); diff --git a/weaver/src/main/java/org/aspectj/weaver/reflect/Java15GenericSignatureInformationProvider.java b/weaver/src/main/java/org/aspectj/weaver/reflect/Java15GenericSignatureInformationProvider.java index c9de9517e..3d298023e 100644 --- a/weaver/src/main/java/org/aspectj/weaver/reflect/Java15GenericSignatureInformationProvider.java +++ b/weaver/src/main/java/org/aspectj/weaver/reflect/Java15GenericSignatureInformationProvider.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; @@ -27,11 +27,11 @@ public class Java15GenericSignatureInformationProvider implements GenericSignatureInformationProvider { private final World world; - + public Java15GenericSignatureInformationProvider(World forWorld) { this.world = forWorld; } - + /* (non-Javadoc) * @see org.aspectj.weaver.reflect.GenericSignatureInformationProvider#getGenericParameterTypes(org.aspectj.weaver.reflect.ReflectionBasedResolvedMemberImpl) */ @@ -60,12 +60,12 @@ public class Java15GenericSignatureInformationProvider implements } else if (member instanceof Method) { return typeConverter.fromType(((Method)member).getGenericReturnType()); } else if (member instanceof Constructor) { - return typeConverter.fromType(((Constructor)member).getDeclaringClass()); + return typeConverter.fromType(((Constructor)member).getDeclaringClass()); } else { - throw new IllegalStateException("unexpected member type: " + member); + throw new IllegalStateException("unexpected member type: " + member); } } - + /* (non-Javadoc) * @see org.aspectj.weaver.reflect.GenericSignatureInformationProvider#isBridge() */ @@ -77,7 +77,7 @@ public class Java15GenericSignatureInformationProvider implements return false; } } - + /* (non-Javadoc) * @see org.aspectj.weaver.reflect.GenericSignatureInformationProvider#isVarArgs() */ @@ -86,12 +86,12 @@ public class Java15GenericSignatureInformationProvider implements if (member instanceof Method) { return ((Method)member).isVarArgs(); } else if (member instanceof Constructor) { - return ((Constructor)member).isVarArgs(); + return ((Constructor)member).isVarArgs(); } else { return false; } } - + /* (non-Javadoc) * @see org.aspectj.weaver.reflect.GenericSignatureInformationProvider#isSynthetic() */ diff --git a/weaver/src/main/java/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java b/weaver/src/main/java/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java index 0edd1d40e..2fccd1dd7 100644 --- a/weaver/src/main/java/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java +++ b/weaver/src/main/java/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.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; @@ -38,7 +38,7 @@ import org.aspectj.weaver.tools.PointcutParameter; /** * Provides Java 5 behaviour in reflection based delegates (overriding 1.4 behaviour from superclass where * appropriate) - * + * * @author Adrian Colyer * @author Andy Clement */ @@ -94,7 +94,7 @@ public class Java15ReflectionBasedReferenceTypeDelegate extends ReflectionBasedR } return annotations; } - + @Override public boolean hasAnnotations() { if (annotations == null) { @@ -373,7 +373,7 @@ public class Java15ReflectionBasedReferenceTypeDelegate extends ReflectionBasedR public boolean isAnonymous() { return this.myClass.isAnonymousClass(); } - + @Override public boolean isNested() { return this.myClass.isMemberClass(); @@ -382,7 +382,7 @@ public class Java15ReflectionBasedReferenceTypeDelegate extends ReflectionBasedR @Override public ResolvedType getOuterClass() { return ReflectionBasedReferenceTypeDelegateFactory.resolveTypeInWorld( - myClass.getEnclosingClass(),world); + myClass.getEnclosingClass(),world); } } diff --git a/weaver/src/main/java/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java b/weaver/src/main/java/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java index 74477d143..799dbdfdc 100644 --- a/weaver/src/main/java/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java +++ b/weaver/src/main/java/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java @@ -1,10 +1,10 @@ /* ******************************************************************* * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * 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; @@ -26,7 +26,7 @@ import org.aspectj.weaver.World; /** * Handles the translation of java.lang.reflect.Type objects into AspectJ UnresolvedTypes. - * + * * @author Adrian Colyer */ public class JavaLangTypeToResolvedTypeConverter { @@ -49,14 +49,14 @@ public class JavaLangTypeToResolvedTypeConverter { String name = clazz.getName(); /** * getName() can return: - * - * 1. If this class object represents a reference type that is not an - * array type then the binary name of the class is returned + * + * 1. If this class object represents a reference type that is not an + * array type then the binary name of the class is returned * 2. If this class object represents a primitive type or void, then * the name returned is a String equal to the Java language keyword - * corresponding to the primitive type or void. + * corresponding to the primitive type or void. * 3. If this class object represents a class of arrays, then the internal - * form of the name consists of the name of the element type preceded by + * form of the name consists of the name of the element type preceded by * one or more '[' characters representing the depth of the array nesting. */ if (clazz.isArray()) { diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/Jdk14Trace.java b/weaver/src/main/java/org/aspectj/weaver/tools/Jdk14Trace.java index 4fc7a1087..a51349063 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/Jdk14Trace.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/Jdk14Trace.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 *******************************************************************************/ @@ -19,19 +19,19 @@ public class Jdk14Trace extends AbstractTrace { private Logger logger; private String name; - + public Jdk14Trace (Class clazz) { super(clazz); this.name = clazz.getName(); this.logger = Logger.getLogger(name); } - + public void enter(String methodName, Object thiz, Object[] args) { if (logger.isLoggable(Level.FINE)) { logger.entering(name,methodName,formatObj(thiz)); if (args != null && logger.isLoggable(Level.FINER)) { logger.entering(name,methodName,formatObjects(args)); - } + } } } @@ -62,7 +62,7 @@ public class Jdk14Trace extends AbstractTrace { logger.logp(Level.FINER,name,methodName,"EVENT",formatObj(thiz)); if (args != null && logger.isLoggable(Level.FINER)) { logger.logp(Level.FINER,name,methodName,"EVENT",formatObjects(args)); - } + } } } @@ -122,5 +122,5 @@ public class Jdk14Trace extends AbstractTrace { logger.log(Level.SEVERE,message,th); } } - + } diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/Jdk14TraceFactory.java b/weaver/src/main/java/org/aspectj/weaver/tools/Jdk14TraceFactory.java index 4043d1d33..91d5eafa0 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/Jdk14TraceFactory.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/Jdk14TraceFactory.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 *******************************************************************************/ diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java index a27824635..00346a0fb 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.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, John Kew + Lyor Goldstein (caching) diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractCacheBacking.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractCacheBacking.java index 1fc3d4e61..627f6fb85 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractCacheBacking.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractCacheBacking.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractFileCacheBacking.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractFileCacheBacking.java index 5447c158b..40858277e 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractFileCacheBacking.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractFileCacheBacking.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation @@ -19,7 +19,7 @@ import java.io.InputStream; import java.io.OutputStream; /** - * Useful "common" functionality for caching to files + * Useful "common" functionality for caching to files */ public abstract class AbstractFileCacheBacking extends AbstractCacheBacking { /** diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractIndexedFileCacheBacking.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractIndexedFileCacheBacking.java index 32dba3d90..e32ffcafa 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractIndexedFileCacheBacking.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/AbstractIndexedFileCacheBacking.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation @@ -195,7 +195,7 @@ public abstract class AbstractIndexedFileCacheBacking extends AbstractFileCacheB } /** - * The default index entry in the index file + * The default index entry in the index file */ public static class IndexEntry implements Serializable, Cloneable { private static final long serialVersionUID = 756391290557029363L; @@ -205,7 +205,7 @@ public abstract class AbstractIndexedFileCacheBacking extends AbstractFileCacheB public boolean ignored; public long crcClass; public long crcWeaved; - + public IndexEntry () { super(); } diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/AsynchronousFileCacheBacking.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/AsynchronousFileCacheBacking.java index 2ddd3a15e..7ff4f5ba3 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/AsynchronousFileCacheBacking.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/AsynchronousFileCacheBacking.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * Lyor Goldstein (vmware) add support for weaved class being re-defined diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheBacking.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheBacking.java index f6eb1f585..ae59031e8 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheBacking.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheBacking.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheFactory.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheFactory.java index 042ef61bd..50bcbfe71 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheFactory.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheKeyResolver.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheKeyResolver.java index c729efe7f..80987092b 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheKeyResolver.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheKeyResolver.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheStatistics.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheStatistics.java index 1ccacfc18..3494c41fb 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheStatistics.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CacheStatistics.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CachedClassEntry.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CachedClassEntry.java index 5e4b37cef..658740e0c 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CachedClassEntry.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CachedClassEntry.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CachedClassReference.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CachedClassReference.java index 443958406..434e4395c 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/CachedClassReference.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/CachedClassReference.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheFactory.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheFactory.java index 7eb796e4b..4c9e73af4 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheFactory.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java index 11e9b2f2d..5f0e54772 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultFileCacheBacking.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultFileCacheBacking.java index 7bfee2068..586b99694 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultFileCacheBacking.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultFileCacheBacking.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation @@ -176,7 +176,7 @@ public class DefaultFileCacheBacking extends AbstractIndexedFileCacheBacking { delete(cacheFile); return null; } - + if (ie.ignored) { return new CachedClassEntry(ref, WeavedClassCache.ZERO_BYTES, CachedClassEntry.EntryType.IGNORED); } diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/FlatFileCacheBacking.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/FlatFileCacheBacking.java index cd3a078ef..06c95fa9c 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/FlatFileCacheBacking.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/FlatFileCacheBacking.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2012 VMware, Inc. custard - * - * All rights reserved. - * This program and the 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: * Lyor Goldstein * ******************************************************************/ @@ -32,8 +32,8 @@ import org.aspectj.util.LangUtil; * O/S-es may impose internal limits on the maximum number of "children" * a folder node may have. On the other hand, it is much faster (again, for * small number of instrumented classes) than the ZIP cache since each class/aspect - * is represented by a single file - thus adding/removing/modifying it is easier. - * + * is represented by a single file - thus adding/removing/modifying it is easier. + * * @author Lyor Goldstein */ public class FlatFileCacheBacking extends AsynchronousFileCacheBacking { @@ -106,7 +106,7 @@ public class FlatFileCacheBacking extends AsynchronousFileCacheBacking { return result; } - + @Override protected IndexEntry resolveIndexMapEntry (File cacheDir, IndexEntry ie) { File cacheEntry = new File(cacheDir, ie.key); diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/GeneratedCachedClassHandler.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/GeneratedCachedClassHandler.java index 91c332b6b..506f4d105 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/GeneratedCachedClassHandler.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/GeneratedCachedClassHandler.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java index 69cb1a576..4bbf8d9c9 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCache.java @@ -26,9 +26,9 @@ import org.aspectj.weaver.tools.TraceFactory; * Copyright (c) 2012 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: * Abraham Nevado (lucierna) initial implementation @@ -46,7 +46,7 @@ public class SimpleCache { private Map<String, byte[]> generatedCache; private static final String GENERATED_CACHE_SUBFOLDER = "panenka.cache"; private static final String GENERATED_CACHE_SEPARATOR = ";"; - + public static final String IMPL_NAME = "shared"; protected SimpleCache(String folder, boolean enabled) { @@ -115,32 +115,32 @@ public class SimpleCache { private static class StoreableCachingMap extends HashMap { private String folder; private static final String CACHENAMEIDX = "cache.idx"; - + private long lastStored = System.currentTimeMillis(); private static int DEF_STORING_TIMER = 60000; //ms private int storingTimer; - + private transient Trace trace; private void initTrace(){ trace = TraceFactory.getTraceFactory().getTrace(StoreableCachingMap.class); } - + // private StoreableCachingMap(String folder) { // this.folder = folder; // initTrace(); // } - + private StoreableCachingMap(String folder, int storingTimer){ this.folder = folder; initTrace(); this.storingTimer = storingTimer; } - + public static StoreableCachingMap init(String folder) { return init(folder,DEF_STORING_TIMER); - + } - + public static StoreableCachingMap init(String folder, int storingTimer) { File file = new File(folder + File.separator + CACHENAMEIDX); if (file.exists()) { @@ -186,7 +186,7 @@ public class SimpleCache { try { String path = null; byte[] valueBytes = (byte[]) value; - + if (Arrays.equals(valueBytes, SAME_BYTES)) { path = SAME_BYTES_STRING; } else { @@ -201,8 +201,8 @@ public class SimpleCache { } return null; } - - + + public void storeMap() { long now = System.currentTimeMillis(); @@ -270,7 +270,7 @@ public class SimpleCache { for (String generatedClassName : generatedClassesNames) { byte[] generatedBytes = get(generatedClassName, bytes); - + if (protectionDomain == null) { defineClass(loader, generatedClassName, generatedBytes); } else { diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCacheFactory.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCacheFactory.java index 49569dd0e..033e57b98 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCacheFactory.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/SimpleCacheFactory.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * Abraham Nevado (lucierna) initial implementation @@ -17,20 +17,20 @@ import java.io.File; import org.aspectj.weaver.Dump; public class SimpleCacheFactory { - + public static final String CACHE_ENABLED_PROPERTY = "aj.weaving.cache.enabled"; public static final String CACHE_DIR = "aj.weaving.cache.dir"; public static final String CACHE_IMPL = "aj.weaving.cache.impl"; - + public static final String PATH_DEFAULT= "/tmp/"; // TODO windows default...? - public static final boolean BYDEFAULT= false; - - + public static final boolean BYDEFAULT= false; + + public static String path = PATH_DEFAULT; public static Boolean enabled = false; private static boolean determinedIfEnabled = false; private static SimpleCache lacache=null; - + public static synchronized SimpleCache createSimpleCache(){ if (lacache==null){ if (!determinedIfEnabled) { @@ -46,7 +46,7 @@ public class SimpleCacheFactory { if (path == null){ path = PATH_DEFAULT; } - + } catch (Throwable t) { path=PATH_DEFAULT; t.printStackTrace(); @@ -59,7 +59,7 @@ public class SimpleCacheFactory { lacache= new SimpleCache(path, enabled); } return lacache; - + } private static void determineIfEnabled() { @@ -69,7 +69,7 @@ public class SimpleCacheFactory { enabled = BYDEFAULT; } else if (property.equalsIgnoreCase("true")){ - + String impl = System.getProperty(CACHE_IMPL); if (SimpleCache.IMPL_NAME.equals(impl)){ enabled = true; @@ -81,7 +81,7 @@ public class SimpleCacheFactory { else{ enabled = BYDEFAULT; } - + } catch (Throwable t) { enabled=BYDEFAULT; System.err.println("Error creating cache"); @@ -90,7 +90,7 @@ public class SimpleCacheFactory { } determinedIfEnabled = true; } - + // Should behave ok with two threads going through here, well whoever gets there first will set determinedIfEnabled but only after // it has set 'enabled' to the right value. public static boolean isEnabled() { @@ -98,7 +98,7 @@ public class SimpleCacheFactory { determineIfEnabled(); } return enabled; - } - + } + } diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/WeavedClassCache.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/WeavedClassCache.java index cc0532316..b5ac70270 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/WeavedClassCache.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/WeavedClassCache.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * John Kew (vmware) initial implementation diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/ZippedFileCacheBacking.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/ZippedFileCacheBacking.java index fa7fba074..f5cc1a709 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/ZippedFileCacheBacking.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/ZippedFileCacheBacking.java @@ -2,9 +2,9 @@ * Copyright (c) 2012 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: * Lyor Goldstein (vmware) add support for weaved class being re-defined @@ -78,7 +78,7 @@ public class ZippedFileCacheBacking extends AsynchronousFileCacheBacking { + " to read current data: " + e.getMessage(), e); } - + FileUtil.deleteContents(outFile); return; } @@ -98,7 +98,7 @@ public class ZippedFileCacheBacking extends AsynchronousFileCacheBacking { + " to write updated data: " + e.getMessage(), e); } - + FileUtil.deleteContents(outFile); } } @@ -116,7 +116,7 @@ public class ZippedFileCacheBacking extends AsynchronousFileCacheBacking { + " to read current data: " + e.getMessage(), e); } - + FileUtil.deleteContents(outFile); return; } @@ -136,7 +136,7 @@ public class ZippedFileCacheBacking extends AsynchronousFileCacheBacking { + " to write updated data: " + e.getMessage(), e); } - + FileUtil.deleteContents(outFile); } } @@ -293,7 +293,7 @@ public class ZippedFileCacheBacking extends AsynchronousFileCacheBacking { return result; } - + public static final void writeZipClassBytes (File file, Map<String,byte[]> entriesMap) throws IOException { if (entriesMap.isEmpty()) { FileUtil.deleteContents(file); diff --git a/weaver/src/main/resources/aspectj_1_5_0.dtd b/weaver/src/main/resources/aspectj_1_5_0.dtd index 314290333..1e9fb8a91 100644 --- a/weaver/src/main/resources/aspectj_1_5_0.dtd +++ b/weaver/src/main/resources/aspectj_1_5_0.dtd @@ -3,9 +3,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 |