From edc97a8a96aaf01f6fdc015bdde2c4c1d2bb5a96 Mon Sep 17 00:00:00 2001 From: aclement Date: Mon, 20 Oct 2008 18:51:09 +0000 Subject: [PATCH] 246125: moving structure model related stuff out of org.aspectj.weaver into org.aspectj.weaver.model --- weaver/src/org/aspectj/weaver/Checker.java | 1 + weaver/src/org/aspectj/weaver/Shadow.java | 1 + weaver/src/org/aspectj/weaver/ShadowMunger.java | 1 + .../org/aspectj/weaver/bcel/BcelClassWeaver.java | 2 +- .../org/aspectj/weaver/bcel/BcelTypeMunger.java | 2 +- .../src/org/aspectj/weaver/bcel/BcelWeaver.java | 2 +- .../{ => model}/AsmRelationshipProvider.java | 15 ++++++++++++++- .../weaver/{ => model}/AsmRelationshipUtils.java | 2 +- 8 files changed, 21 insertions(+), 5 deletions(-) rename weaver/src/org/aspectj/weaver/{ => model}/AsmRelationshipProvider.java (97%) rename weaver/src/org/aspectj/weaver/{ => model}/AsmRelationshipUtils.java (98%) diff --git a/weaver/src/org/aspectj/weaver/Checker.java b/weaver/src/org/aspectj/weaver/Checker.java index 6f521b233..c56379240 100644 --- a/weaver/src/org/aspectj/weaver/Checker.java +++ b/weaver/src/org/aspectj/weaver/Checker.java @@ -20,6 +20,7 @@ import org.aspectj.asm.IRelationship; import org.aspectj.bridge.IMessage; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.Message; +import org.aspectj.weaver.model.AsmRelationshipProvider; import org.aspectj.weaver.patterns.DeclareErrorOrWarning; import org.aspectj.weaver.patterns.PerClause; import org.aspectj.weaver.patterns.Pointcut; diff --git a/weaver/src/org/aspectj/weaver/Shadow.java b/weaver/src/org/aspectj/weaver/Shadow.java index 346d60ff3..ea3a891f2 100644 --- a/weaver/src/org/aspectj/weaver/Shadow.java +++ b/weaver/src/org/aspectj/weaver/Shadow.java @@ -32,6 +32,7 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.util.PartialOrder; import org.aspectj.util.TypeSafeEnum; import org.aspectj.weaver.ast.Var; +import org.aspectj.weaver.model.AsmRelationshipProvider; /* * The superclass of anything representing a the shadow of a join point. A shadow represents diff --git a/weaver/src/org/aspectj/weaver/ShadowMunger.java b/weaver/src/org/aspectj/weaver/ShadowMunger.java index c99525459..c69589b29 100644 --- a/weaver/src/org/aspectj/weaver/ShadowMunger.java +++ b/weaver/src/org/aspectj/weaver/ShadowMunger.java @@ -25,6 +25,7 @@ import org.aspectj.asm.internal.ProgramElement; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.SourceLocation; import org.aspectj.util.PartialOrder; +import org.aspectj.weaver.model.AsmRelationshipUtils; import org.aspectj.weaver.patterns.DeclareErrorOrWarning; import org.aspectj.weaver.patterns.PerClause; import org.aspectj.weaver.patterns.Pointcut; diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java index 1b0b82a8a..372dcb735 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java @@ -61,7 +61,6 @@ import org.aspectj.util.PartialOrder; import org.aspectj.weaver.AjAttribute; import org.aspectj.weaver.AjcMemberMaker; import org.aspectj.weaver.AnnotationAJ; -import org.aspectj.weaver.AsmRelationshipProvider; import org.aspectj.weaver.BCException; import org.aspectj.weaver.ConcreteTypeMunger; import org.aspectj.weaver.IClassWeaver; @@ -82,6 +81,7 @@ import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.WeaverMessages; import org.aspectj.weaver.WeaverStateInfo; import org.aspectj.weaver.World; +import org.aspectj.weaver.model.AsmRelationshipProvider; import org.aspectj.weaver.patterns.DeclareAnnotation; import org.aspectj.weaver.patterns.ExactTypePattern; import org.aspectj.weaver.tools.Trace; diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java index f0dee6d01..de8cf3a3c 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java @@ -41,7 +41,6 @@ import org.aspectj.bridge.context.ContextToken; import org.aspectj.weaver.AjcMemberMaker; import org.aspectj.weaver.AnnotationAJ; import org.aspectj.weaver.AnnotationOnTypeMunger; -import org.aspectj.weaver.AsmRelationshipProvider; import org.aspectj.weaver.BCException; import org.aspectj.weaver.ConcreteTypeMunger; import org.aspectj.weaver.Member; @@ -63,6 +62,7 @@ import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.WeaverMessages; import org.aspectj.weaver.WeaverStateInfo; import org.aspectj.weaver.World; +import org.aspectj.weaver.model.AsmRelationshipProvider; import org.aspectj.weaver.patterns.DeclareAnnotation; import org.aspectj.weaver.patterns.Pointcut; diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java index d08d8d55e..eec8b5eac 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java @@ -56,7 +56,6 @@ import org.aspectj.util.FuzzyBoolean; import org.aspectj.weaver.Advice; import org.aspectj.weaver.AnnotationAJ; import org.aspectj.weaver.AnnotationOnTypeMunger; -import org.aspectj.weaver.AsmRelationshipProvider; import org.aspectj.weaver.BCException; import org.aspectj.weaver.ConcreteTypeMunger; import org.aspectj.weaver.CrosscuttingMembersSet; @@ -74,6 +73,7 @@ import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.WeaverMessages; import org.aspectj.weaver.WeaverStateInfo; import org.aspectj.weaver.World; +import org.aspectj.weaver.model.AsmRelationshipProvider; import org.aspectj.weaver.patterns.AndPointcut; import org.aspectj.weaver.patterns.BindingPattern; import org.aspectj.weaver.patterns.BindingTypePattern; diff --git a/weaver/src/org/aspectj/weaver/AsmRelationshipProvider.java b/weaver/src/org/aspectj/weaver/model/AsmRelationshipProvider.java similarity index 97% rename from weaver/src/org/aspectj/weaver/AsmRelationshipProvider.java rename to weaver/src/org/aspectj/weaver/model/AsmRelationshipProvider.java index 52336bfb8..9d10f0ab4 100644 --- a/weaver/src/org/aspectj/weaver/AsmRelationshipProvider.java +++ b/weaver/src/org/aspectj/weaver/model/AsmRelationshipProvider.java @@ -10,7 +10,7 @@ * PARC initial implementation * ******************************************************************/ -package org.aspectj.weaver; +package org.aspectj.weaver.model; import java.util.Iterator; @@ -22,6 +22,19 @@ import org.aspectj.asm.IRelationshipMap; import org.aspectj.asm.internal.ProgramElement; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.SourceLocation; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.AdviceKind; +import org.aspectj.weaver.Checker; +import org.aspectj.weaver.Lint; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedType; +import org.aspectj.weaver.ResolvedTypeMunger; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ShadowMunger; +import org.aspectj.weaver.UnresolvedType; +import org.aspectj.weaver.World; +import org.aspectj.weaver.Lint.Kind; public class AsmRelationshipProvider { diff --git a/weaver/src/org/aspectj/weaver/AsmRelationshipUtils.java b/weaver/src/org/aspectj/weaver/model/AsmRelationshipUtils.java similarity index 98% rename from weaver/src/org/aspectj/weaver/AsmRelationshipUtils.java rename to weaver/src/org/aspectj/weaver/model/AsmRelationshipUtils.java index 722ddb09c..f9c9f6ae2 100644 --- a/weaver/src/org/aspectj/weaver/AsmRelationshipUtils.java +++ b/weaver/src/org/aspectj/weaver/model/AsmRelationshipUtils.java @@ -8,7 +8,7 @@ * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version *******************************************************************/ -package org.aspectj.weaver; +package org.aspectj.weaver.model; import org.aspectj.weaver.patterns.AndPointcut; import org.aspectj.weaver.patterns.OrPointcut; -- 2.39.5