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

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

Author: flavia.rainone at jboss.com
Date: 2008-01-04 08:57:01 -0500 (Fri, 04 Jan 2008)
New Revision: 68628

Modified:
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/Util.java
Log:
[JBAOP-505] Refactored, clean, algorithm.

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/Util.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/Util.java	2008-01-04 13:54:27 UTC (rev 68627)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/pointcut/Util.java	2008-01-04 13:57:01 UTC (rev 68628)
@@ -764,24 +764,12 @@
       
       private boolean wildcard()
       {
-         //boolean match = true;
-         //asti++;
-         
-         // useless loop
-         /*while (actuali < paramsLength && asti < astParameters.size() && isAnyZeroOrMoreParameters(asti))
-         {
-            asti++;
-         }*/
          // skip sequence of wildcards until the first non-wildcard parameter is
          // found
          do
          {
             asti++;
-         }
-         while (asti < astParameters.size() && isAnyZeroOrMoreParameters(asti));
-         /*{
-            asti++;
-         }*/
+         } while (asti < astParameters.size() && isAnyZeroOrMoreParameters(asti));
          
          // no actual parameters to compare
          if (actuali == paramsLength)
@@ -812,19 +800,7 @@
                // avoid extra backtracking steps here: the param expressions won't
                // match
                while (actuali < paramsLength && asti < astParameters.size() && !doMatch(asti, actuali));
-               /*   {
-                     actuali++;
-                  }
-                  
-               }while ( (actuali < paramsLength) ? !(match = matches(asti, actuali)) : false);*/
-               
             }
-            //useless if: match is already true;
-            /*if (actuali == paramsLength && asti == astParameters.size())
-            {
-               match = true;
-            }*/
-            // return match; ->.match will always be true, so remove this variable
             return true;
          }
       }