[CVS nanning] Renamed Introductor -> MixinAspect, now uses Pointcuts, removed subclasses

Commit in nanning on MAIN

project.xml +1 -1 1.59 -> 1.60

src/frameworks/project.xml +2 -2 1.12 -> 1.13

src/frameworks/attribute/project.xml +1 -1 1.4 -> 1.5

src/frameworks/cache/project.xml +1 -1 1.3 -> 1.4

src/frameworks/contract/project.xml +1 -1 1.5 -> 1.6

src/frameworks/definition/project.xml +1 -1 1.5 -> 1.6

src/frameworks/locking/project.xml +1 -1 1.6 -> 1.7

src/frameworks/prevayler/project.xml +1 -1 1.4 -> 1.5

src/frameworks/prevayler/src/test/org/codehaus/nanning/prevayler/BasicIdentifyingSystemTest.java +2 -2 1.1 -> 1.2

/PrevaylerTest.java +2 -4 1.2 -> 1.3

src/frameworks/profiler/project.xml +1 -1 1.6 -> 1.7

src/frameworks/remote/project.xml +1 -1 1.3 -> 1.4

src/frameworks/trace/project.xml +1 -1 1.4 -> 1.5

src/frameworks/trace/src/test/org/codehaus/nanning/trace/TraceInterceptorTest.java +4 -4 1.1 -> 1.2

src/main/org/codehaus/nanning/config/MixinAspect.java +48 added 1.1

/P.java +53 1.2 -> 1.3

/AttributeIntroductor.java -17 1.1 removed

/ClassIntroductor.java -15 1.1 removed

/Introductor.java -42 1.2 removed

src/main/org/codehaus/nanning/xml/AspectSystemParser.java +2 -2 1.2 -> 1.3

src/test/org/codehaus/nanning/config/AspectSystemTest.java +1 -1 1.1 -> 1.2

/ClassIntroductorTest.java +4 -4 1.1 -> 1.2

src/test/org/codehaus/nanning/xml/AspectSystemParserTest.java +3 -3 1.2 -> 1.3

+131 -106

1 added + 3 removed + 19 modified, total 23 files

Renamed Introductor -> MixinAspect, now uses Pointcuts, removed subclasses

----------

nanning

project.xml 1.59 -> 1.60

diff -u -r1.59 -r1.60
--- project.xml 18 Jul 2003 08:46:05 -0000 1.59
+++ project.xml 24 Jul 2003 16:46:10 -0000 1.60
@@ -4,7 +4,7 @@

<name>Nanning Aspects</name>
<id>nanning</id>
<logo>/images/nanning.png</logo>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<groupId>nanning</groupId>
<organization>
<name>Jon Tirsen</name>

----------

nanning/src/frameworks

project.xml 1.12 -> 1.13

diff -u -r1.12 -r1.13
--- project.xml 18 Jul 2003 08:46:05 -0000 1.12
+++ project.xml 24 Jul 2003 16:46:10 -0000 1.13
@@ -3,7 +3,7 @@

<extend>${basedir}/../../project.xml</extend>

<logo>/../../images/nanning.png</logo>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<groupId>nanning</groupId>
<organization>
<name>Jon Tirsen</name>

@@ -67,7 +67,7 @@

<dependency>
<groupId>nanning</groupId>
<artifactId>nanning</artifactId>

- <version>0.9</version>

+ <version>1.0-beta-1</version>

</dependency>

<dependency>

----------

nanning/src/frameworks/attribute

project.xml 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- project.xml 18 Jul 2003 08:46:05 -0000 1.4
+++ project.xml 24 Jul 2003 16:46:10 -0000 1.5
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Attribute</name>
<id>nanning-attribute</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.attribute</package>
<shortDescription>Attribute</shortDescription>
<description>Some experimental plugins for the attribute-implementation</description>

----------

nanning/src/frameworks/cache

project.xml 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- project.xml 18 Jul 2003 08:46:05 -0000 1.3
+++ project.xml 24 Jul 2003 16:46:10 -0000 1.4
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Remote</name>
<id>nanning-cache</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.cache</package>
<shortDescription>Cache</shortDescription>
<description></description>

----------

nanning/src/frameworks/contract

project.xml 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- project.xml 18 Jul 2003 08:46:05 -0000 1.5
+++ project.xml 24 Jul 2003 16:46:10 -0000 1.6
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Contract</name>
<id>nanning-contract</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.contract</package>
<shortDescription>Design by contract</shortDescription>
<description>A simple design by contract interceptor</description>

----------

nanning/src/frameworks/definition

project.xml 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- project.xml 18 Jul 2003 08:46:05 -0000 1.5
+++ project.xml 24 Jul 2003 16:46:10 -0000 1.6
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Definition</name>
<id>nanning-definition</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.definition</package>
<shortDescription>Definition</shortDescription>
<description>The older deprecated definition format and API</description>

----------

nanning/src/frameworks/locking

project.xml 1.6 -> 1.7

diff -u -r1.6 -r1.7
--- project.xml 18 Jul 2003 08:46:05 -0000 1.6
+++ project.xml 24 Jul 2003 16:46:10 -0000 1.7
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Locking</name>
<id>nanning-locking</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.locking</package>
<shortDescription>Locking</shortDescription>
<description>Locking</description>

----------

nanning/src/frameworks/prevayler

project.xml 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- project.xml 18 Jul 2003 08:46:05 -0000 1.4
+++ project.xml 24 Jul 2003 16:46:11 -0000 1.5
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Prevayler</name>
<id>nanning-prevayler</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.prevayler</package>
<shortDescription>Profiler</shortDescription>
<description></description>

----------

nanning/src/frameworks/prevayler/src/test/org/codehaus/nanning/prevayler

BasicIdentifyingSystemTest.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- BasicIdentifyingSystemTest.java 4 Jul 2003 10:53:58 -0000 1.1
+++ BasicIdentifyingSystemTest.java 24 Jul 2003 16:46:11 -0000 1.2
@@ -6,7 +6,7 @@

import org.codehaus.nanning.prevayler.BasicIdentifyingSystem;
import org.codehaus.nanning.prevayler.CurrentPrevayler;
import org.codehaus.nanning.config.AspectSystem;

-import org.codehaus.nanning.config.ClassIntroductor;

+import org.codehaus.nanning.config.MixinAspect;

import junit.framework.TestCase;

public class BasicIdentifyingSystemTest extends TestCase {

@@ -20,7 +20,7 @@

super.setUp();

AspectSystem aspectSystem = new AspectSystem();

- aspectSystem.addAspect(new ClassIntroductor(Interface.class, Implementation.class));

+ aspectSystem.addAspect(new MixinAspect(Interface.class, Implementation.class));

Aspects.setContextAspectFactory(aspectSystem);

registredObject = Aspects.getCurrentAspectFactory().newInstance(Interface.class);

----------

nanning/src/frameworks/prevayler/src/test/org/codehaus/nanning/prevayler

PrevaylerTest.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- PrevaylerTest.java 12 Jul 2003 16:48:16 -0000 1.2
+++ PrevaylerTest.java 24 Jul 2003 16:46:11 -0000 1.3
@@ -5,18 +5,16 @@

import java.util.Collection;
import java.util.IdentityHashMap;

+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;

import org.codehaus.nanning.AspectFactory;
import org.codehaus.nanning.AspectInstance;
import org.codehaus.nanning.Aspects;
import org.codehaus.nanning.Mixin;

-import org.codehaus.nanning.prevayler.*;

import org.codehaus.nanning.attribute.AbstractAttributesTest;
import org.codehaus.nanning.attribute.Attributes;
import org.codehaus.nanning.config.AspectSystem;
import org.codehaus.nanning.config.FindTargetMixinAspect;

-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
-import org.prevayler.implementation.CheckpointPrevayler;

public class PrevaylerTest extends AbstractAttributesTest {

----------

nanning/src/frameworks/profiler

project.xml 1.6 -> 1.7

diff -u -r1.6 -r1.7
--- project.xml 18 Jul 2003 08:46:05 -0000 1.6
+++ project.xml 24 Jul 2003 16:46:11 -0000 1.7
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Profiler</name>
<id>nanning-profiler</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.profiler</package>
<shortDescription>Profiler</shortDescription>
<description>A profiling interceptor created by Khalil Bouhamza</description>

----------

nanning/src/frameworks/remote

project.xml 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- project.xml 18 Jul 2003 08:46:06 -0000 1.3
+++ project.xml 24 Jul 2003 16:46:11 -0000 1.4
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Remote</name>
<id>nanning-remote</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.remote</package>
<shortDescription>Profiler</shortDescription>
<description></description>

----------

nanning/src/frameworks/trace

project.xml 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- project.xml 18 Jul 2003 08:46:06 -0000 1.4
+++ project.xml 24 Jul 2003 16:46:11 -0000 1.5
@@ -3,7 +3,7 @@

<extend>${basedir}/../project.xml</extend>
<name>Nanning Trace</name>
<id>nanning-trace</id>

- <currentVersion>1.0-beta-1-SNAPSHOT</currentVersion>

+ <currentVersion>1.0-beta-1</currentVersion>

<package>org.codehaus.nanning.trace</package>
<shortDescription>Trace</shortDescription>
<description></description>

----------

nanning/src/frameworks/trace/src/test/org/codehaus/nanning/trace

TraceInterceptorTest.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- TraceInterceptorTest.java 4 Jul 2003 10:53:58 -0000 1.1
+++ TraceInterceptorTest.java 24 Jul 2003 16:46:11 -0000 1.2
@@ -8,7 +8,7 @@

import org.codehaus.nanning.config.AspectSystem;
import org.codehaus.nanning.config.InterceptorAspect;

-import org.codehaus.nanning.config.Introductor;

+import org.codehaus.nanning.config.MixinAspect;

import org.codehaus.nanning.trace.TraceInterceptor;
import junit.framework.TestCase;

@@ -23,10 +23,10 @@

/**
* TODO document TraceInterceptorTest
*

- * <!-- $Id: TraceInterceptorTest.java,v 1.1 2003/07/04 10:53:58 lecando Exp $ -->

+ * <!-- $Id: TraceInterceptorTest.java,v 1.2 2003/07/24 16:46:11 lecando Exp $ -->

*
* @author $Author: lecando $

- * @version $Revision: 1.1 $

+ * @version $Revision: 1.2 $

*/
public class TraceInterceptorTest extends TestCase {
public static class MockLogger implements Log {

@@ -138,7 +138,7 @@

AspectSystem system = new AspectSystem();
MockLogger mockLogger = new MockLogger();
system.addAspect(new InterceptorAspect(new TraceInterceptor(mockLogger)));

- system.addAspect(new Introductor(Intf.class, Impl.class));

+ system.addAspect(new MixinAspect(Intf.class, Impl.class));

mockLogger.expectAddMessage(">>> call(hej, svej)");
mockLogger.expectAddMessage("<<< call(hej, svej), took");

----------

nanning/src/main/org/codehaus/nanning/config

MixinAspect.java added at 1.1

diff -N MixinAspect.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ MixinAspect.java 24 Jul 2003 16:46:11 -0000 1.1
@@ -0,0 +1,48 @@

+package org.codehaus.nanning.config;
+
+import org.codehaus.nanning.AspectException;
+import org.codehaus.nanning.AspectInstance;
+import org.codehaus.nanning.Mixin;
+
+public class MixinAspect extends AbstractAspect {
+ protected Class interfaceClass;
+ protected Class targetClass;
+ protected Pointcut pointcut;
+
+ public MixinAspect(Class interfaceClass, Class targetClass, Pointcut pointcut) {
+ this.interfaceClass = interfaceClass;
+ this.targetClass = targetClass;
+ this.pointcut = pointcut;
+ }
+
+ public MixinAspect(Class interfaceClass, Class targetClass) {
+ this(interfaceClass, targetClass, P.isClass(interfaceClass));
+ }
+
+ public void introduce(AspectInstance aspectInstance) {
+ if (shouldIntroduce(aspectInstance)) {
+ Mixin mixinInstance = new Mixin();
+ mixinInstance.setInterfaceClass(interfaceClass);
+ if (targetClass != null) {
+ try {
+ mixinInstance.setTarget(targetClass.newInstance());
+ } catch (Exception e) {
+ throw new AspectException("could not instantiate target " + e);
+ }
+ }
+ aspectInstance.addMixin(mixinInstance);
+ }
+ }
+
+ public boolean shouldIntroduce(AspectInstance aspectInstance) {
+ return pointcut.introduceOn(aspectInstance);
+ }
+
+ public Class getInterfaceClass() {
+ return interfaceClass;
+ }
+
+ public Class getTargetClass() {
+ return targetClass;
+ }
+}

----------

nanning/src/main/org/codehaus/nanning/config

P.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- P.java 12 Jul 2003 16:48:16 -0000 1.2
+++ P.java 24 Jul 2003 16:46:11 -0000 1.3
@@ -3,6 +3,7 @@

import org.codehaus.nanning.config.Pointcut;
import org.codehaus.nanning.Mixin;
import org.codehaus.nanning.AspectInstance;

+import org.codehaus.nanning.MethodInterceptor;

import org.codehaus.nanning.attribute.Attributes;

import java.lang.reflect.Method;

@@ -46,6 +47,14 @@

return new MethodName(pattern);
}

+ public static Pointcut classAttribute(final String attribute) {
+ return new ClassAttribute(attribute);
+ }
+
+ public static Pointcut isClass(final Class classIdentifier) {
+ return new IsClass(classIdentifier);
+ }
+

public static class And extends Pointcut {
private Pointcut pointcut1;
private Pointcut pointcut2;

@@ -76,6 +85,10 @@

public boolean adviseMethod(AspectInstance instance, Mixin mixin, Method method) {
return true;
}

+
+ public boolean introduceOn(AspectInstance instance) {
+ return true;
+ }

}

private static class IsMixinInterface extends Pointcut {

@@ -143,6 +156,46 @@

public boolean adviseMethod(AspectInstance instance, Mixin mixin, Method method) {
return pattern.matcher(method.getName()).matches();

+ }
+ }
+
+ private static class ClassAttribute extends Pointcut {
+ private final String attribute;
+
+ public ClassAttribute(String attribute) {
+ this.attribute = attribute;
+ }
+
+ public boolean adviseMethod(AspectInstance instance, Mixin mixin, Method method) {
+ return matches(instance);
+ }
+
+ public boolean introduceOn(AspectInstance instance) {
+ return matches(instance);
+ }
+
+ private boolean matches(AspectInstance instance) {
+ return Attributes.hasInheritedAttribute(instance.getClassIdentifier(), attribute);
+ }
+ }
+
+ private static class IsClass extends Pointcut {
+ private final Class classIdentifier;
+
+ public IsClass(Class classIdentifier) {
+ this.classIdentifier = classIdentifier;
+ }
+
+ public boolean introduceOn(AspectInstance instance) {
+ return matches(instance);
+ }
+
+ private boolean matches(AspectInstance instance) {
+ return classIdentifier.equals(instance.getClassIdentifier());
+ }
+
+ public boolean adviseMethod(AspectInstance instance, Mixin mixin, Method method) {
+ return matches(instance);

}
}
}

----------

nanning/src/main/org/codehaus/nanning/config

AttributeIntroductor.java removed after 1.1

diff -N AttributeIntroductor.java
--- AttributeIntroductor.java 4 Jul 2003 10:53:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@

-package org.codehaus.nanning.config;
-
-import org.codehaus.nanning.AspectInstance;
-import org.codehaus.nanning.attribute.Attributes;
-
-public class AttributeIntroductor extends Introductor {
- private String attribute;
-
- public AttributeIntroductor(Class interfaceClass, Class targetClass, String attribute) {
- super(interfaceClass, targetClass);
- this.attribute = attribute;
- }
-
- public boolean shouldIntroduce(AspectInstance aspectInstance) {
- return Attributes.hasInheritedAttribute(aspectInstance.getClassIdentifier(), attribute);
- }
-}

----------

nanning/src/main/org/codehaus/nanning/config

ClassIntroductor.java removed after 1.1

diff -N ClassIntroductor.java
--- ClassIntroductor.java 4 Jul 2003 10:53:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@

-package org.codehaus.nanning.config;
-
-import org.codehaus.nanning.AspectInstance;
-
-
-public class ClassIntroductor extends Introductor {
-
- public ClassIntroductor(Class classIdentifier, Class targetClass) {
- super(classIdentifier, targetClass);
- }
-
- public boolean shouldIntroduce(AspectInstance aspectInstance) {
- return interfaceClass.equals(aspectInstance.getClassIdentifier());
- }
-}

----------

nanning/src/main/org/codehaus/nanning/config

Introductor.java removed after 1.2

diff -N Introductor.java
--- Introductor.java 12 Jul 2003 16:48:16 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@

-package org.codehaus.nanning.config;
-
-import org.codehaus.nanning.AspectException;
-import org.codehaus.nanning.AspectInstance;
-import org.codehaus.nanning.Mixin;
-
-public class Introductor extends AbstractAspect {
- protected Class interfaceClass;
- protected Class targetClass;
-
- public Introductor(Class interfaceClass, Class targetClass) {
- this.interfaceClass = interfaceClass;
- this.targetClass = targetClass;
- }
-
- public void introduce(AspectInstance aspectInstance) {
- if (shouldIntroduce(aspectInstance)) {
- Mixin mixinInstance = new Mixin();
- mixinInstance.setInterfaceClass(interfaceClass);
- if (targetClass != null) {
- try {
- mixinInstance.setTarget(targetClass.newInstance());
- } catch (Exception e) {
- throw new AspectException("could not instantiate target " + e);
- }
- }
- aspectInstance.addMixin(mixinInstance);
- }
- }
-
- public boolean shouldIntroduce(AspectInstance aspectInstance) {
- return true;
- }
-
- public Class getInterfaceClass() {
- return interfaceClass;
- }
-
- public Class getTargetClass() {
- return targetClass;
- }
-}

----------

nanning/src/main/org/codehaus/nanning/xml

AspectSystemParser.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- AspectSystemParser.java 12 Jul 2003 12:58:34 -0000 1.2
+++ AspectSystemParser.java 24 Jul 2003 16:46:11 -0000 1.3
@@ -53,8 +53,8 @@

}
}

- private Introductor parseMixinAspect(Element element) {
- return new Introductor(loadClass(element.getAttribute("interface")), loadClass(element.getAttribute("target")));

+ private MixinAspect parseMixinAspect(Element element) {
+ return new MixinAspect(loadClass(element.getAttribute("interface")), loadClass(element.getAttribute("target")));

}

private ClassAspect parseClass(Element element) {

----------

nanning/src/test/org/codehaus/nanning/config

AspectSystemTest.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- AspectSystemTest.java 4 Jul 2003 10:54:00 -0000 1.1
+++ AspectSystemTest.java 24 Jul 2003 16:46:11 -0000 1.2
@@ -10,7 +10,7 @@

public void test() throws NoSuchMethodException {
AspectSystem aspectSystem = new AspectSystem();
aspectSystem.addAspect(new FindTargetMixinAspect());

- aspectSystem.addAspect(new Introductor(TestMixin.class, TestMixinImpl.class));

+ aspectSystem.addAspect(new MixinAspect(TestMixin.class, TestMixinImpl.class, P.all()));

aspectSystem.addAspect(new InterceptorAspect(new MockInterceptor()));
final NullInterceptor nullInterceptor = new NullInterceptor();
aspectSystem.addAspect(new InterceptorAspect(nullInterceptor));

----------

nanning/src/test/org/codehaus/nanning/config

ClassIntroductorTest.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- ClassIntroductorTest.java 4 Jul 2003 10:54:00 -0000 1.1
+++ ClassIntroductorTest.java 24 Jul 2003 16:46:11 -0000 1.2
@@ -10,16 +10,16 @@

public static interface OtherInterface {}

public void testIntroduce() {

- ClassIntroductor introductor = new ClassIntroductor(Interface.class, Implementation.class);

+ MixinAspect aspect = new MixinAspect(Interface.class, Implementation.class);

AspectInstance aspectInstance = new AspectInstance(Interface.class);

- introductor.introduce(aspectInstance);

+ aspect.introduce(aspectInstance);

assertEquals(1, aspectInstance.getMixins().size());
}

public void testNotIntroduce() {

- ClassIntroductor introductor = new ClassIntroductor(Interface.class, Implementation.class);

+ MixinAspect aspect = new MixinAspect(Interface.class, Implementation.class);

AspectInstance aspectInstance = new AspectInstance(OtherInterface.class);

- introductor.introduce(aspectInstance);

+ aspect.introduce(aspectInstance);

assertEquals(0, aspectInstance.getMixins().size());
}
}

----------

nanning/src/test/org/codehaus/nanning/xml

AspectSystemParserTest.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- AspectSystemParserTest.java 12 Jul 2003 12:58:34 -0000 1.2
+++ AspectSystemParserTest.java 24 Jul 2003 16:46:11 -0000 1.3
@@ -89,8 +89,8 @@

"target='" + Target.class.getName() + "' /></aspect-system>";
AspectSystem aspectSystem = aspectSystemParser.parse(xml);
assertEquals(1, aspectSystem.getAspects().size());

- Introductor introductor = (Introductor) aspectSystem.getAspects().get(0);
- assertEquals(Interface.class, introductor.getInterfaceClass());
- assertEquals(Target.class, introductor.getTargetClass());

+ MixinAspect aspect = (MixinAspect) aspectSystem.getAspects().get(0);
+ assertEquals(Interface.class, aspect.getInterfaceClass());
+ assertEquals(Target.class, aspect.getTargetClass());

}
}