commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcucchi...@apache.org
Subject svn commit: r1184964 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/
Date Mon, 17 Oct 2011 00:26:35 GMT
Author: mcucchiara
Date: Mon Oct 17 00:26:34 2011
New Revision: 1184964

URL: http://svn.apache.org/viewvc?rev=1184964&view=rev
Log:
OGNL-28 - Visitor pattern needs way to propagate exceptions. (contributed by Daniel Pitts)

Modified:
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRemainder.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelect.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectLast.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSequence.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftRight.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticMethod.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSubtract.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTTest.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTVarRef.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTXor.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/Node.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java Mon Oct 17 00:26:34 2011
@@ -345,7 +345,8 @@ class ASTAdd
         }
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java Mon Oct 17 00:26:34 2011
@@ -243,7 +243,8 @@ public class ASTAnd
     /* (non-Javadoc)
      * @see org.apache.commons.ognl.Node#accept(org.apache.commons.ognl.NodeVisitor, java.lang.Object)
      */
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAssign.java Mon Oct 17 00:26:34 2011
@@ -100,13 +100,10 @@ class ASTAssign
             result =
                 OgnlRuntime
                     .getCompiler()
-                    .createLocalReference( 
-                       context,
-                        "org.apache.commons.ognl.OgnlOps.returnValue(($w)"
-                            + result
-                            + ", ($w)"
-                            + ( (OrderedReturn) _children[0] ).getLastExpression()
-                            + ")", Object.class );
+                    .createLocalReference( context,
+                                           "org.apache.commons.ognl.OgnlOps.returnValue(($w)" + result + ", ($w)"
+                                               + ( (OrderedReturn) _children[0] ).getLastExpression() + ")",
+                                           Object.class );
         }
 
         return result;
@@ -148,7 +145,8 @@ class ASTAssign
         return result + value + ")";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitAnd.java Mon Oct 17 00:26:34 2011
@@ -63,8 +63,9 @@ class ASTBitAnd
         return "(long)" + super.coerceToNumeric( source, context, child );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitNegate.java Mon Oct 17 00:26:34 2011
@@ -57,7 +57,8 @@ class ASTBitNegate
         }
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTBitOr.java Mon Oct 17 00:26:34 2011
@@ -58,7 +58,8 @@ class ASTBitOr
         return "|";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java Mon Oct 17 00:26:34 2011
@@ -496,7 +496,8 @@ public class ASTChain
         return result;
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTConst.java Mon Oct 17 00:26:34 2011
@@ -170,7 +170,8 @@ public class ASTConst
         return toGetSourceString( context, target );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTCtor.java Mon Oct 17 00:26:34 2011
@@ -370,6 +370,7 @@ public class ASTCtor
     }
 
     public <R,P> R accept(NodeVisitor<? extends R, ? super P> visitor, P data)
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTDivide.java Mon Oct 17 00:26:34 2011
@@ -51,7 +51,8 @@ class ASTDivide
     }
 
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEq.java Mon Oct 17 00:26:34 2011
@@ -55,7 +55,8 @@ class ASTEq
         return "org.apache.commons.ognl.OgnlOps.equal";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java Mon Oct 17 00:26:34 2011
@@ -89,7 +89,8 @@ class ASTEval
         throw new UnsupportedCompilationException( "Map expressions not supported as native java yet." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreater.java Mon Oct 17 00:26:34 2011
@@ -56,7 +56,8 @@ class ASTGreater
         return "org.apache.commons.ognl.OgnlOps.greater";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTGreaterEq.java Mon Oct 17 00:26:34 2011
@@ -55,7 +55,8 @@ class ASTGreaterEq
         return "!org.apache.commons.ognl.OgnlOps.less";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTIn.java Mon Oct 17 00:26:34 2011
@@ -94,7 +94,8 @@ class ASTIn
         throw new UnsupportedCompilationException( "Map expressions not supported as native java yet." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTInstanceof.java Mon Oct 17 00:26:34 2011
@@ -97,7 +97,8 @@ public class ASTInstanceof
         return toGetSourceString( context, target );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTKeyValue.java Mon Oct 17 00:26:34 2011
@@ -56,7 +56,8 @@ class ASTKeyValue
         return null;
     }
 
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLess.java Mon Oct 17 00:26:34 2011
@@ -56,7 +56,8 @@ class ASTLess
         return "org.apache.commons.ognl.OgnlOps.less";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTLessEq.java Mon Oct 17 00:26:34 2011
@@ -56,7 +56,8 @@ class ASTLessEq
     }
 
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java Mon Oct 17 00:26:34 2011
@@ -144,14 +144,9 @@ public class ASTList
                         value =
                             OgnlRuntime
                                 .getCompiler()
-                                .createLocalReference( context,
-                                                        "("
-                                                            + ExpressionCompiler.getCastString( ctorClass )
-                                                            + ")org.apache.commons.ognl.OgnlOps.toArray("
-                                                            + value
-                                                            + ", "
-                                                            + ctorClass.getComponentType().getName()
-                                                            + ".class, true)", ctorClass );
+                                .createLocalReference( context, "(" + ExpressionCompiler.getCastString( ctorClass )
+                                    + ")org.apache.commons.ognl.OgnlOps.toArray(" + value + ", "
+                                    + ctorClass.getComponentType().getName() + ".class, true)", ctorClass );
 
                     }
                     else if ( ctorClass.isPrimitive() )
@@ -162,16 +157,10 @@ public class ASTList
                         value =
                             OgnlRuntime
                                 .getCompiler()
-                                .createLocalReference( context,
-                                                        "(("
-                                                            + wrapClass.getName()
-                                                            + ")org.apache.commons.ognl.OgnlOps.convertValue("
-                                                            + value
-                                                            + ","
-                                                            + wrapClass.getName()
-                                                            + ".class, true))."
-                                                            + OgnlRuntime.getNumericValueGetter( wrapClass ),
-                                                        ctorClass );
+                                .createLocalReference( context, "((" + wrapClass.getName()
+                                    + ")org.apache.commons.ognl.OgnlOps.convertValue(" + value + ","
+                                    + wrapClass.getName() + ".class, true))." + OgnlRuntime.getNumericValueGetter(
+                                    wrapClass ), ctorClass );
                     }
                     else if ( ctorClass != Object.class )
                     {
@@ -179,13 +168,9 @@ public class ASTList
                         value =
                             OgnlRuntime
                                 .getCompiler()
-                                .createLocalReference( 
-                                                        context,
-                                                        "("
-                                                            + ctorClass.getName()
-                                                            + ")org.apache.commons.ognl.OgnlOps.convertValue("
-                                                            + value + "," + ctorClass.getName()
-                                                            + ".class)", ctorClass );
+                                .createLocalReference( context, "(" + ctorClass.getName()
+                                    + ")org.apache.commons.ognl.OgnlOps.convertValue(" + value + ","
+                                    + ctorClass.getName() + ".class)", ctorClass );
 
                     }
                     else if ( ( NodeType.class.isInstance( _children[i] )
@@ -238,7 +223,8 @@ public class ASTList
         throw new UnsupportedCompilationException( "Can't generate setter for ASTList." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMap.java Mon Oct 17 00:26:34 2011
@@ -127,7 +127,8 @@ class ASTMap
         throw new UnsupportedCompilationException( "Map expressions not supported as native java yet." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java Mon Oct 17 00:26:34 2011
@@ -294,14 +294,9 @@ public class ASTMethod
                             parmString =
                                 OgnlRuntime
                                     .getCompiler()
-                                    .createLocalReference( context,
-                                                            "("
-                                                                + ExpressionCompiler.getCastString( parms[i] )
-                                                                + ")org.apache.commons.ognl.OgnlOps#toArray("
-                                                                + parmString
-                                                                + ", "
-                                                                + parms[i].getComponentType().getName()
-                                                                + ".class, true)", parms[i] );
+                                    .createLocalReference( context, "(" + ExpressionCompiler.getCastString( parms[i] )
+                                        + ")org.apache.commons.ognl.OgnlOps#toArray(" + parmString + ", "
+                                        + parms[i].getComponentType().getName() + ".class, true)", parms[i] );
 
                         }
                         else if ( parms[i].isPrimitive() )
@@ -312,16 +307,10 @@ public class ASTMethod
                             parmString =
                                 OgnlRuntime
                                     .getCompiler()
-                                    .createLocalReference( context,
-                                                            "(("
-                                                                + wrapClass.getName()
-                                                                + ")org.apache.commons.ognl.OgnlOps#convertValue("
-                                                                + parmString
-                                                                + ","
-                                                                + wrapClass.getName()
-                                                                + ".class, true))."
-                                                                + OgnlRuntime.getNumericValueGetter( wrapClass ),
-                                                            parms[i] );
+                                    .createLocalReference( context, "((" + wrapClass.getName()
+                                        + ")org.apache.commons.ognl.OgnlOps#convertValue(" + parmString + ","
+                                        + wrapClass.getName() + ".class, true))." + OgnlRuntime.getNumericValueGetter(
+                                        wrapClass ), parms[i] );
 
                         }
                         else if ( parms[i] != Object.class )
@@ -329,13 +318,9 @@ public class ASTMethod
                             parmString =
                                 OgnlRuntime
                                     .getCompiler()
-                                    .createLocalReference( context,
-                                                            "("
-                                                                + parms[i].getName()
-                                                                + ")org.apache.commons.ognl.OgnlOps#convertValue("
-                                                                + parmString + ","
-                                                                + parms[i].getName() + ".class)",
-                                                            parms[i] );
+                                    .createLocalReference( context, "(" + parms[i].getName()
+                                        + ")org.apache.commons.ognl.OgnlOps#convertValue(" + parmString + ","
+                                        + parms[i].getName() + ".class)", parms[i] );
                         }
                         else if ( ( NodeType.class.isInstance( _children[i] )
                             && ( (NodeType) _children[i] ).getGetterClass() != null 
@@ -505,14 +490,9 @@ public class ASTMethod
                             parmString =
                                 OgnlRuntime
                                     .getCompiler()
-                                    .createLocalReference( context,
-                                                            "("
-                                                                + ExpressionCompiler.getCastString( parms[i] )
-                                                                + ")org.apache.commons.ognl.OgnlOps#toArray("
-                                                                + parmString
-                                                                + ", "
-                                                                + parms[i].getComponentType().getName()
-                                                                + ".class)", parms[i] );
+                                    .createLocalReference( context, "(" + ExpressionCompiler.getCastString( parms[i] )
+                                        + ")org.apache.commons.ognl.OgnlOps#toArray(" + parmString + ", "
+                                        + parms[i].getComponentType().getName() + ".class)", parms[i] );
 
                         }
                         else if ( parms[i].isPrimitive() )
@@ -522,16 +502,10 @@ public class ASTMethod
                             parmString =
                                 OgnlRuntime
                                     .getCompiler()
-                                    .createLocalReference( context,
-                                                            "(("
-                                                                + wrapClass.getName()
-                                                                + ")org.apache.commons.ognl.OgnlOps#convertValue("
-                                                                + parmString
-                                                                + ","
-                                                                + wrapClass.getName()
-                                                                + ".class, true))."
-                                                                + OgnlRuntime.getNumericValueGetter( wrapClass ),
-                                                            parms[i] );
+                                    .createLocalReference( context, "((" + wrapClass.getName()
+                                        + ")org.apache.commons.ognl.OgnlOps#convertValue(" + parmString + ","
+                                        + wrapClass.getName() + ".class, true))." + OgnlRuntime.getNumericValueGetter(
+                                        wrapClass ), parms[i] );
 
                         }
                         else if ( parms[i] != Object.class )
@@ -539,13 +513,9 @@ public class ASTMethod
                             parmString =
                                 OgnlRuntime
                                     .getCompiler()
-                                    .createLocalReference( context,
-                                                            "("
-                                                                + parms[i].getName()
-                                                                + ")org.apache.commons.ognl.OgnlOps#convertValue("
-                                                                + parmString + ","
-                                                                + parms[i].getName() + ".class)",
-                                                            parms[i] );
+                                    .createLocalReference( context, "(" + parms[i].getName()
+                                        + ")org.apache.commons.ognl.OgnlOps#convertValue(" + parmString + ","
+                                        + parms[i].getName() + ".class)", parms[i] );
 
                         }
                         else if ( ( NodeType.class.isInstance( _children[i] )
@@ -592,7 +562,8 @@ public class ASTMethod
         return result + ")" + post;
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMultiply.java Mon Oct 17 00:26:34 2011
@@ -59,7 +59,8 @@ class ASTMultiply
         return "*";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNegate.java Mon Oct 17 00:26:34 2011
@@ -57,7 +57,8 @@ class ASTNegate
         }
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNot.java Mon Oct 17 00:26:34 2011
@@ -71,7 +71,8 @@ class ASTNot
         }
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotEq.java Mon Oct 17 00:26:34 2011
@@ -56,7 +56,8 @@ class ASTNotEq
         return "!org.apache.commons.ognl.OgnlOps.equal";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTNotIn.java Mon Oct 17 00:26:34 2011
@@ -88,7 +88,8 @@ class ASTNotIn
         }
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTOr.java Mon Oct 17 00:26:34 2011
@@ -200,7 +200,8 @@ public class ASTOr
         return result;
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProject.java Mon Oct 17 00:26:34 2011
@@ -71,7 +71,8 @@ class ASTProject
         throw new UnsupportedCompilationException( "Projection expressions not supported as native java yet." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java Mon Oct 17 00:26:34 2011
@@ -690,7 +690,8 @@ public class ASTProperty
         return result;
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRemainder.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRemainder.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRemainder.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRemainder.java Mon Oct 17 00:26:34 2011
@@ -50,7 +50,8 @@ class ASTRemainder
         return "%";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTRootVarRef.java Mon Oct 17 00:26:34 2011
@@ -76,7 +76,8 @@ public class ASTRootVarRef
             return "$3";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelect.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelect.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelect.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelect.java Mon Oct 17 00:26:34 2011
@@ -73,7 +73,8 @@ class ASTSelect
         throw new UnsupportedCompilationException( "Eval expressions not supported as native java yet." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectFirst.java Mon Oct 17 00:26:34 2011
@@ -73,7 +73,8 @@ class ASTSelectFirst
         throw new UnsupportedCompilationException( "Eval expressions not supported as native java yet." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectLast.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectLast.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectLast.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSelectLast.java Mon Oct 17 00:26:34 2011
@@ -73,7 +73,8 @@ class ASTSelectLast
         throw new UnsupportedCompilationException( "Eval expressions not supported as native java yet." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSequence.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSequence.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSequence.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSequence.java Mon Oct 17 00:26:34 2011
@@ -153,7 +153,8 @@ public class ASTSequence
         return result;
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftLeft.java Mon Oct 17 00:26:34 2011
@@ -50,7 +50,8 @@ class ASTShiftLeft
         return "<<";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftRight.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftRight.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftRight.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTShiftRight.java Mon Oct 17 00:26:34 2011
@@ -50,7 +50,8 @@ class ASTShiftRight
         return ">>";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java Mon Oct 17 00:26:34 2011
@@ -209,7 +209,8 @@ public class ASTStaticField
         return className + "." + fieldName;
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticMethod.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticMethod.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticMethod.java Mon Oct 17 00:26:34 2011
@@ -244,7 +244,8 @@ public class ASTStaticMethod
         return toGetSourceString( context, target );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSubtract.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSubtract.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSubtract.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTSubtract.java Mon Oct 17 00:26:34 2011
@@ -50,7 +50,8 @@ class ASTSubtract
         return "-";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTTest.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTTest.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTTest.java Mon Oct 17 00:26:34 2011
@@ -135,7 +135,8 @@ class ASTTest
         }
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTThisVarRef.java Mon Oct 17 00:26:34 2011
@@ -62,7 +62,8 @@ public class ASTThisVarRef
         throw new UnsupportedCompilationException( "Unable to compile this references." );
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTUnsignedShiftRight.java Mon Oct 17 00:26:34 2011
@@ -86,7 +86,8 @@ class ASTUnsignedShiftRight
         return result;
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTVarRef.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTVarRef.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTVarRef.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTVarRef.java Mon Oct 17 00:26:34 2011
@@ -141,6 +141,7 @@ public class ASTVarRef
     }
 
     public <R,P> R accept(NodeVisitor<? extends R, ? super P> visitor, P data)
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTXor.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTXor.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTXor.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTXor.java Mon Oct 17 00:26:34 2011
@@ -58,7 +58,8 @@ class ASTXor
         return "^";
     }
     
-    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data ) 
+    public <R, P> R accept( NodeVisitor<? extends R, ? super P> visitor, P data )
+        throws OgnlException
     {
         return visitor.visit( this, data );
     }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/Node.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/Node.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/Node.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/Node.java Mon Oct 17 00:26:34 2011
@@ -104,6 +104,7 @@ public interface Node
      * @throws NullPointerException if visitor is null
      * @throws RuntimeException if visitor.visit throws an exception.
      */
-    <R,P> R accept(NodeVisitor<? extends R, ? super P> visitor, P data);
+    <R,P> R accept(NodeVisitor<? extends R, ? super P> visitor, P data)
+        throws OgnlException;
 
 }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java Mon Oct 17 00:26:34 2011
@@ -22,50 +22,50 @@ package org.apache.commons.ognl;
 
 public interface NodeVisitor<R, P>
 {
-  public R visit(ASTSequence node, P data);
-  public R visit(ASTAssign node, P data);
-  public R visit(ASTTest node, P data);
-  public R visit(ASTOr node, P data);
-  public R visit(ASTAnd node, P data);
-  public R visit(ASTBitOr node, P data);
-  public R visit(ASTXor node, P data);
-  public R visit(ASTBitAnd node, P data);
-  public R visit(ASTEq node, P data);
-  public R visit(ASTNotEq node, P data);
-  public R visit(ASTLess node, P data);
-  public R visit(ASTGreater node, P data);
-  public R visit(ASTLessEq node, P data);
-  public R visit(ASTGreaterEq node, P data);
-  public R visit(ASTIn node, P data);
-  public R visit(ASTNotIn node, P data);
-  public R visit(ASTShiftLeft node, P data);
-  public R visit(ASTShiftRight node, P data);
-  public R visit(ASTUnsignedShiftRight node, P data);
-  public R visit(ASTAdd node, P data);
-  public R visit(ASTSubtract node, P data);
-  public R visit(ASTMultiply node, P data);
-  public R visit(ASTDivide node, P data);
-  public R visit(ASTRemainder node, P data);
-  public R visit(ASTNegate node, P data);
-  public R visit(ASTBitNegate node, P data);
-  public R visit(ASTNot node, P data);
-  public R visit(ASTInstanceof node, P data);
-  public R visit(ASTChain node, P data);
-  public R visit(ASTEval node, P data);
-  public R visit(ASTConst node, P data);
-  public R visit(ASTThisVarRef node, P data);
-  public R visit(ASTRootVarRef node, P data);
-  public R visit(ASTVarRef node, P data);
-  public R visit(ASTList node, P data);
-  public R visit(ASTMap node, P data);
-  public R visit(ASTKeyValue node, P data);
-  public R visit(ASTStaticField node, P data);
-  public R visit(ASTCtor node, P data);
-  public R visit(ASTProperty node, P data);
-  public R visit(ASTStaticMethod node, P data);
-  public R visit(ASTMethod node, P data);
-  public R visit(ASTProject node, P data);
-  public R visit(ASTSelect node, P data);
-  public R visit(ASTSelectFirst node, P data);
-  public R visit(ASTSelectLast node, P data);
+  public R visit(ASTSequence node, P data) throws OgnlException;
+  public R visit(ASTAssign node, P data) throws OgnlException;
+  public R visit(ASTTest node, P data) throws OgnlException;
+  public R visit(ASTOr node, P data) throws OgnlException;
+  public R visit(ASTAnd node, P data) throws OgnlException;
+  public R visit(ASTBitOr node, P data) throws OgnlException;
+  public R visit(ASTXor node, P data) throws OgnlException;
+  public R visit(ASTBitAnd node, P data) throws OgnlException;
+  public R visit(ASTEq node, P data) throws OgnlException;
+  public R visit(ASTNotEq node, P data) throws OgnlException;
+  public R visit(ASTLess node, P data) throws OgnlException;
+  public R visit(ASTGreater node, P data) throws OgnlException;
+  public R visit(ASTLessEq node, P data) throws OgnlException;
+  public R visit(ASTGreaterEq node, P data) throws OgnlException;
+  public R visit(ASTIn node, P data) throws OgnlException;
+  public R visit(ASTNotIn node, P data) throws OgnlException;
+  public R visit(ASTShiftLeft node, P data) throws OgnlException;
+  public R visit(ASTShiftRight node, P data) throws OgnlException;
+  public R visit(ASTUnsignedShiftRight node, P data) throws OgnlException;
+  public R visit(ASTAdd node, P data) throws OgnlException;
+  public R visit(ASTSubtract node, P data) throws OgnlException;
+  public R visit(ASTMultiply node, P data) throws OgnlException;
+  public R visit(ASTDivide node, P data) throws OgnlException;
+  public R visit(ASTRemainder node, P data) throws OgnlException;
+  public R visit(ASTNegate node, P data) throws OgnlException;
+  public R visit(ASTBitNegate node, P data) throws OgnlException;
+  public R visit(ASTNot node, P data) throws OgnlException;
+  public R visit(ASTInstanceof node, P data) throws OgnlException;
+  public R visit(ASTChain node, P data) throws OgnlException;
+  public R visit(ASTEval node, P data) throws OgnlException;
+  public R visit(ASTConst node, P data) throws OgnlException;
+  public R visit(ASTThisVarRef node, P data) throws OgnlException;
+  public R visit(ASTRootVarRef node, P data) throws OgnlException;
+  public R visit(ASTVarRef node, P data) throws OgnlException;
+  public R visit(ASTList node, P data) throws OgnlException;
+  public R visit(ASTMap node, P data) throws OgnlException;
+  public R visit(ASTKeyValue node, P data) throws OgnlException;
+  public R visit(ASTStaticField node, P data) throws OgnlException;
+  public R visit(ASTCtor node, P data) throws OgnlException;
+  public R visit(ASTProperty node, P data) throws OgnlException;
+  public R visit(ASTStaticMethod node, P data) throws OgnlException;
+  public R visit(ASTMethod node, P data) throws OgnlException;
+  public R visit(ASTProject node, P data) throws OgnlException;
+  public R visit(ASTSelect node, P data) throws OgnlException;
+  public R visit(ASTSelectFirst node, P data) throws OgnlException;
+  public R visit(ASTSelectLast node, P data) throws OgnlException;
 }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java Mon Oct 17 00:26:34 2011
@@ -113,7 +113,16 @@ public abstract class SimpleNode
     @Override
     public String toString()
     {
-        return accept( ToStringVisitor.INSTANCE, new StringBuilder()).toString();
+        final StringBuilder data = new StringBuilder();
+        try
+        {
+            accept( ToStringVisitor.INSTANCE, data );
+        }
+        catch ( OgnlException e )
+        {
+            // ignored.
+        }
+        return data.toString();
     }
 
     // OGNL additions

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java?rev=1184964&r1=1184963&r2=1184964&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java Mon Oct 17 00:26:34 2011
@@ -452,7 +452,15 @@ public class ToStringVisitor
 
     private StringBuilder recurse( Node child, StringBuilder data )
     {
-        return child == null ? data.append( "null" ) : child.accept( this, data );
+        try
+        {
+            return child == null ? data.append( "null" ) : child.accept( this, data );
+        }
+        catch ( OgnlException e )
+        {
+            // This should never happen, but delegate it on just in case.
+            throw new RuntimeException( e );
+        }
     }
 
 }



Mime
View raw message