[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/pointcut CFlow.java CFlowMatcher.java CFlowStack.java C
From: Bill Burke <patriot1burke () users ! sourceforge ! net>
Date: 2004-02-29 6:29:10
Message-ID: E1AxKRq-0007oQ-5s () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
User: patriot1burke
Date: 04/02/28 22:29:10
Modified: src/main/org/jboss/aop/pointcut CFlow.java CFlowMatcher.java
CFlowStack.java CallMatcher.java
ConstructorMatcher.java
ExecutionConstructorMatcher.java
ExecutionMethodMatcher.java FieldGetMatcher.java
FieldMatcher.java MatcherHelper.java
MethodMatcher.java Pointcut.java
PointcutExpression.java SoftClassMatcher.java
Log:
cleanup. Removed InvocationType
Revision Changes Path
1.2 +3 -4 jboss-aop/src/main/org/jboss/aop/pointcut/CFlow.java
Index: CFlow.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/CFlow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CFlow.java 27 Feb 2004 23:57:14 -0000 1.1
+++ CFlow.java 29 Feb 2004 06:29:09 -0000 1.2
@@ -6,13 +6,12 @@
*/
package org.jboss.aop.pointcut;
+import org.jboss.aop.pointcut.ast.ASTConstructor;
import org.jboss.aop.pointcut.ast.ASTExecution;
+import org.jboss.aop.pointcut.ast.ASTMethod;
import org.jboss.aop.pointcut.ast.ParseException;
import org.jboss.aop.pointcut.ast.PointcutExpressionParser;
import org.jboss.aop.pointcut.ast.SimpleNode;
-import org.jboss.aop.pointcut.ast.ASTMethod;
-import org.jboss.aop.pointcut.ast.ASTConstructor;
-import org.jboss.aop.pointcut.ast.ClassExpression;
import java.io.StringReader;
@@ -20,7 +19,7 @@
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class CFlow
1.2 +7 -7 jboss-aop/src/main/org/jboss/aop/pointcut/CFlowMatcher.java
Index: CFlowMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/CFlowMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CFlowMatcher.java 27 Feb 2004 23:57:14 -0000 1.1
+++ CFlowMatcher.java 29 Feb 2004 06:29:09 -0000 1.2
@@ -6,22 +6,22 @@
*/
package org.jboss.aop.pointcut;
-import org.jboss.aop.pointcut.ast.ASTCFlowExpression;
+import org.jboss.aop.AspectManager;
+import org.jboss.aop.pointcut.ast.ASTAndCFlow;
+import org.jboss.aop.pointcut.ast.ASTCFlow;
import org.jboss.aop.pointcut.ast.ASTCFlowBoolean;
-import org.jboss.aop.pointcut.ast.ASTNotCFlow;
+import org.jboss.aop.pointcut.ast.ASTCFlowExpression;
import org.jboss.aop.pointcut.ast.ASTCompositeCFlow;
-import org.jboss.aop.pointcut.ast.ASTSubCFlow;
-import org.jboss.aop.pointcut.ast.ASTAndCFlow;
+import org.jboss.aop.pointcut.ast.ASTNotCFlow;
import org.jboss.aop.pointcut.ast.ASTOrCFlow;
-import org.jboss.aop.pointcut.ast.ASTCFlow;
+import org.jboss.aop.pointcut.ast.ASTSubCFlow;
import org.jboss.aop.pointcut.ast.Node;
-import org.jboss.aop.AspectManager;
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class CFlowMatcher extends MatcherHelper
1.2 +1 -3 jboss-aop/src/main/org/jboss/aop/pointcut/CFlowStack.java
Index: CFlowStack.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/CFlowStack.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CFlowStack.java 27 Feb 2004 23:57:14 -0000 1.1
+++ CFlowStack.java 29 Feb 2004 06:29:09 -0000 1.2
@@ -6,15 +6,13 @@
*/
package org.jboss.aop.pointcut;
-import org.jboss.aop.pointcut.CFlow;
-
import java.util.ArrayList;
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class CFlowStack
1.3 +2 -4 jboss-aop/src/main/org/jboss/aop/pointcut/CallMatcher.java
Index: CallMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/CallMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallMatcher.java 21 Feb 2004 14:14:44 -0000 1.2
+++ CallMatcher.java 29 Feb 2004 06:29:09 -0000 1.3
@@ -6,22 +6,20 @@
*/
package org.jboss.aop.pointcut;
-import javassist.NotFoundException;
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.pointcut.ast.ASTCall;
import org.jboss.aop.pointcut.ast.ASTMethod;
import org.jboss.aop.pointcut.ast.ASTStart;
-import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Method;
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
**/
public class CallMatcher extends MatcherHelper
1.5 +2 -2 jboss-aop/src/main/org/jboss/aop/pointcut/ConstructorMatcher.java
Index: ConstructorMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/ConstructorMatcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConstructorMatcher.java 27 Feb 2004 00:13:28 -0000 1.4
+++ ConstructorMatcher.java 29 Feb 2004 06:29:09 -0000 1.5
@@ -10,12 +10,12 @@
import javassist.CtConstructor;
import javassist.NotFoundException;
import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.pointcut.ast.ASTAll;
import org.jboss.aop.pointcut.ast.ASTAttribute;
import org.jboss.aop.pointcut.ast.ASTConstructor;
import org.jboss.aop.pointcut.ast.ASTParameter;
import org.jboss.aop.pointcut.ast.ASTStart;
import org.jboss.aop.pointcut.ast.ClassExpression;
-import org.jboss.aop.pointcut.ast.ASTAll;
import java.lang.reflect.Constructor;
@@ -23,7 +23,7 @@
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*
**/
public class ConstructorMatcher extends MatcherHelper
1.3 +1 -2 jboss-aop/src/main/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java
Index: ExecutionConstructorMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExecutionConstructorMatcher.java 18 Feb 2004 23:24:36 -0000 1.2
+++ ExecutionConstructorMatcher.java 29 Feb 2004 06:29:09 -0000 1.3
@@ -11,7 +11,6 @@
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.pointcut.ast.ASTExecution;
import org.jboss.aop.pointcut.ast.ASTStart;
-import org.jboss.aop.pointcut.ast.ASTAll;
import java.lang.reflect.Constructor;
@@ -19,7 +18,7 @@
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
**/
public class ExecutionConstructorMatcher extends ConstructorMatcher
1.3 +1 -2 jboss-aop/src/main/org/jboss/aop/pointcut/ExecutionMethodMatcher.java
Index: ExecutionMethodMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/ExecutionMethodMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExecutionMethodMatcher.java 18 Feb 2004 23:24:36 -0000 1.2
+++ ExecutionMethodMatcher.java 29 Feb 2004 06:29:09 -0000 1.3
@@ -11,7 +11,6 @@
import org.jboss.aop.Advisor;
import org.jboss.aop.pointcut.ast.ASTExecution;
import org.jboss.aop.pointcut.ast.ASTStart;
-import org.jboss.aop.pointcut.ast.ASTAll;
import java.lang.reflect.Method;
@@ -19,7 +18,7 @@
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
**/
public class ExecutionMethodMatcher extends MethodMatcher
1.2 +1 -2 jboss-aop/src/main/org/jboss/aop/pointcut/FieldGetMatcher.java
Index: FieldGetMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/FieldGetMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldGetMatcher.java 14 Feb 2004 07:11:59 -0000 1.1
+++ FieldGetMatcher.java 29 Feb 2004 06:29:09 -0000 1.2
@@ -11,7 +11,6 @@
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.pointcut.ast.ASTGet;
import org.jboss.aop.pointcut.ast.ASTStart;
-import org.jboss.aop.pointcut.ast.ASTAll;
import java.lang.reflect.Field;
@@ -19,7 +18,7 @@
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
**/
public class FieldGetMatcher extends FieldMatcher
1.6 +3 -3 jboss-aop/src/main/org/jboss/aop/pointcut/FieldMatcher.java
Index: FieldMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/FieldMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FieldMatcher.java 27 Feb 2004 00:13:28 -0000 1.5
+++ FieldMatcher.java 29 Feb 2004 06:29:09 -0000 1.6
@@ -9,11 +9,11 @@
import javassist.CtField;
import javassist.NotFoundException;
import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.pointcut.ast.ASTAll;
import org.jboss.aop.pointcut.ast.ASTAttribute;
import org.jboss.aop.pointcut.ast.ASTField;
-import org.jboss.aop.pointcut.ast.ASTStart;
-import org.jboss.aop.pointcut.ast.ASTAll;
import org.jboss.aop.pointcut.ast.ASTFieldExecution;
+import org.jboss.aop.pointcut.ast.ASTStart;
import java.lang.reflect.Field;
@@ -21,7 +21,7 @@
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*
**/
public abstract class FieldMatcher extends MatcherHelper
1.4 +4 -4 jboss-aop/src/main/org/jboss/aop/pointcut/MatcherHelper.java
Index: MatcherHelper.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/MatcherHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MatcherHelper.java 27 Feb 2004 23:57:14 -0000 1.3
+++ MatcherHelper.java 29 Feb 2004 06:29:09 -0000 1.4
@@ -7,6 +7,7 @@
package org.jboss.aop.pointcut;
import org.jboss.aop.AspectManager;
+import org.jboss.aop.pointcut.ast.ASTAll;
import org.jboss.aop.pointcut.ast.ASTAllParameter;
import org.jboss.aop.pointcut.ast.ASTAnd;
import org.jboss.aop.pointcut.ast.ASTAndCFlow;
@@ -21,7 +22,9 @@
import org.jboss.aop.pointcut.ast.ASTCompositeCFlow;
import org.jboss.aop.pointcut.ast.ASTConstructor;
import org.jboss.aop.pointcut.ast.ASTExecution;
+import org.jboss.aop.pointcut.ast.ASTExecutionOnly;
import org.jboss.aop.pointcut.ast.ASTField;
+import org.jboss.aop.pointcut.ast.ASTFieldExecution;
import org.jboss.aop.pointcut.ast.ASTGet;
import org.jboss.aop.pointcut.ast.ASTMethod;
import org.jboss.aop.pointcut.ast.ASTNot;
@@ -41,15 +44,12 @@
import org.jboss.aop.pointcut.ast.Node;
import org.jboss.aop.pointcut.ast.PointcutExpressionParserVisitor;
import org.jboss.aop.pointcut.ast.SimpleNode;
-import org.jboss.aop.pointcut.ast.ASTAll;
-import org.jboss.aop.pointcut.ast.ASTFieldExecution;
-import org.jboss.aop.pointcut.ast.ASTExecutionOnly;
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
**/
public abstract class MatcherHelper implements PointcutExpressionParserVisitor
1.5 +2 -2 jboss-aop/src/main/org/jboss/aop/pointcut/MethodMatcher.java
Index: MethodMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/MethodMatcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MethodMatcher.java 27 Feb 2004 00:13:28 -0000 1.4
+++ MethodMatcher.java 29 Feb 2004 06:29:09 -0000 1.5
@@ -10,12 +10,12 @@
import javassist.CtMethod;
import javassist.NotFoundException;
import org.jboss.aop.Advisor;
+import org.jboss.aop.pointcut.ast.ASTAll;
import org.jboss.aop.pointcut.ast.ASTAttribute;
import org.jboss.aop.pointcut.ast.ASTMethod;
import org.jboss.aop.pointcut.ast.ASTParameter;
import org.jboss.aop.pointcut.ast.ASTStart;
import org.jboss.aop.pointcut.ast.ClassExpression;
-import org.jboss.aop.pointcut.ast.ASTAll;
import java.lang.reflect.Method;
@@ -23,7 +23,7 @@
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*
**/
public class MethodMatcher extends MatcherHelper
1.3 +2 -2 jboss-aop/src/main/org/jboss/aop/pointcut/Pointcut.java
Index: Pointcut.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/Pointcut.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Pointcut.java 21 Feb 2004 14:14:44 -0000 1.2
+++ Pointcut.java 29 Feb 2004 06:29:09 -0000 1.3
@@ -15,16 +15,16 @@
import org.jboss.aop.Advisor;
import org.jboss.aop.ClassAdvisor;
+import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.lang.reflect.AccessibleObject;
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
**/
public interface Pointcut
1.3 +2 -2 jboss-aop/src/main/org/jboss/aop/pointcut/PointcutExpression.java
Index: PointcutExpression.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/PointcutExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PointcutExpression.java 21 Feb 2004 14:14:44 -0000 1.2
+++ PointcutExpression.java 29 Feb 2004 06:29:09 -0000 1.3
@@ -19,16 +19,16 @@
import org.jboss.aop.pointcut.ast.PointcutExpressionParser;
import java.io.StringReader;
+import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.lang.reflect.AccessibleObject;
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
**/
public class PointcutExpression implements Pointcut
1.6 +2 -3 jboss-aop/src/main/org/jboss/aop/pointcut/SoftClassMatcher.java
Index: SoftClassMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/SoftClassMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SoftClassMatcher.java 27 Feb 2004 23:57:14 -0000 1.5
+++ SoftClassMatcher.java 29 Feb 2004 06:29:09 -0000 1.6
@@ -33,16 +33,15 @@
import org.jboss.aop.pointcut.ast.ASTSubCFlow;
import org.jboss.aop.pointcut.ast.ASTWithin;
import org.jboss.aop.pointcut.ast.ASTWithinExpression;
+import org.jboss.aop.pointcut.ast.ClassExpression;
import org.jboss.aop.pointcut.ast.Node;
import org.jboss.aop.pointcut.ast.SimpleNode;
-import org.jboss.aop.pointcut.ast.ClassExpression;
-import javassist.NotFoundException;
/**
* Comment
*
* @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*
**/
public class SoftClassMatcher extends MatcherHelper
-------------------------------------------------------
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