Author: henrib
Date: Mon Nov 16 21:33:15 2009
New Revision: 880968
URL: http://svn.apache.org/viewvc?rev=880968&view=rev
Log:
Fixed some checkstyle remnants; corrected index.xml to state 2.0 as current
version ahead of time
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlException.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java
commons/proper/jexl/trunk/xdocs/index.xml
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java?rev=880968&r1=880967&r2=880968&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java
Mon Nov 16 21:33:15 2009
@@ -325,7 +325,8 @@
// Parse the expression
ASTJexlScript tree = parse(expression, info);
if (tree.jjtGetNumChildren() > 1) {
- logger.warn("The JEXL Expression created will be a reference" + "
to the first expression from the supplied script: \"" + expression + "\" ");
+ logger.warn("The JEXL Expression created will be a reference"
+ + " to the first expression from the supplied script:
\"" + expression + "\" ");
}
return new ExpressionImpl(this, expression, tree);
}
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlException.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlException.java?rev=880968&r1=880967&r2=880968&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlException.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlException.java
Mon Nov 16 21:33:15 2009
@@ -28,7 +28,7 @@
private static final long serialVersionUID = 2690666400232612395L;
/** The point of origin for this exception. */
protected final JexlNode mark;
- /** The debug info */
+ /** The debug info. */
protected final Info info;
/** A marker to use in NPEs stating a null operand error. */
public static final String NULL_OPERAND = "jexl.null";
@@ -86,15 +86,15 @@
* The info parameter, an int[2] optionally provided by the caller, will
be filled with the begin/end offset
* characters of the precise error's trigger.
* </p>
- * @param info character offset interval of the precise node triggering
the error
+ * @param offsets character offset interval of the precise node triggering
the error
* @return a string representation of the offending expression, the empty
string if it could not be determined
*/
- public String getInfo(int[] info) {
+ public String getInfo(int[] offsets) {
Debugger dbg = new Debugger();
if (dbg.debug(mark)) {
- if (info != null && info.length >= 2) {
- info[0] = dbg.start();
- info[1] = dbg.end();
+ if (offsets != null && offsets.length >= 2) {
+ offsets[0] = dbg.start();
+ offsets[1] = dbg.end();
}
return dbg.data();
}
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java?rev=880968&r1=880967&r2=880968&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java
Mon Nov 16 21:33:15 2009
@@ -724,8 +724,8 @@
}
} catch (JexlException xjexl) {
xuel = new Exception("failed to parse '" + expression + "'",
xjexl);
- } catch (Exception xuel$) {
- xuel = xuel$;
+ } catch (Exception xany) {
+ xuel = xany;
} finally {
if (xuel != null) {
if (jexl.isSilent()) {
Modified: commons/proper/jexl/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/index.xml?rev=880968&r1=880967&r2=880968&view=diff
==============================================================================
--- commons/proper/jexl/trunk/xdocs/index.xml (original)
+++ commons/proper/jexl/trunk/xdocs/index.xml Mon Nov 16 21:33:15 2009
@@ -30,7 +30,7 @@
small footprint API.
</p>
<p>
- Its name itself stands for Java EXpression Language, a simple
expression language inspired by Jakarta Velocity
+ Its name stands for Java EXpression Language, a simple expression
language inspired by Jakarta Velocity
and the Expression Language defined in the JavaServer Pages
Standard Tag Library version 1.1 (JSTL) and
JavaServer Pages version 2.0 (JSP).
</p>
@@ -121,7 +121,7 @@
<section name="Releases">
<p>
- JEXL 2.0 is soon to be released; the current released version is 1.1.
+ The current released version is 2.0.
See the <a href="releases.html">releases</a> page for information on
obtaining releases.
</p>
</section>
