Update of /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18792/src/Adapdev.NVelocity/Runtime/Parser/Node
Modified Files:
ASTMethod.cs ASTReference.cs GetExecutor.cs
PropertyExecutor.cs
Log Message:
Cleaned up several warnings
Restored some lingering files
Index: ASTMethod.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node/ASTMethod.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ASTMethod.cs 16 Nov 2005 07:01:51 -0000 1.5
--- ASTMethod.cs 26 Nov 2005 08:09:23 -0000 1.6
***************
*** 283,287 ****
*/
! if (ec != null && ite.GetBaseException() is Exception)
{
try
--- 283,287 ----
*/
! if (ec != null)
{
try
Index: PropertyExecutor.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node/PropertyExecutor.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PropertyExecutor.cs 16 Nov 2005 07:01:51 -0000 1.5
--- PropertyExecutor.cs 26 Nov 2005 08:09:23 -0000 1.6
***************
*** 111,115 ****
*/
! if (ec != null && ite.GetBaseException() is Exception)
{
try
--- 111,115 ----
*/
! if (ec != null)
{
try
***************
*** 117,121 ****
return ec.methodException(o.GetType(), propertyUsed, (Exception) ite.GetBaseException());
}
! catch (Exception e)
{
throw new MethodInvocationException("Invocation of property '" + propertyUsed + "'" + " in " + o.GetType() + " threw exception " + ite.GetBaseException().GetType() + " : " + ite.GetBaseException().Message, ite.GetBaseException(), propertyUsed);
--- 117,121 ----
return ec.methodException(o.GetType(), propertyUsed, (Exception) ite.GetBaseException());
}
! catch (Exception)
{
throw new MethodInvocationException("Invocation of property '" + propertyUsed + "'" + " in " + o.GetType() + " threw exception " + ite.GetBaseException().GetType() + " : " + ite.GetBaseException().Message, ite.GetBaseException(), propertyUsed);
***************
*** 131,135 ****
}
}
! catch (ArgumentException iae)
{
return null;
--- 131,135 ----
}
}
! catch (ArgumentException)
{
return null;
Index: ASTReference.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node/ASTReference.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ASTReference.cs 16 Nov 2005 07:01:51 -0000 1.5
--- ASTReference.cs 26 Nov 2005 08:09:23 -0000 1.6
***************
*** 570,574 ****
}
}
! catch (MethodAccessException nsme2)
{
StringBuilder sb = new StringBuilder();
--- 570,574 ----
}
}
! catch (MethodAccessException)
{
StringBuilder sb = new StringBuilder();
***************
*** 599,603 ****
p.SetValue(result, value_Renamed, args);
}
! catch (MethodAccessException nsme)
{
/*
--- 599,603 ----
p.SetValue(result, value_Renamed, args);
}
! catch (MethodAccessException)
{
/*
Index: GetExecutor.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.NVelocity/Runtime/Parser/Node/GetExecutor.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GetExecutor.cs 16 Nov 2005 07:01:51 -0000 1.5
--- GetExecutor.cs 26 Nov 2005 08:09:23 -0000 1.6
***************
*** 62,66 ****
throw new MethodInvocationException("Invocation of method 'get(\"" + args[0] + "\")'" + " in " + o.GetType() + " threw exception " + ite.GetBaseException().GetType(), ite.GetBaseException(), "get");
}
! catch (ArgumentException iae)
{
return null;
--- 62,66 ----
throw new MethodInvocationException("Invocation of method 'get(\"" + args[0] + "\")'" + " in " + o.GetType() + " threw exception " + ite.GetBaseException().GetType(), ite.GetBaseException(), "get");
}
! catch (ArgumentException)
{
return null;
|
