From imperius-commits-return-217-apmail-incubator-imperius-commits-archive=incubator.apache.org@incubator.apache.org Mon Aug 18 12:51:38 2008 Return-Path: Delivered-To: apmail-incubator-imperius-commits-archive@locus.apache.org Received: (qmail 77499 invoked from network); 18 Aug 2008 12:51:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Aug 2008 12:51:38 -0000 Received: (qmail 78657 invoked by uid 500); 18 Aug 2008 12:51:36 -0000 Delivered-To: apmail-incubator-imperius-commits-archive@incubator.apache.org Received: (qmail 78633 invoked by uid 500); 18 Aug 2008 12:51:36 -0000 Mailing-List: contact imperius-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: imperius-dev@incubator.apache.org Delivered-To: mailing list imperius-commits@incubator.apache.org Received: (qmail 78613 invoked by uid 99); 18 Aug 2008 12:51:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Aug 2008 05:51:36 -0700 X-ASF-Spam-Status: No, hits=-1999.3 required=10.0 tests=ALL_TRUSTED,FRT_LEVITRA X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Aug 2008 12:50:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0A7C12388A6D; Mon, 18 Aug 2008 05:50:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r686743 [7/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... Date: Mon, 18 Aug 2008 12:50:42 -0000 To: imperius-commits@incubator.apache.org From: jneeraj@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080818125054.0A7C12388A6D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetDayOfWeekInMonth.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetDayOfWeekInMonth.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetDayOfWeekInMonth.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetDayOfWeekInMonth.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()+" "+ "GetDayOfWeekInMonth"); @@ -90,7 +91,10 @@ { logger.severe(Thread.currentThread().getName()+" "+"invalid expression."); - throw new SPLException("invalid expression."); + throw new SPLException(Messages.getString( + "SPL_EVALUATION_ERROR_MSG", new Object[] { e + .getLocalizedMessage() })); + } } @@ -109,7 +113,8 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getDayOfWeekInMonth"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); } } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetDayOfYear.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetDayOfYear.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetDayOfYear.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetDayOfYear.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()+" "+ "GetDayOfYear"); @@ -89,7 +90,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() })); + } } @@ -108,7 +112,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getdayofyear"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetHour12.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetHour12.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetHour12.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetHour12.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()+" "+ "GetHour12"); @@ -89,7 +90,10 @@ { logger.severe(Thread.currentThread().getName()+" "+"invalid expression."); - throw new SPLException("invalid expression."); + throw new SPLException(Messages.getString( + "SPL_EVALUATION_ERROR_MSG", new Object[] { e + .getLocalizedMessage() })); + } } @@ -108,7 +112,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for gethour12"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetHour24.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetHour24.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetHour24.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetHour24.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()+" "+ "GetHour24"); @@ -89,7 +90,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() })); + } } @@ -108,7 +112,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for gethour24"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMillisecond.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMillisecond.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMillisecond.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMillisecond.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()+" "+ "GetMillisecond"); @@ -89,7 +90,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() })); + } } @@ -108,7 +112,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getmilliseconds"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMinute.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMinute.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMinute.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMinute.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_EVALUATION_ERROR_MSG", new Object[] { className })); } } logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "GetMinute"); @@ -89,7 +90,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() })); + } } @@ -108,7 +112,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getminute"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMonth.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMonth.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMonth.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetMonth.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()+" "+ "GetMonth"); @@ -136,7 +137,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() })); + } } @@ -155,7 +159,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getmonth"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetSecond.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetSecond.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetSecond.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetSecond.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()+" "+ "GetSecond"); @@ -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() })); + } } @@ -109,7 +113,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getsecond"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetWeekOfMonth.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetWeekOfMonth.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetWeekOfMonth.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetWeekOfMonth.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()+" "+ "GetWeekOfMonth"); @@ -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() })); + } } @@ -109,7 +113,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getweekofmth"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetWeekOfYear.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetWeekOfYear.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetWeekOfYear.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetWeekOfYear.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()+" "+ "GetWeekOfYear"); @@ -88,7 +89,10 @@ catch (Exception e) { 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() })); + } } @@ -107,7 +111,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getweekofyear"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetYear.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetYear.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetYear.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GetYear.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; @@ -64,8 +65,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()+" "+ "GetYear"); @@ -92,7 +93,10 @@ { logger.severe(Thread.currentThread().getName()+" "+"invalid expression"); - throw new SPLException("invalid expression"); + throw new SPLException(Messages.getString( + "SPL_EVALUATION_ERROR_MSG", new Object[] { e + .getLocalizedMessage() })); + } } @@ -111,7 +115,9 @@ } else { - throw new SPLException("Invalid input type " + eType + " for getyear"); + throw new SPLException(Messages.getString( + "SPL_NOT_REQUIRED_EXP_EXCEPTION_MSG", new Object[] { eType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Greater.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Greater.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Greater.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Greater.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,7 @@ import org.apache.imperius.spl.parser.util.ExpressionUtility; 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()+" "+ "Greater"); @@ -98,7 +99,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() })); + } } @@ -131,7 +135,10 @@ if(!validation) { - throw new SPLException("Invalid input for Greater " + lType + rType); + throw new SPLException(Messages.getString( + "SPL_TYPE_NOT_COMPATIBLE_EXCEPTION_MSG", new Object[] { + lType, rType })); + } else { Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GreaterOrEqual.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GreaterOrEqual.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GreaterOrEqual.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/GreaterOrEqual.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,7 @@ import org.apache.imperius.spl.parser.util.ExpressionUtility; 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; @@ -63,8 +64,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()+" "+ "GreaterOrEqual"); @@ -98,7 +99,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() })); + } } @@ -129,7 +133,9 @@ if(!validated) { - throw new SPLException("Invalid input types " + lType + rType + " for greaterorequal"); + throw new SPLException(Messages.getString( + "SPL_WRONG_OPERAND_TYPE_EXCEPTION1_MSG", new Object[] { lType + " " + rType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/InCollection.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/InCollection.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/InCollection.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/InCollection.java Mon Aug 18 05:50:36 2008 @@ -35,6 +35,7 @@ import org.apache.imperius.spl.parser.exceptions.SPLException; import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression; import org.apache.imperius.spl.parser.util.ExpressionUtility; +import org.apache.imperius.util.Messages; import org.apache.imperius.util.SPLLogger; @@ -68,9 +69,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 })); } } logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "InCollection"); @@ -94,7 +94,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" })); } // BasicCollectionExpression // expression=(BasicCollectionExpression)rhsExpression; @@ -142,8 +144,10 @@ { logger.severe( "the RHS of InCollection expression is null BasicCollection"); - throw new IllegalParameterTypeException( - "the RHS of InCollection expression is null BasicCollection"); + throw new IllegalParameterTypeException(Messages.getString( + "SPL_PASSED_EXPRESSION_ERROR_MSG", + new Object[] { "RHS" })); + } } else @@ -151,8 +155,9 @@ logger.severe( "the RHS of InCollection expression should be of BasicCollection type"); - throw new IllegalParameterTypeException( - "the RHS of InCollection expression should be of BasicCollection type"); + throw new SPLException(Messages.getString( + "SPL_PASSED_EXPRESSION_TYPE_ERROR_MSG", new Object[] { + "RHS", "should be", "BasicCollection" })); } } @@ -171,8 +176,9 @@ { logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "validate"); - throw new SPLException( - "lhsExpression.getType()!=rhsExpression.getType()"); + throw new SPLException(Messages.getString( + "SPL_TYPE_NOT_COMPATIBLE_EXCEPTION_MSG", new Object[] { + lhsExpression.getType(), rhsExpression.getType() })); } //System.out.println("rhs is of type BasicCollection ,class=" + rhsExpression.getClass() + " "+ rhsExpression.toString()); /* Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IntegerConstant.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IntegerConstant.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IntegerConstant.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IntegerConstant.java Mon Aug 18 05:50:36 2008 @@ -31,6 +31,7 @@ import org.apache.imperius.spl.parser.expressions.ConstantExpression; import org.apache.imperius.spl.parser.expressions.NumericExpression; import org.apache.imperius.spl.parser.util.TypeInfo; +import org.apache.imperius.util.Messages; import org.apache.imperius.util.SPLLogger; @@ -80,7 +81,10 @@ { logger.severe(Thread.currentThread().getName()+" "+"evaluation errro: " + e.toString()); - throw new SPLException("evaluation errro: " + 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/IsAfter.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsAfter.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsAfter.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsAfter.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,7 @@ import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression; 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()+" "+ "IsAfter"); @@ -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() })); + } } @@ -106,7 +110,10 @@ } else { - throw new SPLException("Invalid input types " + lType + rType + "for isAfter"); + throw new SPLException(Messages.getString( + "SPL_WRONG_OPERAND_TYPE_EXCEPTION1_MSG", + new Object[] { lType + " " + rType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsBefore.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsBefore.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsBefore.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsBefore.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,7 @@ import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression; 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()+" "+ "IsBefore"); @@ -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() })); + } } @@ -106,7 +110,10 @@ } else { - throw new SPLException("Invalid input types " + lType + rType + "for isbefore"); + throw new SPLException(Messages.getString( + "SPL_WRONG_OPERAND_TYPE_EXCEPTION1_MSG", + new Object[] { lType + " " + rType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsWithin.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsWithin.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsWithin.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/IsWithin.java Mon Aug 18 05:50:36 2008 @@ -35,6 +35,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; @@ -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()+" "+ "IsWithin"); @@ -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() })); + } } @@ -117,7 +121,10 @@ } else { - throw new SPLException("Invalid input types " + lType + rType + mType + "for isWithin"); + throw new SPLException(Messages.getString( + "SPL_WRONG_OPERAND_TYPE_EXCEPTION1_MSG", + new Object[] { lType + " , " + mType + " , " + rType })); + } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LeftSubstring.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LeftSubstring.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LeftSubstring.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LeftSubstring.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,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; @@ -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()+" "+ "LeftSubstring"); @@ -93,8 +94,9 @@ logger.severe( "Illegal direction argument."); - throw new IllegalArgumentException( - "Illegal direction argument."); + throw new IllegalArgumentException(Messages + .getString("SPL_INVALID_DIRECTION_ARGUMENT_ERROR_MSG")); + } if (o2 instanceof String) @@ -114,7 +116,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() })); + } } @@ -259,10 +264,10 @@ } else { - throw new SPLException("Invalid input types " + lType + rType + mType + "for leftsubstring"); + throw new SPLException(Messages.getString( + "SPL_WRONG_OPERAND_TYPE_EXCEPTION1_MSG", + new Object[] { lType + " , " + mType + " , " + rType })); } - - } public String toString() Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Less.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Less.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Less.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Less.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,7 @@ import org.apache.imperius.spl.parser.util.ExpressionUtility; 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()+" "+ "Less"); @@ -98,7 +99,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/LessOrEqual.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LessOrEqual.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LessOrEqual.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LessOrEqual.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,7 @@ import org.apache.imperius.spl.parser.util.ExpressionUtility; 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()+" "+ "LessOrEqual"); @@ -95,7 +96,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/Ln.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Ln.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Ln.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Ln.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; @@ -58,8 +59,8 @@ { logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "Ln"); - 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()+" "+ "Ln"); @@ -80,7 +81,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/Log10.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Log10.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Log10.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Log10.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()+" "+ "Log10"); @@ -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/LogicalAnd.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalAnd.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalAnd.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalAnd.java Mon Aug 18 05:50:36 2008 @@ -33,6 +33,7 @@ import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression; 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()+" "+ "LogicalAnd"); @@ -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/LogicalNot.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalNot.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalNot.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalNot.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()+" "+ "LogicalNot"); @@ -92,7 +93,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/LogicalOr.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalOr.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalOr.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalOr.java Mon Aug 18 05:50:36 2008 @@ -33,6 +33,7 @@ import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression; 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()+" "+ "LogicalOr"); @@ -88,7 +89,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/LogicalXor.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalXor.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalXor.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LogicalXor.java Mon Aug 18 05:50:36 2008 @@ -33,6 +33,7 @@ import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression; 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()+" "+ "LogicalXor"); @@ -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/LongConstant.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LongConstant.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LongConstant.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/LongConstant.java Mon Aug 18 05:50:36 2008 @@ -31,6 +31,7 @@ import org.apache.imperius.spl.parser.expressions.ConstantExpression; import org.apache.imperius.spl.parser.expressions.NumericExpression; import org.apache.imperius.spl.parser.util.TypeInfo; +import org.apache.imperius.util.Messages; import org.apache.imperius.util.SPLLogger; @@ -81,7 +82,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/MatchesRegExp.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MatchesRegExp.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MatchesRegExp.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MatchesRegExp.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,7 @@ import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression; 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; @@ -63,8 +64,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()+" "+ "MatchesRegExp"); @@ -96,7 +97,10 @@ { logger.severe(Thread.currentThread().getName()+" "+"invalid expression."); - throw new SPLException("invalid expression."); + 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/Max.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Max.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Max.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Max.java Mon Aug 18 05:50:36 2008 @@ -36,6 +36,7 @@ import org.apache.imperius.spl.parser.util.ExpressionUtility; 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; @@ -63,8 +64,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 })); } } this._dataType.setIsArray(false); @@ -107,7 +108,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/MaxInCollection.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MaxInCollection.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MaxInCollection.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MaxInCollection.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.SingleArgumentExpression; import org.apache.imperius.spl.parser.util.ExpressionUtility; +import org.apache.imperius.util.Messages; import org.apache.imperius.util.SPLLogger; @@ -72,9 +73,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[] { className })); } } @@ -101,8 +101,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_PASSED_EXPRESSION_TYPE_ERROR_MSG", new Object[] { + "RHS", "is not", "List" })); } ArrayList resultArray = (ArrayList) expResult; //System.out.println("resultArray size " + resultArray.size()+ " to string " + resultArray.toString()); @@ -139,7 +140,9 @@ else { 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[] { expResult })); } } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MedianInCollection.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MedianInCollection.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MedianInCollection.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MedianInCollection.java Mon Aug 18 05:50:36 2008 @@ -35,6 +35,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; @@ -62,9 +63,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,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_PASSED_EXPRESSION_TYPE_ERROR_MSG", new Object[] { + "expResult", "is not", "List" })); } ArrayList resultArray = (ArrayList) expResult; Integer count = new Integer(resultArray.size()); @@ -96,8 +97,10 @@ if (count.intValue() < 2) { logger.severe(Thread.currentThread().getName()+" "+"result of expression is of size less than 2 hence median cannot be calculated"); - throw new SPLException( - "result of expression is of size less than 2 hence median cannot be calculated"); + + throw new SPLException(Messages.getString( + "SPL_NO_OF_ARGUMENTS_PASSED_ERROR_MSG", new Object[] { + "> 2", count })); } if ((resultArray != null) && (!resultArray.isEmpty())) { @@ -135,7 +138,9 @@ else { 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[] { resultArray })); } logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "evaluate"); Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MiddleSubstring.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MiddleSubstring.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MiddleSubstring.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MiddleSubstring.java Mon Aug 18 05:50:36 2008 @@ -35,6 +35,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; @@ -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()+" "+ "MiddleSubstring"); @@ -96,8 +97,8 @@ logger.severe( "Illegal direction argument."); - throw new IllegalArgumentException( - "Illegal direction argument."); + throw new IllegalArgumentException(Messages.getString("SPL_INVALID_DIRECTION_ARGUMENT_ERROR_MSG")); + } if (o2 instanceof String) @@ -138,7 +139,10 @@ catch (Exception e) { 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/Min.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Min.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Min.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Min.java Mon Aug 18 05:50:36 2008 @@ -36,6 +36,7 @@ import org.apache.imperius.spl.parser.util.ExpressionUtility; 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; @@ -71,8 +72,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 })); } } this._dataType.setIsArray(false); @@ -115,7 +116,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/MinInCollection.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MinInCollection.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MinInCollection.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/MinInCollection.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.SingleArgumentExpression; import org.apache.imperius.spl.parser.util.ExpressionUtility; +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[] { className })); } } @@ -90,8 +90,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_PASSED_EXPRESSION_TYPE_ERROR_MSG", new Object[] { + "expResult", "is not", "List" })); } ArrayList resultArray = (ArrayList) expResult; //System.out.println("resultArray size " + resultArray.size()+ " to string " + resultArray.toString()); @@ -128,7 +129,10 @@ else { 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[] { resultArray })); + } } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Mod.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Mod.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Mod.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Mod.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; @@ -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()+" "+ "Mod"); @@ -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() })); + } } @@ -138,7 +142,7 @@ { logger.severe(Thread.currentThread().getName()+" "+"Illegal argument type."); - throw new SPLException("Illegal argument type."); + throw new SPLException(Messages.getString("SPL_WRONG_OPERAND_TYPE_EXCEPTION_MSG")); } } Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/NotEqual.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/NotEqual.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/NotEqual.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/NotEqual.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,7 @@ import org.apache.imperius.spl.parser.util.ExpressionUtility; 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()+" "+ "NotEqual"); @@ -93,10 +94,12 @@ } catch (Exception e) { - e.printStackTrace(); 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/Power.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Power.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Power.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Power.java Mon Aug 18 05:50:36 2008 @@ -34,6 +34,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; @@ -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()+" "+ "Power"); @@ -86,8 +87,9 @@ { logger.severe(Thread.currentThread().getName()+" "+"evaluation errro: " + e.toString()); - - throw new SPLException("evaluation errro: " + 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/Product.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Product.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Product.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Product.java Mon Aug 18 05:50:36 2008 @@ -35,6 +35,7 @@ import org.apache.imperius.spl.parser.util.ExpressionUtility; 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, "Product"); @@ -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/ReplaceSubstring.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReplaceSubstring.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReplaceSubstring.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReplaceSubstring.java Mon Aug 18 05:50:36 2008 @@ -33,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 +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()+" "+ "ReplaceSubstring"); @@ -87,7 +88,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/RightSubstring.java URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/RightSubstring.java?rev=686743&r1=686742&r2=686743&view=diff ============================================================================== --- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/RightSubstring.java (original) +++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/RightSubstring.java Mon Aug 18 05:50:36 2008 @@ -33,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 +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()+" "+ "RightSubstring"); @@ -91,8 +92,9 @@ { logger.severe( "Illegal direction argument."); - throw new IllegalArgumentException( - "Illegal direction argument."); + throw new IllegalArgumentException(Messages + .getString("SPL_INVALID_DIRECTION_ARGUMENT_ERROR_MSG")); + } if (o2 instanceof String) { @@ -113,7 +115,10 @@ { logger.severe(Thread.currentThread().getName()+" "+"evaluation error: " + toString()); - throw new SPLException("evaluation error: " + toString()); + throw new SPLException(Messages.getString( + "SPL_EVALUATION_ERROR_MSG", new Object[] { e + .getLocalizedMessage() })); + } }