Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 46010 invoked from network); 10 Aug 2007 18:19:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Aug 2007 18:19:12 -0000 Received: (qmail 69853 invoked by uid 500); 10 Aug 2007 18:19:10 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 69766 invoked by uid 500); 10 Aug 2007 18:19:09 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 69757 invoked by uid 99); 10 Aug 2007 18:19:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2007 11:19:09 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2007 18:19:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AADE51A981D; Fri, 10 Aug 2007 11:18:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r564703 - /commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java Date: Fri, 10 Aug 2007 18:18:50 -0000 To: commits@commons.apache.org From: mbenson@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070810181850.AADE51A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mbenson Date: Fri Aug 10 11:18:49 2007 New Revision: 564703 URL: http://svn.apache.org/viewvc?view=rev&rev=564703 Log: remove extra closing asterisks from javadoc comments Modified: commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java Modified: commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java URL: http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java?view=diff&rev=564703&r1=564702&r2=564703 ============================================================================== --- commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java (original) +++ commons/proper/el/trunk/src/java/org/apache/commons/el/ExpressionEvaluatorImpl.java Fri Aug 10 11:18:49 2007 @@ -82,32 +82,32 @@ * @author Nathan Abramson - Art Technology Group * @author Shawn Bayern * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$ - **/ + */ public class ExpressionEvaluatorImpl extends ExpressionEvaluator { // ------------------------------------- // Statics // ------------------------------------- /** The mapping from expression String to its parsed form (String, - Expression, or ExpressionString) **/ + Expression, or ExpressionString) */ static Map sCachedExpressionStrings = Collections .synchronizedMap(new HashMap()); /** The mapping from ExpectedType to Maps mapping literal String to - parsed value **/ + parsed value */ static Map sCachedExpectedTypes = new HashMap(); // ------------------------------------- // Member variables // ------------------------------------- - /** Flag if the cache should be bypassed **/ + /** Flag if the cache should be bypassed */ boolean mBypassCache; // ------------------------------------- /** * * Constructor - **/ + */ public ExpressionEvaluatorImpl() { } @@ -117,7 +117,7 @@ * * @param pBypassCache flag indicating if the cache should be * bypassed - **/ + */ public ExpressionEvaluatorImpl(boolean pBypassCache) { mBypassCache = pBypassCache; } @@ -145,7 +145,7 @@ * @return The Expression object encapsulating the arguments. * * @exception ELException Thrown if parsing errors were found. - **/ + */ public javax.servlet.jsp.el.Expression parseExpression(String expression, Class expectedType, FunctionMapper fMapper) throws ELException { // Validate and then create an Expression object. @@ -168,7 +168,7 @@ * the expression. It can be null, in which case no functions * are supported for this invocation. * @return the expression String evaluated to the given expected type - **/ + */ public Object evaluate(String pExpressionString, Class pExpectedType, VariableResolver pResolver, FunctionMapper functions) throws ELException { @@ -195,7 +195,7 @@ * the expression. It can be null, in which case no functions * are supported for this invocation. * @return the expression evaluated to the given expected type - **/ + */ public Object evaluate(Object parsedExpression, Class pExpectedType, VariableResolver pResolver, FunctionMapper functions) throws ELException { @@ -231,7 +231,7 @@ * parsed form is cached (and caching is not bypassed), return the * cached form, otherwise parse and cache the value. Returns either * a String, Expression, or ExpressionString. - **/ + */ public Object parseExpressionString(String pExpressionString) throws ELException { // See if it's an empty String @@ -268,7 +268,7 @@ /** * * Converts the given value to the specified expected type. - **/ + */ Object convertToExpectedType(Object pValue, Class pExpectedType) throws ELException { return Coercions.coerce(pValue, pExpectedType); @@ -279,7 +279,7 @@ * * Converts the given String, specified as a static expression * string, to the given expected type. The conversion is cached. - **/ + */ Object convertStaticValueToExpectedType(String pValue, Class pExpectedType) throws ELException { // See if the value is already of the expected type @@ -303,7 +303,7 @@ * * Creates or returns the Map that maps string literals to parsed * values for the specified expected type. - **/ + */ static Map getOrCreateExpectedTypeMap(Class pExpectedType) { synchronized (sCachedExpectedTypes) { Map ret = (Map) sCachedExpectedTypes.get(pExpectedType); @@ -322,7 +322,7 @@ * * Formats a ParseException into an error message suitable for * displaying on a web page - **/ + */ static String formatParseException(String pExpressionString, ParseException pExc) { // Generate the String of expected tokens @@ -374,7 +374,7 @@ * Used to convert raw characters to their escaped version when * these raw version cannot be used as part of an ASCII string * literal. - **/ + */ static String addEscapes(String str) { StringBuffer retval = new StringBuffer(); char ch; @@ -418,7 +418,7 @@ * * Parses the given expression string, then converts it back to a * String in its canonical form. This is used to test parsing. - **/ + */ public String parseAndRender(String pExpressionString) throws ELException { Object val = parseExpressionString(pExpressionString); if (val instanceof Expression) {