svn commit: r1786990 - in /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3: JexlBuilder.java JexlEngine.java internal/Engine.java internal/SoftCache.java

[henrib]

Author: henrib
Date: Wed Mar 15 07:58:45 2017
New Revision: 1786990

URL: http://svn.apache.org/viewvc?rev=1786990&view=rev
Log:
JEXL:
Checkstyle & javadoc

Modified:
    
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
    
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java
    
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java
    
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java

Modified: 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java?rev=1786990&r1=1786989&r2=1786990&view=diff
==============================================================================
--- 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
 (original)
+++ 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
 Wed Mar 15 07:58:45 2017
@@ -204,13 +204,17 @@ public class JexlBuilder {
     }
 
     /**
+     * Sets the charset to use.
+     *
+     * @param arg the charset
+     * @return this builder
      * @deprecated since 3.1 use {@link #charset(Charset)} instead
      */
     @Deprecated
     public JexlBuilder loader(Charset arg) {
         return charset(arg);
-    } 
-    
+    }
+
     /**
      * Sets the charset to use.
      *
@@ -291,7 +295,7 @@ public class JexlBuilder {
     }
 
     /**
-     * @return the cancellable information flag 
+     * @return the cancellable information flag
      * @since 3.1
      */
     public Boolean cancellable() {

Modified: 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java?rev=1786990&r1=1786989&r2=1786990&view=diff
==============================================================================
--- 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java
 (original)
+++ 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlEngine.java
 Wed Mar 15 07:58:45 2017
@@ -210,13 +210,21 @@ public abstract class JexlEngine {
     public abstract boolean isSilent();
 
     /**
-     * Checks whether the engine considers unknown variables, methods, 
functions and constructors as errors.
+     * Checks whether this engine considers unknown variables, methods, 
functions and constructors as errors.
      *
      * @return true if strict, false otherwise
      */
     public abstract boolean isStrict();
 
     /**
+     * Checks whether this engine will throw JexlException.Cancel (true) or 
return null (false) when interrupted
+     * during an execution.
+     *
+     * @return true if cancellable, false otherwise
+     */
+    public abstract boolean isCancellable();
+
+    /**
      * Sets the class loader used to discover classes in 'new' expressions.
      * <p>This method is <em>not</em> thread safe; it should be called as an 
optional step of the JexlEngine
      * initialization code before expression creation &amp; evaluation.</p>

Modified: 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java?rev=1786990&r1=1786989&r2=1786990&view=diff
==============================================================================
--- 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java
 (original)
+++ 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java
 Wed Mar 15 07:58:45 2017
@@ -214,7 +214,7 @@ public class Engine extends JexlEngine {
         return strict;
     }
 
-    //@Override
+    @Override
     public boolean isCancellable() {
         return this.cancellable;
     }

Modified: 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java?rev=1786990&r1=1786989&r2=1786990&view=diff
==============================================================================
--- 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
 (original)
+++ 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
 Wed Mar 15 07:58:45 2017
@@ -204,7 +204,7 @@ class SoftCacheEntry<K, V> implements Ma
     }
 
     @Override
-    public V setValue(V value) {
+    public V setValue(V v) {
         throw new UnsupportedOperationException("Not supported.");
     }
 }