[jboss-cvs] JBossAS SVN: r74293 - projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast.

[jboss-cvs-commits at lists.jboss.org]

Author: flavia.rainone at jboss.com
Date: 2008-06-08 18:23:21 -0400 (Sun, 08 Jun 2008)
New Revision: 74293

Modified:
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTBehavior.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTConstructor.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTMethod.java
Log:
[JBAOP-509] The visit methods, despite being equal, cannot be in the superclass ASTBehavior. They must stay in
the subclasses ASTConstructor and ASTMethod because of polimorphism. Otherwise, the matcher's metod visit(SimpleNode)
will be called, instead of visit(ASTMethod) and visit(ASTConstructor), causing a bug.

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTBehavior.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTBehavior.java	2008-06-08 21:35:30 UTC (rev 74292)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTBehavior.java	2008-06-08 22:23:21 UTC (rev 74293)
@@ -67,17 +67,6 @@
    }
    
    /** Accept the visitor. **/
-   public Object jjtAccept(PointcutExpressionParserVisitor visitor, Object data)
-   {
-      return visitor.visit(this, data);
-   }
-   /** Accept the visitor. **/
-   public Object jjtAccept(TypeExpressionParserVisitor visitor, Object data)
-   {
-      return visitor.visit(this, data);
-   }
-
-   
    public void setClassExpression(String exp)
    {
       classExpr = exp;

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTConstructor.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTConstructor.java	2008-06-08 21:35:30 UTC (rev 74292)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTConstructor.java	2008-06-08 22:23:21 UTC (rev 74293)
@@ -49,4 +49,14 @@
    {
       return annotation;
    }
+   
+   public Object jjtAccept(PointcutExpressionParserVisitor visitor, Object data)
+   {
+      return visitor.visit(this, data);
+   }
+   /** Accept the visitor. **/
+   public Object jjtAccept(TypeExpressionParserVisitor visitor, Object data)
+   {
+      return visitor.visit(this, data);
+   }
 }
\ No newline at end of file

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTMethod.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTMethod.java	2008-06-08 21:35:30 UTC (rev 74292)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/ast/ASTMethod.java	2008-06-08 22:23:21 UTC (rev 74293)
@@ -72,4 +72,14 @@
    {
       return methodIdentifier;
    }
+   
+   public Object jjtAccept(PointcutExpressionParserVisitor visitor, Object data)
+   {
+      return visitor.visit(this, data);
+   }
+   /** Accept the visitor. **/
+   public Object jjtAccept(TypeExpressionParserVisitor visitor, Object data)
+   {
+      return visitor.visit(this, data);
+   }
 }
\ No newline at end of file