[prev in list] [next in list] [prev in thread] [next in thread]
List: jboss-cvs-commits
Subject: [jboss-cvs] jboss-aop/src/main/org/jboss/aop/joinpoint CallerInvocation.java CallerInvocationWrapper
From: Bill Burke <patriot1burke () users ! sourceforge ! net>
Date: 2004-02-29 6:29:09
Message-ID: E1AxKRp-0007nO-6A () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
User: patriot1burke
Date: 04/02/28 22:29:09
Modified: src/main/org/jboss/aop/joinpoint CallerInvocation.java
CallerInvocationWrapper.java
ConstructorCallerInvocation.java
ConstructorCallerInvocationWrapper.java
ConstructorInvocation.java
ConstructorInvocationWrapper.java
FieldInvocation.java FieldReadInvocation.java
FieldReadInvocationWrapper.java
FieldWriteInvocation.java
FieldWriteInvocationWrapper.java Invocation.java
MethodInvocation.java MethodInvocationWrapper.java
Removed: src/main/org/jboss/aop/joinpoint InvocationType.java
Log:
cleanup. Removed InvocationType
Revision Changes Path
1.6 +3 -4 \
jboss-aop/src/main/org/jboss/aop/joinpoint/CallerInvocation.java
Index: CallerInvocation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/CallerInvocation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CallerInvocation.java 27 Feb 2004 23:57:13 -0000 1.5
+++ CallerInvocation.java 29 Feb 2004 06:29:08 -0000 1.6
@@ -7,7 +7,6 @@
package org.jboss.aop.joinpoint;
-import org.jboss.aop.InstanceAdvised;
import org.jboss.aop.advice.Interceptor;
import java.lang.reflect.InvocationTargetException;
@@ -20,7 +19,7 @@
* an AOP method invocation.
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class CallerInvocation extends Invocation
{
@@ -32,12 +31,12 @@
public CallerInvocation(org.jboss.aop.advice.Interceptor[] interceptors)
{
- super(InvocationType.METHOD, interceptors);
+ super(interceptors);
}
public CallerInvocation(org.jboss.aop.advice.Interceptor[] interceptors, \
org.jboss.aop.metadata.SimpleMetaData meta) {
- super(InvocationType.METHOD, interceptors, meta);
+ super(interceptors, meta);
}
public CallerInvocation(CallerInvocation invocation)
1.2 +1 -3 \
jboss-aop/src/main/org/jboss/aop/joinpoint/CallerInvocationWrapper.java
Index: CallerInvocationWrapper.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/CallerInvocationWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallerInvocationWrapper.java 27 Feb 2004 23:57:13 -0000 1.1
+++ CallerInvocationWrapper.java 29 Feb 2004 06:29:08 -0000 1.2
@@ -9,13 +9,11 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.metadata.MetaDataResolver;
-import java.lang.reflect.InvocationTargetException;
-
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class CallerInvocationWrapper extends CallerInvocation
1.4 +4 -4 \
jboss-aop/src/main/org/jboss/aop/joinpoint/ConstructorCallerInvocation.java
Index: ConstructorCallerInvocation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/ConstructorCallerInvocation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConstructorCallerInvocation.java 27 Feb 2004 23:57:13 -0000 1.3
+++ ConstructorCallerInvocation.java 29 Feb 2004 06:29:08 -0000 1.4
@@ -9,9 +9,9 @@
import org.jboss.aop.advice.Interceptor;
+import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
/**
@@ -20,7 +20,7 @@
* an AOP method invocation.
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ConstructorCallerInvocation extends Invocation
{
@@ -32,12 +32,12 @@
public ConstructorCallerInvocation(org.jboss.aop.advice.Interceptor[] \
interceptors) {
- super(InvocationType.METHOD, interceptors);
+ super(interceptors);
}
public ConstructorCallerInvocation(org.jboss.aop.advice.Interceptor[] \
interceptors, org.jboss.aop.metadata.SimpleMetaData meta) {
- super(InvocationType.METHOD, interceptors, meta);
+ super(interceptors, meta);
}
public ConstructorCallerInvocation(ConstructorCallerInvocation invocation)
1.2 +1 -3 \
jboss-aop/src/main/org/jboss/aop/joinpoint/ConstructorCallerInvocationWrapper.java
Index: ConstructorCallerInvocationWrapper.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/ConstructorCallerInvocationWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConstructorCallerInvocationWrapper.java 27 Feb 2004 23:57:13 -0000 1.1
+++ ConstructorCallerInvocationWrapper.java 29 Feb 2004 06:29:08 -0000 1.2
@@ -9,13 +9,11 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.metadata.MetaDataResolver;
-import java.lang.reflect.InvocationTargetException;
-
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class ConstructorCallerInvocationWrapper extends \
ConstructorCallerInvocation
1.6 +3 -3 \
jboss-aop/src/main/org/jboss/aop/joinpoint/ConstructorInvocation.java
Index: ConstructorInvocation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/ConstructorInvocation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConstructorInvocation.java 27 Feb 2004 23:57:13 -0000 1.5
+++ ConstructorInvocation.java 29 Feb 2004 06:29:08 -0000 1.6
@@ -18,7 +18,7 @@
* an AOP Constructor interception.
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class ConstructorInvocation extends Invocation
{
@@ -28,12 +28,12 @@
public ConstructorInvocation(org.jboss.aop.advice.Interceptor[] interceptors)
{
- super(InvocationType.CONSTRUCTOR, interceptors);
+ super(interceptors);
}
public ConstructorInvocation(org.jboss.aop.advice.Interceptor[] interceptors, \
org.jboss.aop.metadata.SimpleMetaData meta) {
- super(InvocationType.CONSTRUCTOR, interceptors, meta);
+ super(interceptors, meta);
}
public ConstructorInvocation(ConstructorInvocation invocation)
1.2 +1 -3 \
jboss-aop/src/main/org/jboss/aop/joinpoint/ConstructorInvocationWrapper.java
Index: ConstructorInvocationWrapper.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/ConstructorInvocationWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConstructorInvocationWrapper.java 27 Feb 2004 23:57:13 -0000 1.1
+++ ConstructorInvocationWrapper.java 29 Feb 2004 06:29:08 -0000 1.2
@@ -9,13 +9,11 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.metadata.MetaDataResolver;
-import java.lang.reflect.InvocationTargetException;
-
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class ConstructorInvocationWrapper extends ConstructorInvocation
1.5 +5 -5 \
jboss-aop/src/main/org/jboss/aop/joinpoint/FieldInvocation.java
Index: FieldInvocation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/FieldInvocation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FieldInvocation.java 24 Feb 2004 02:49:05 -0000 1.4
+++ FieldInvocation.java 29 Feb 2004 06:29:08 -0000 1.5
@@ -15,21 +15,21 @@
* an AOP field access or field update.
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class FieldInvocation extends Invocation
{
public transient Field field = null;
public int index;
- public FieldInvocation(InvocationType type, org.jboss.aop.advice.Interceptor[] \
interceptors) + public FieldInvocation(org.jboss.aop.advice.Interceptor[] \
interceptors) {
- this(type, interceptors, null);
+ this(interceptors, null);
}
- public FieldInvocation(InvocationType type, org.jboss.aop.advice.Interceptor[] \
interceptors, org.jboss.aop.metadata.SimpleMetaData meta) + public \
FieldInvocation(org.jboss.aop.advice.Interceptor[] interceptors, \
org.jboss.aop.metadata.SimpleMetaData meta) {
- super(type, interceptors, meta);
+ super(interceptors, meta);
}
/**
1.7 +3 -6 \
jboss-aop/src/main/org/jboss/aop/joinpoint/FieldReadInvocation.java
Index: FieldReadInvocation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/FieldReadInvocation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FieldReadInvocation.java 27 Feb 2004 23:57:13 -0000 1.6
+++ FieldReadInvocation.java 29 Feb 2004 06:29:08 -0000 1.7
@@ -7,11 +7,8 @@
package org.jboss.aop.joinpoint;
-import org.jboss.aop.metadata.MetaDataResolver;
import org.jboss.aop.advice.Interceptor;
-import java.lang.reflect.InvocationTargetException;
-
/**
* This is a helper wrapper class for an Invocation object.
@@ -19,18 +16,18 @@
* an AOP method invocation.
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class FieldReadInvocation extends FieldInvocation
{
public FieldReadInvocation(org.jboss.aop.advice.Interceptor[] interceptors)
{
- super(InvocationType.FIELD_READ, interceptors);
+ super(interceptors);
}
public FieldReadInvocation(org.jboss.aop.advice.Interceptor[] interceptors, \
org.jboss.aop.metadata.SimpleMetaData meta) {
- super(InvocationType.FIELD_READ, interceptors, meta);
+ super(interceptors, meta);
}
public FieldReadInvocation(FieldReadInvocation invocation)
1.2 +1 -3 \
jboss-aop/src/main/org/jboss/aop/joinpoint/FieldReadInvocationWrapper.java
Index: FieldReadInvocationWrapper.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/FieldReadInvocationWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldReadInvocationWrapper.java 27 Feb 2004 23:57:13 -0000 1.1
+++ FieldReadInvocationWrapper.java 29 Feb 2004 06:29:08 -0000 1.2
@@ -9,13 +9,11 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.metadata.MetaDataResolver;
-import java.lang.reflect.InvocationTargetException;
-
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class FieldReadInvocationWrapper extends FieldReadInvocation
1.7 +3 -4 \
jboss-aop/src/main/org/jboss/aop/joinpoint/FieldWriteInvocation.java
Index: FieldWriteInvocation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/FieldWriteInvocation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FieldWriteInvocation.java 27 Feb 2004 23:57:13 -0000 1.6
+++ FieldWriteInvocation.java 29 Feb 2004 06:29:08 -0000 1.7
@@ -7,7 +7,6 @@
package org.jboss.aop.joinpoint;
-import org.jboss.aop.metadata.MetaDataResolver;
import org.jboss.aop.advice.Interceptor;
@@ -17,7 +16,7 @@
* an AOP method invocation.
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class FieldWriteInvocation extends FieldInvocation
{
@@ -25,12 +24,12 @@
public FieldWriteInvocation(org.jboss.aop.advice.Interceptor[] interceptors)
{
- super(InvocationType.FIELD_WRITE, interceptors);
+ super(interceptors);
}
public FieldWriteInvocation(org.jboss.aop.advice.Interceptor[] interceptors, \
org.jboss.aop.metadata.SimpleMetaData meta) {
- super(InvocationType.FIELD_WRITE, interceptors, meta);
+ super(interceptors, meta);
}
public FieldWriteInvocation(FieldWriteInvocation invocation)
1.2 +1 -3 \
jboss-aop/src/main/org/jboss/aop/joinpoint/FieldWriteInvocationWrapper.java
Index: FieldWriteInvocationWrapper.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/FieldWriteInvocationWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldWriteInvocationWrapper.java 27 Feb 2004 23:57:13 -0000 1.1
+++ FieldWriteInvocationWrapper.java 29 Feb 2004 06:29:08 -0000 1.2
@@ -9,13 +9,11 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.metadata.MetaDataResolver;
-import java.lang.reflect.InvocationTargetException;
-
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class FieldWriteInvocationWrapper extends FieldWriteInvocation
1.6 +4 -12 jboss-aop/src/main/org/jboss/aop/joinpoint/Invocation.java
Index: Invocation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/Invocation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Invocation.java 27 Feb 2004 23:57:13 -0000 1.5
+++ Invocation.java 29 Feb 2004 06:29:08 -0000 1.6
@@ -20,12 +20,11 @@
* on field access, constructor, and methods
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*
*/
abstract public class Invocation implements java.io.Serializable
{
- protected InvocationType type;
protected org.jboss.aop.metadata.SimpleMetaData metadata = null;
@@ -127,19 +126,18 @@
}
}
- public Invocation(InvocationType type, org.jboss.aop.advice.Interceptor[] \
interceptors) + public Invocation(org.jboss.aop.advice.Interceptor[] interceptors)
{
- this(type, interceptors, null);
+ this(interceptors, null);
}
- public Invocation(InvocationType type, org.jboss.aop.advice.Interceptor[] \
interceptors, org.jboss.aop.metadata.SimpleMetaData meta) + public \
Invocation(org.jboss.aop.advice.Interceptor[] interceptors, \
org.jboss.aop.metadata.SimpleMetaData meta) {
// We expect a copy of the interceptor chain so that it can't change
// in the middle of an invocation. This is so that
// we can redeploy interceptor chains, yet not effect
// currently running invocations.
this.interceptors = interceptors;
- this.type = type;
this.metadata = meta;
}
@@ -148,16 +146,10 @@
*/
public Invocation(Invocation invocation)
{
- this.type = invocation.getType();
this.interceptors = invocation.getInterceptors();
targetObject = invocation.targetObject;
}
- public final InvocationType getType()
- {
- return type;
- }
-
public final org.jboss.aop.advice.Interceptor[] getInterceptors()
{
return interceptors;
1.7 +3 -3 \
jboss-aop/src/main/org/jboss/aop/joinpoint/MethodInvocation.java
Index: MethodInvocation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/MethodInvocation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MethodInvocation.java 27 Feb 2004 23:57:13 -0000 1.6
+++ MethodInvocation.java 29 Feb 2004 06:29:08 -0000 1.7
@@ -9,8 +9,8 @@
import org.jboss.aop.advice.Interceptor;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
/**
* This is a helper wrapper class for an Invocation object.
@@ -18,7 +18,7 @@
* an AOP method invocation.
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class MethodInvocation extends Invocation
{
@@ -29,7 +29,7 @@
public MethodInvocation(org.jboss.aop.advice.Interceptor[] interceptors)
{
- super(InvocationType.METHOD, interceptors);
+ super(interceptors);
}
/**
1.2 +1 -4 \
jboss-aop/src/main/org/jboss/aop/joinpoint/MethodInvocationWrapper.java
Index: MethodInvocationWrapper.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/joinpoint/MethodInvocationWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MethodInvocationWrapper.java 27 Feb 2004 23:57:13 -0000 1.1
+++ MethodInvocationWrapper.java 29 Feb 2004 06:29:08 -0000 1.2
@@ -6,16 +6,13 @@
*/
package org.jboss.aop.joinpoint;
-import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.metadata.MetaDataResolver;
-import java.lang.reflect.InvocationTargetException;
-
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class MethodInvocationWrapper extends MethodInvocation
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic