You are viewing a plain text version of this content. The canonical link for it is here.
Posted to imperius-commits@incubator.apache.org by jn...@apache.org on 2008/08/18 12:50:42 UTC
svn commit: r686743 [8/10] - in /incubator/imperius/trunk:
imperius-javaspl/src/main/java/org/apache/imperius/javaspl/
imperius-splcore/src/main/antlr/org/apache/imperius/spl/parser/compiler/
imperius-splcore/src/main/java/org/apache/imperius/spl/datas...
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Rint.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Rint.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Rint.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Rint.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -59,8 +60,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "Rint");
@@ -82,7 +83,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Round.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Round.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Round.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Round.java Mon Aug 18 05:50:36 2008
@@ -35,6 +35,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -62,8 +63,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "Round");
@@ -85,7 +86,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SdInCollection.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SdInCollection.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SdInCollection.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SdInCollection.java Mon Aug 18 05:50:36 2008
@@ -34,6 +34,7 @@
import org.apache.imperius.spl.parser.exceptions.SPLException;
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.ExpressionUtility;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -65,9 +66,8 @@
"validation error: wrong data type passed in "
+ this._dataType);
- throw new SPLException(
- "validation error: wrong data type passed in "
- + this._dataType);
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
@@ -89,8 +89,9 @@
if (!(expResult instanceof java.util.List))
{
logger.severe(Thread.currentThread().getName()+" "+"result of expression is not of type List");
- throw new SPLException(
- "result of expression is not of type List");
+ throw new SPLException(Messages.getString(
+ "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG",
+ new Object[] { "List" }));
}
ArrayList resultArray = (ArrayList) expResult;
Integer count = new Integer(resultArray.size());
@@ -146,7 +147,9 @@
{
logger.severe(Thread.currentThread().getName()+" "+"result Array is empty");
- throw new SPLException("result Array is empty");
+ throw new SPLException(Messages.getString(
+ "SPL_BLANK_EXPRESSION_PASSED_ERROR_MSG",
+ new Object[] { "expression" }));
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SquareRoot.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SquareRoot.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SquareRoot.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SquareRoot.java Mon Aug 18 05:50:36 2008
@@ -34,6 +34,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -61,8 +62,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "SquareRoot");
@@ -84,7 +85,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StartsWith.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StartsWith.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StartsWith.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StartsWith.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.StringExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "StartsWith");
@@ -85,7 +86,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringConstant.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringConstant.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringConstant.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringConstant.java Mon Aug 18 05:50:36 2008
@@ -30,6 +30,7 @@
import org.apache.imperius.spl.parser.exceptions.SPLException;
import org.apache.imperius.spl.parser.expressions.ConstantExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -82,7 +83,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringLength.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringLength.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringLength.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringLength.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "StringLength");
@@ -83,7 +84,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SubCollection.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SubCollection.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SubCollection.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SubCollection.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.exceptions.SPLException;
import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -64,9 +65,8 @@
if (!validate())
{
logger.severe(Thread.currentThread().getName()+" "+"validation error: wrong data type passed in");
- throw new SPLException(
- "validation error: wrong data type passed in "
- + this._dataType);
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
@@ -86,7 +86,9 @@
if (!(lhsResult instanceof java.util.List))
{
logger.severe(Thread.currentThread().getName()+" "+"lhsResult is not of type List");
- throw new SPLException("lhsResult is not of type List");
+ throw new SPLException(Messages.getString(
+ "SPL_PASSED_EXPRESSION_TYPE_ERROR_MSG",
+ new Object[] { "LHS","is not", "List" }));
}
else
{
@@ -95,7 +97,10 @@
if (!(rhsResult instanceof java.util.List))
{
logger.severe(Thread.currentThread().getName()+" "+"rhsResult is not of type List");
- throw new SPLException("rhsResult is not of type List");
+ throw new SPLException(Messages.getString(
+ "SPL_PASSED_EXPRESSION_TYPE_ERROR_MSG",
+ new Object[] { "RHS","is not", "List" }));
+
}
else
{
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Substring.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Substring.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Substring.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Substring.java Mon Aug 18 05:50:36 2008
@@ -34,6 +34,7 @@
import org.apache.imperius.spl.parser.expressions.StringExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -83,25 +84,21 @@
{
logger.severe(
"left hand side expression passed in is null.");
- throw new IllegalArgumentException(
- "left hand side expression passed in is null.");
+ throw new IllegalArgumentException(Messages.getString("SPL_PASSED_EXPRESSION_ERROR_MSG", new Object[]{"left hand"}));
+
}
if (m == null)
{
logger.severe(
"middle expression passed in is null.");
- throw new IllegalArgumentException(
- "middle expression passed in is null.");
- }
+ throw new IllegalArgumentException(Messages.getString("SPL_PASSED_EXPRESSION_ERROR_MSG", new Object[]{"middle"})); }
if (r == null)
{
logger.severe(
"right hand side expression passed in is null.");
- throw new IllegalArgumentException(
- "right hand side expression passed in is null.");
- }
+ throw new IllegalArgumentException(Messages.getString("SPL_PASSED_EXPRESSION_ERROR_MSG", new Object[]{"right hand"})); }
this._lhsExp = l;
this._midExp = m;
@@ -117,17 +114,13 @@
{
logger.severe(
"left hand side expression passed in is null.");
- throw new IllegalArgumentException(
- "left hand side expression passed in is null.");
- }
+ throw new IllegalArgumentException(Messages.getString("SPL_PASSED_EXPRESSION_ERROR_MSG", new Object[]{"left hand"})); }
if (m == null)
{
logger.severe(
"middle expression passed in is null.");
- throw new IllegalArgumentException(
- "middle expression passed in is null.");
- }
+ throw new IllegalArgumentException(Messages.getString("SPL_PASSED_EXPRESSION_ERROR_MSG", new Object[]{"middle"})); }
this._lhsExp = l;
this._midExp = m;
@@ -138,14 +131,14 @@
{
logger.severe(
"number of parameters passed is not 3.");
- throw new IllegalArgumentException(
- "number of parameters passed is not 3.");
+ throw new IllegalArgumentException(Messages.getString("SPL_NO_OF_ARGUMENTS_PASSED_ERROR_MSG", new Object[]{"3", ""+exprList.size()}));
+
}
}
else
{
logger.severe(Thread.currentThread().getName()+" "+"parameters passed are null.");
- throw new IllegalArgumentException("parameters passed are null.");
+ throw new IllegalArgumentException(Messages.getString("SPL_NO_OF_ARGUMENTS_PASSED_ERROR_MSG", new Object[]{"3", "null"}));
}
if (validateExpression)
{
@@ -154,8 +147,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "Substring");
@@ -192,7 +185,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Subtraction.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Subtraction.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Subtraction.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Subtraction.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.NumericExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "Subtraction");
@@ -86,7 +87,10 @@
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Sum.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Sum.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Sum.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Sum.java Mon Aug 18 05:50:36 2008
@@ -34,6 +34,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.ExpressionUtility;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -62,9 +63,8 @@
logger.severe(
"validation error: wrong data type passed in "
+ this._dataType);
- throw new SPLException(
- "validation error: wrong data type passed in "
- + this._dataType);
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] {sourceClass }));
}
}
@@ -86,8 +86,9 @@
if (!(expResult instanceof java.util.List))
{
logger.severe(Thread.currentThread().getName()+" "+"result of expression is not of type List");
- throw new SPLException(
- "result of expression is not of type List");
+ throw new SPLException(Messages.getString(
+ "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG",
+ new Object[] { "List" }));
}
ArrayList resultArray = (ArrayList) expResult;
//System.out.println("resultArray size " + resultArray.size()+ " to string " + resultArray.toString());
@@ -121,7 +122,9 @@
logger.severe(Thread.currentThread().getName()+" "+"result Array is empty");
- throw new SPLException("result Array is empty");
+ throw new SPLException(Messages.getString(
+ "SPL_BLANK_EXPRESSION_PASSED_ERROR_MSG",
+ new Object[] { "" }));
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToBoolean.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToBoolean.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToBoolean.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToBoolean.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -59,8 +60,8 @@
{
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToBoolean");
@@ -138,7 +139,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToLower.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToLower.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToLower.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToLower.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.StringExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToLower");
@@ -84,7 +85,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToMilliseconds.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToMilliseconds.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToMilliseconds.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToMilliseconds.java Mon Aug 18 05:50:36 2008
@@ -34,6 +34,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -61,8 +62,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToMilliseconds");
@@ -90,7 +91,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL32.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL32.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL32.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL32.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToREAL32");
@@ -93,7 +94,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL64.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL64.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL64.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL64.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -61,8 +62,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToREAL64");
@@ -99,7 +100,10 @@
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT16.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT16.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT16.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT16.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToSINT16");
@@ -96,7 +97,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT32.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT32.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT32.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT32.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToSINT32");
@@ -96,7 +97,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT64.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT64.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT64.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT64.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToSINT64");
@@ -96,7 +97,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT8.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT8.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT8.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT8.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToSINT8");
@@ -93,7 +94,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToString.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToString.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToString.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToString.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.StringExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -57,8 +58,8 @@
logger.severe(
"validation error: has wrong data type passed in.");
- throw new SPLException(
- "validation error: has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToString");
@@ -91,7 +92,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToUpper.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToUpper.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToUpper.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToUpper.java Mon Aug 18 05:50:36 2008
@@ -33,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.StringExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +61,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "ToUpper");
@@ -84,7 +85,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryMinusExpression.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryMinusExpression.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryMinusExpression.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryMinusExpression.java Mon Aug 18 05:50:36 2008
@@ -32,6 +32,7 @@
import org.apache.imperius.spl.parser.expressions.NumericExpression;
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -56,8 +57,8 @@
logger.severe(
"validation error: wrong data type passed in.");
- throw new SPLException(
- "validation error: wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "UnaryMinusExpression");
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryNotExpression.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryNotExpression.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryNotExpression.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryNotExpression.java Mon Aug 18 05:50:36 2008
@@ -32,6 +32,7 @@
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -56,8 +57,8 @@
logger.severe(
"validation error: wrong data type passed in.");
- throw new SPLException(
- "validation error: wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "UnaryNotExpression");
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryPlusExpression.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryPlusExpression.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryPlusExpression.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryPlusExpression.java Mon Aug 18 05:50:36 2008
@@ -31,6 +31,7 @@
import org.apache.imperius.spl.parser.expressions.NumericExpression;
import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
import org.apache.imperius.spl.parser.util.*;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -56,8 +57,8 @@
logger.severe(
"validation error: wrong data type passed in.");
- throw new SPLException(
- "validation error: wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { sourceClass }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "UnaryPlusExpression");
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Union.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Union.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Union.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Union.java Mon Aug 18 05:50:36 2008
@@ -32,6 +32,7 @@
import org.apache.imperius.spl.external.Expression;
import org.apache.imperius.spl.parser.exceptions.SPLException;
import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -66,9 +67,8 @@
"validation error: wrong data type passed in "
+ this._dataType);
- throw new SPLException(
- "validation error: wrong data type passed in "
- + this._dataType);
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] {className }));
}
}
@@ -89,7 +89,9 @@
if (!(lhsResult instanceof java.util.List))
{
logger.severe(Thread.currentThread().getName()+" "+"lhsResult is not of type List");
- throw new SPLException("lhsResult is not of type List");
+ throw new SPLException(Messages.getString(
+ "SPL_PASSED_EXPRESSION_TYPE_ERROR_MSG", new Object[] {
+ "LHS", "is not", "List" }));
}
else
{
@@ -98,7 +100,9 @@
if (!(rhsResult instanceof java.util.List))
{
logger.severe(Thread.currentThread().getName()+" "+"rhsResult is not of type List");
- throw new SPLException("rhsResult is not of type List");
+ throw new SPLException(Messages.getString(
+ "SPL_PASSED_EXPRESSION_TYPE_ERROR_MSG", new Object[] {
+ "RHS", "is not", "List" }));
}
else
{
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Word.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Word.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Word.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Word.java Mon Aug 18 05:50:36 2008
@@ -24,7 +24,6 @@
*/
package org.apache.imperius.spl.parser.expressions.impl;
-import java.util.Iterator;
import java.util.List;
import java.util.logging.Logger;
@@ -34,6 +33,7 @@
import org.apache.imperius.spl.parser.expressions.TripleArgumentExpression;
import org.apache.imperius.spl.parser.util.TypeInfo;
import org.apache.imperius.spl.parser.util.TypeResolver;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
@@ -60,8 +60,8 @@
logger.severe(Thread.currentThread().getName()+" "+"validation error: " + className
+ " has wrong data type passed in.");
- throw new SPLException("validation error: " + className
- + " has wrong data type passed in.");
+ throw new SPLException(Messages.getString(
+ "SPL_VALIDATION_ERROR_MSG", new Object[] { className }));
}
}
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "Word");
@@ -86,7 +86,10 @@
{
logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + e.toString());
- throw new SPLException("evaluation error: " + e.toString());
+ throw new SPLException(Messages.getString(
+ "SPL_EVALUATION_ERROR_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+
}
}
@@ -115,8 +118,8 @@
logger.severe(
"NumberOfWords must be non-negative.");
- throw new IllegalArgumentException(
- "NumberOfWords must be non-negative.");
+ throw new IllegalArgumentException(Messages.getString("SPL_NO_OF_WORDS_EXCEPTION_MSG"));
+
}
if (numberOfWords == 0){
logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "word");
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java Mon Aug 18 05:50:36 2008
@@ -128,6 +128,7 @@
import org.apache.imperius.spl.parser.expressions.impl.Union;
import org.apache.imperius.spl.parser.expressions.impl.Word;
import org.apache.imperius.spl.parser.util.ExpressionUtility;
+import org.apache.imperius.util.Messages;
import org.apache.imperius.util.SPLLogger;
//import org.apache.imperius.spl.parser.expressions.impl.TimeConstant;
@@ -150,27 +151,25 @@
private static Logger logger = SPLLogger.getSPLLogger().getLogger();
- private static final String _sourceClass="ACPLParserMap";
-
-
-// private static final String _className = ACPLParserMap.class.getName();
-
- private static Properties _knownOperatorExpressionMap = new Properties();
- private static Properties _knownActionExpressionMap = new Properties();
- /*
- * Set up the known map between ACPL element function names and handler
- * classes
- */
+ private static final String _sourceClass = "ACPLParserMap";
+
+ // private static final String _className = ACPLParserMap.class.getName();
+
+ private static Properties _knownOperatorExpressionMap = new Properties();
+
+ private static Properties _knownActionExpressionMap = new Properties();
+
+ /*
+ * Set up the known map between ACPL element function names and handler
+ * classes
+ */
static
{
logger.entering(_sourceClass,Thread.currentThread().getName()+" "+ "Set up the known map between ACPL element function names and handler");
-
try
{
-
// BooleanExpression
-
_addOperatorExpressionType("ToBoolean", ToBoolean.class);
_addOperatorExpressionType("And", LogicalAnd.class);
_addOperatorExpressionType("Or", LogicalOr.class);
@@ -240,7 +239,6 @@
_addOperatorExpressionType("Ln", Ln.class);
// StringExpression
-
_addOperatorExpressionType("StringConstant", StringConstant.class);
_addOperatorExpressionType("ToString", ToString.class);
_addOperatorExpressionType("ToUpper", ToUpper.class);
@@ -320,7 +318,9 @@
// };
logger.severe(Thread.currentThread().getName()+" "+"builtin method error");
- throw new SPLException("builtin method error");
+
+ throw new SPLException(Messages
+ .getString("SPL_BUILT_IN_METHOD_ERROR_MSG"));
}
_knownOperatorExpressionMap.put(typeLocalName.toLowerCase(), classObject.getName());
@@ -339,20 +339,22 @@
int lastIndexOfDot = customActionName.lastIndexOf('.');
String actionShortName = customActionName.substring(lastIndexOfDot + 1);
- try {
+ try
+ {
Class cl = Class.forName(customActionName);
_addActionExpressionType(actionShortName,cl);
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- throw new SPLException("Class not found " + e);
- } catch (SPLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new SPLException(Messages.getString(
+ "SPL_CLASS_NOT_FOUND_EXCEPTION_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+ }
+ catch (SPLException e)
+ {
+
}
-
}
-
}
/**
@@ -362,27 +364,34 @@
* @throws SPLException
*/
public static void loadCustomActionExpressionTypes(List aCustomActionList,
- URL[] aUrls) throws SPLException {
+ URL[] aUrls) throws SPLException
+ {
List customActionList = aCustomActionList;
Iterator it = customActionList.iterator();
- URLClassLoader uc = new URLClassLoader(aUrls,ACPLParserMap.class.getClassLoader());
- while (it.hasNext()) {
+ URLClassLoader uc = new URLClassLoader(aUrls, ACPLParserMap.class
+ .getClassLoader());
+ while (it.hasNext())
+ {
String customActionName = (String) it.next();
int lastIndexOfDot = customActionName.lastIndexOf('.');
- String actionShortName = customActionName.substring(lastIndexOfDot + 1);
- try {
- // Class cl = Class.forName(customActionName);
+ String actionShortName = customActionName
+ .substring(lastIndexOfDot + 1);
+ try
+ {
Class cl = uc.loadClass(customActionName.trim());
_addActionExpressionType(actionShortName, cl);
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- throw new SPLException("Class not found " + e);
- } catch (SPLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new SPLException(Messages.getString(
+ "SPL_CLASS_NOT_FOUND_EXCEPTION_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+ }
+ catch (SPLException e)
+ {
+
}
}
}
@@ -393,235 +402,244 @@
* @param aUrls
* @throws SPLException
*/
- public static void loadCustomOperatorExpressionTypes(List aCustomOperatorList,
- URL[] aUrls) throws SPLException {
+ public static void loadCustomOperatorExpressionTypes(
+ List aCustomOperatorList, URL[] aUrls) throws SPLException
+ {
List customActionList = aCustomOperatorList;
Iterator it = customActionList.iterator();
- URLClassLoader uc = new URLClassLoader(aUrls,ACPLParserMap.class.getClassLoader());
- while (it.hasNext()) {
+ URLClassLoader uc = new URLClassLoader(aUrls, ACPLParserMap.class
+ .getClassLoader());
+ while (it.hasNext())
+ {
String customActionName = (String) it.next();
int lastIndexOfDot = customActionName.lastIndexOf('.');
-
String actionShortName = customActionName
.substring(lastIndexOfDot + 1);
- try {
-// Class cl = Class.forName(customActionName);
+ try
+ {
Class cl = uc.loadClass(customActionName.trim());
_addOperatorExpressionType(actionShortName, cl);
- } catch (ClassNotFoundException e) {
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new SPLException(Messages.getString(
+ "SPL_CLASS_NOT_FOUND_EXCEPTION_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+ }
+ catch (SPLException e)
+ {
- e.printStackTrace();
- throw new SPLException("Class not found " + e);
- } catch (SPLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
}
-
}
-
}
-
-
-
-
- private static void _loadCustomOperatorExpressionTypes() throws SPLException
+ private static void _loadCustomOperatorExpressionTypes()
+ throws SPLException
{
- List customActionList = ExpressionUtility.getListOfCustomExpressionTypes();
+ List customActionList = ExpressionUtility
+ .getListOfCustomExpressionTypes();
Iterator it = customActionList.iterator();
- while(it.hasNext())
+ while (it.hasNext())
{
- String customActionName = (String)it.next();
+ String customActionName = (String) it.next();
int lastIndexOfDot = customActionName.lastIndexOf('.');
-
- String actionShortName = customActionName.substring(lastIndexOfDot + 1);
- try {
+ String actionShortName = customActionName
+ .substring(lastIndexOfDot + 1);
+ try
+ {
Class cl = Class.forName(customActionName);
- _addOperatorExpressionType(actionShortName,cl);
- } catch (ClassNotFoundException e) {
-
- e.printStackTrace();
- throw new SPLException("Class not found " + e);
- } catch (SPLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ _addOperatorExpressionType(actionShortName, cl);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new SPLException(Messages.getString(
+ "SPL_CLASS_NOT_FOUND_EXCEPTION_MSG", new Object[] { e
+ .getLocalizedMessage() }));
+ }
+ catch (SPLException e)
+ {
+
}
-
}
-
}
- private static void _addActionExpressionType(String typeLocalName, Class classObject)
- throws SPLException
+ private static void _addActionExpressionType(String typeLocalName,
+ Class classObject) throws SPLException
{
- logger.entering(_sourceClass,Thread.currentThread().getName()+" "+ "addBuiltInActionType");
-
- if (classObject == null || typeLocalName == null)
+ logger.entering(_sourceClass, Thread.currentThread().getName() + " "
+ + "addBuiltInActionType");
+
+ if (classObject == null || typeLocalName == null)
{
-// Object[] args = new Object[]
-// {
-// typeLocalName, classObject
-// };
-
- logger.severe(Thread.currentThread().getName()+" "+"builtin method error");
- throw new SPLException("builtin method error");
+ // Object[] args = new Object[]
+ // {
+ // typeLocalName, classObject
+ // };
+
+ logger.severe(Thread.currentThread().getName() + " "
+ + "builtin method error");
+ throw new SPLException(Messages
+ .getString("SPL_BUILT_IN_METHOD_ERROR_MSG"));
}
-
- _knownActionExpressionMap.put(typeLocalName.toLowerCase(), classObject.getName());
-
- logger.exiting(_sourceClass,Thread.currentThread().getName()+" "+ "addKnownType");
-
+
+ _knownActionExpressionMap.put(typeLocalName.toLowerCase(), classObject
+ .getName());
+
+ logger.exiting(_sourceClass, Thread.currentThread().getName() + " "
+ + "addKnownType");
+
}
-
-
/**
-
-
- /**
- * Returns the Class of a known type corresponding to the type with the
- * given typeLocalName, or <code>null</code> if the type is not defined.
- * <p>
- *
- * Does not return user-defined type Classes.
- *
- * @param typeLocalName
- * local name for the type
- * @return Class the type, or <code>null</code> if it is undefined
- *
- * @throws ClassNotFoundException
- * if the class can not be located
- */
- public static Class getClassForOperatorExpressionType(String typeLocalName)
- throws ClassNotFoundException
- {
- logger.entering(_sourceClass,Thread.currentThread().getName()+" "+ "getClassForKnownType");
- Class result = _getClassForExpressionType(typeLocalName,_knownOperatorExpressionMap);
-
- logger.exiting(_sourceClass,Thread.currentThread().getName()+" "+ "getClassForKnownType");
-
- return result;
- }
- public static Class getClassForActionExpressionType(String typeLocalName)
- throws ClassNotFoundException
+ * Returns the Class of a known type corresponding to the type with the
+ * given typeLocalName, or <code>null</code> if the type is not defined.
+ * <p>
+ *
+ * Does not return user-defined type Classes.
+ *
+ * @param typeLocalName
+ * local name for the type
+ * @return Class the type, or <code>null</code> if it is undefined
+ *
+ * @throws ClassNotFoundException
+ * if the class can not be located
+ */
+ public static Class getClassForOperatorExpressionType(String typeLocalName)
+ throws ClassNotFoundException
+ {
+ logger.entering(_sourceClass, Thread.currentThread().getName() + " "
+ + "getClassForKnownType");
+
+ Class result = _getClassForExpressionType(typeLocalName,
+ _knownOperatorExpressionMap);
+
+ logger.exiting(_sourceClass, Thread.currentThread().getName() + " "
+ + "getClassForKnownType");
+
+ return result;
+ }
+
+ public static Class getClassForActionExpressionType(String typeLocalName)
+ throws ClassNotFoundException
{
- logger.entering(_sourceClass,Thread.currentThread().getName()+" "+ "getClassForKnownType");
-
- Class result = _getClassForExpressionType(typeLocalName,_knownActionExpressionMap);
-
-
- logger.exiting(_sourceClass,Thread.currentThread().getName()+" "+ "getClassForKnownType");
-
+ logger.entering(_sourceClass, Thread.currentThread().getName() + " "
+ + "getClassForKnownType");
+
+ Class result = _getClassForExpressionType(typeLocalName,
+ _knownActionExpressionMap);
+
+ logger.exiting(_sourceClass, Thread.currentThread().getName() + " "
+ + "getClassForKnownType");
+
return result;
}
- private static Class _getClassForExpressionType(String typeLocalName, Properties propMap)
- throws ClassNotFoundException
+ private static Class _getClassForExpressionType(String typeLocalName,
+ Properties propMap) throws ClassNotFoundException
{
- logger.entering(_sourceClass,Thread.currentThread().getName()+" "+ "getClassForKnownType");
-
-
- //System.out.println("ACPLParserMap::getClassForKnownType " + typeLocalName);
- //String methodName = "getClassForKnownType(String, String)";
+ logger.entering(_sourceClass, Thread.currentThread().getName() + " "
+ + "getClassForKnownType");
+
+ // System.out.println("ACPLParserMap::getClassForKnownType " +
+ // typeLocalName);
+ // String methodName = "getClassForKnownType(String, String)";
Class result = null;
-
- if (result == null)
+
+ if (result == null)
{
- // Try to find user defined type and return
- String knownClass;
- try
- {
- knownClass = (String) propMap.get(typeLocalName.toLowerCase());
- if (knownClass != null)
- {
- //System.out.println(knownClass);
- }
- else
- {
- //System.out.println("knownPropertyMap does not contain "+ typeLocalName);
- }
- }
- catch (IllegalArgumentException e)
- {
-// Object[] args = new Object[]
-// {
-// typeLocalName
-// };
- // don't log message, calling class should log error message
- logger.severe(e.getMessage());
- throw new ClassNotFoundException();
-
- }
- try
- {
- if (knownClass == null)
- {
- result = Class.forName(typeLocalName.trim());
- }
- else
- {
- result = Class.forName(knownClass.trim());
- }
- }
- catch(ClassNotFoundException ex)
- {
- if (knownClass == null)
- {
- result = Class.forName(typeLocalName.trim(),false,Thread.currentThread().getContextClassLoader());
- }
- else
- {
- result = Class.forName(knownClass.trim(),false,Thread.currentThread().getContextClassLoader());
- }
-
- }
-
+ // Try to find user defined type and return
+ String knownClass;
+ try
+ {
+ knownClass = (String) propMap.get(typeLocalName.toLowerCase());
+ if (knownClass != null)
+ {
+ // System.out.println(knownClass);
+ }
+ else
+ {
+ // System.out.println("knownPropertyMap does not contain "+
+ // typeLocalName);
+ }
+ }
+ catch (IllegalArgumentException e)
+ {
+ // Object[] args = new Object[]
+ // {
+ // typeLocalName
+ // };
+ // don't log message, calling class should log error message
+ logger.severe(e.getMessage());
+ throw new ClassNotFoundException();
+
+ }
+ try
+ {
+ if (knownClass == null)
+ {
+ result = Class.forName(typeLocalName.trim());
+ }
+ else
+ {
+ result = Class.forName(knownClass.trim());
+ }
+ }
+ catch (ClassNotFoundException ex)
+ {
+ if (knownClass == null)
+ {
+ result = Class.forName(typeLocalName.trim(), false, Thread
+ .currentThread().getContextClassLoader());
+ }
+ else
+ {
+ result = Class.forName(knownClass.trim(), false, Thread
+ .currentThread().getContextClassLoader());
+ }
+ }
}
- logger.exiting(_sourceClass,Thread.currentThread().getName()+" "+ "getClassForKnownType");
-
+ logger.exiting(_sourceClass, Thread.currentThread().getName() + " "
+ + "getClassForKnownType");
+
return result;
}
-
-
-
/**
- * Returns <code>true</code> if the given type is a known type.
- *
- * @param typeLocalName
- * local name for the type
- * @return <code>true</code> if the given type is a known type
- */
- public static boolean isKnownOperatorExpressionType(String typeLocalName)
- {
- logger.entering(_sourceClass,Thread.currentThread().getName()+" "+ "isKnownBuiltInExpressionType");
-
- boolean result = _isKnownExpressionType(typeLocalName,_knownOperatorExpressionMap);
- return result;
-
- }
-
- public static boolean isKnownActionExpressionType(String typeLocalName)
- {
- logger.entering(_sourceClass,Thread.currentThread().getName()+" "+ "isKnownActionExpressionType"
- + typeLocalName);
- boolean result = _isKnownExpressionType(typeLocalName,_knownActionExpressionMap);
- logger.exiting(_sourceClass,Thread.currentThread().getName()+" " + "isKnownActionExpressionType" + result);
- return result;
-
-
- }
-
- private static boolean _isKnownExpressionType(String typeName, Properties propMap)
- {
- boolean result = false;
-
- result = propMap.containsKey(typeName.toLowerCase());
-
- return result;
-
- }
-
-
-
+ * Returns <code>true</code> if the given type is a known type.
+ *
+ * @param typeLocalName
+ * local name for the type
+ * @return <code>true</code> if the given type is a known type
+ */
+ public static boolean isKnownOperatorExpressionType(String typeLocalName)
+ {
+ logger.entering(_sourceClass, Thread.currentThread().getName() + " "
+ + "isKnownBuiltInExpressionType");
+
+ boolean result = _isKnownExpressionType(typeLocalName,
+ _knownOperatorExpressionMap);
+ return result;
+
+ }
+
+ public static boolean isKnownActionExpressionType(String typeLocalName)
+ {
+ logger.entering(_sourceClass, Thread.currentThread().getName() + " "
+ + "isKnownActionExpressionType" + typeLocalName);
+ boolean result = _isKnownExpressionType(typeLocalName,
+ _knownActionExpressionMap);
+ logger.exiting(_sourceClass, Thread.currentThread().getName() + " "
+ + "isKnownActionExpressionType" + result);
+ return result;
+ }
+
+ private static boolean _isKnownExpressionType(String typeName,
+ Properties propMap)
+ {
+ boolean result = false;
+
+ result = propMap.containsKey(typeName.toLowerCase());
+
+ return result;
+ }
}
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ActionFactory.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ActionFactory.java?rev=686743&r1=686742&r2=686743&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ActionFactory.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ActionFactory.java Mon Aug 18 05:50:36 2008
@@ -17,7 +17,6 @@
* under the License.
*/
//
-
/**
* @author Neeraj Joshi <jn...@us.ibm.com>
*
@@ -43,78 +42,78 @@
import org.apache.imperius.spl.parser.statements.actions.impl.SetActionBlock;
import org.apache.imperius.util.SPLLogger;
+public class ActionFactory
+{
+ private static Logger logger = SPLLogger.getSPLLogger().getLogger();
+ private static final String sourceClass = "ActionFactory";
+ public static ActionBlock createAction(ActionBlock ab1, ActionBlock ab2,
+ int type, SPLSymbolTable sTab)
+ {
+ logger.entering(sourceClass, Thread.currentThread().getName() + " "
+ + "createAction");
+
+ ActionBlock returnBlock = null;
+ switch (type)
+ {
+ case SPLTreeParserTokenTypes.ARROW:
+ returnBlock = new ArrowActionBlock(ab1, ab2);
+ break;
+
+ case SPLTreeParserTokenTypes.LOR:
+ returnBlock = new LogicalOrActionBlock(ab1, ab2);
+ break;
+ case SPLTreeParserTokenTypes.LAND:
+ returnBlock = new LogicalAndActionBlock(ab1, ab2);
+ break;
+ case SPLTreeParserTokenTypes.BOR:
+ returnBlock = new ConcurrentActionBlock(ab1, ab2);
+
+ }
+
+ logger.exiting(sourceClass, Thread.currentThread().getName() + " "
+ + "createAction");
+
+ return returnBlock;
+ }
+
+ /*
+ * x.y(...) y(...) set.y(...)
+ *
+ */
+
+ public static ActionBlock createAction(String className1, List paramList,
+ List identTupleList, boolean isBuiltInMethod, String set,
+ String op, Expression c, SPLSymbolTable symTab) throws SPLException
+ {
+ logger.entering(sourceClass, Thread.currentThread().getName() + " "
+ + "createAction");
+ ActionBlock returnBlock = null;
+
+ if (set.equalsIgnoreCase("Set"))
+ {
+ List anchorClasses = symTab.getAnchorData().getAnchorClassList();
+
+ returnBlock = new SetActionBlock((String) anchorClasses.get(0),
+ paramList, symTab);
+ }
+ else if (set.equalsIgnoreCase("InvokePolicy"))
+ {
+ returnBlock = new InvokePolicyAction(paramList);
+ }
+ else if (ACPLParserMap.isKnownActionExpressionType(className1))
+ {
+ returnBlock = new ExtrinsicMethodInvokeAction(className1,
+ paramList, symTab);
+ }
+ else
+ {
+ returnBlock = new AnchorMethodInvokeAction(className1,
+ identTupleList, op, c, symTab);
+ }
+ logger.exiting(sourceClass, Thread.currentThread().getName() + " "
+ + "createAction");
-public class ActionFactory
-{
- private static Logger logger = SPLLogger.getSPLLogger().getLogger();
- private static final String sourceClass="ActionFactory";
-
-
- public static ActionBlock createAction(ActionBlock ab1, ActionBlock ab2,
- int type, SPLSymbolTable sTab)
- {
- logger.entering(sourceClass,Thread.currentThread().getName()+" "+ "createAction");
-
- ActionBlock returnBlock = null;
- switch (type)
- {
- case SPLTreeParserTokenTypes.ARROW:
- returnBlock = new ArrowActionBlock(ab1, ab2);
- break;
-
- case SPLTreeParserTokenTypes.LOR:
- returnBlock = new LogicalOrActionBlock(ab1, ab2);
- break;
- case SPLTreeParserTokenTypes.LAND:
- returnBlock = new LogicalAndActionBlock(ab1, ab2);
- break;
- case SPLTreeParserTokenTypes.BOR:
- returnBlock = new ConcurrentActionBlock(ab1, ab2);
-
- }
-
- logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "createAction");
-
- return returnBlock;
-
- }
-
- /*
- * x.y(...) y(...) set.y(...)
- *
- */
-
- public static ActionBlock createAction(String className1, List paramList,
- List identTupleList, boolean isBuiltInMethod, String set,
- String op, Expression c, SPLSymbolTable symTab) throws SPLException
- {
- logger.entering(sourceClass, Thread.currentThread().getName() + " " + "createAction");
- ActionBlock returnBlock = null;
-
- if (set.equalsIgnoreCase("Set"))
- {
- List anchorClasses = symTab.getAnchorData().getAnchorClassList();
-
- returnBlock = new SetActionBlock((String)anchorClasses.get(0), paramList, symTab);
- }
- else if(set.equalsIgnoreCase("InvokePolicy"))
- {
- returnBlock = new InvokePolicyAction(paramList);
- }
-
- else if (ACPLParserMap.isKnownActionExpressionType(className1))
- {
- returnBlock = new ExtrinsicMethodInvokeAction(className1, paramList, symTab);
-
- }
- else
- {
- returnBlock = new AnchorMethodInvokeAction(className1,
- identTupleList, op, c, symTab);
- }
- logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "createAction");
-
- return returnBlock;
- }
+ return returnBlock;
+ }
}