Author: markt
Date: Thu Aug 16 20:59:25 2012
New Revision: 1374052
URL: http://svn.apache.org/viewvc?rev=1374052&view=rev
Log:
Code clean-up for o.a.el
- Remove unnecessary warnings
- Java 7 <>
Modified:
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
Modified: tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java?rev=1374052&r1=1374051&r2=1374052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java Thu Aug 16
20:59:25 2012
@@ -55,7 +55,7 @@ public final class EvaluationContext ext
@Override
// Can't use Class<?> because API needs to match specification in
superclass
- public Object getContext(@SuppressWarnings("rawtypes") Class key) {
+ public Object getContext(Class key) {
return this.elContext.getContext(key);
}
@@ -71,8 +71,7 @@ public final class EvaluationContext ext
@Override
// Can't use Class<?> because API needs to match specification in
superclass
- public void putContext(@SuppressWarnings("rawtypes") Class key,
- Object contextObject) {
+ public void putContext(Class key, Object contextObject) {
this.elContext.putContext(key, contextObject);
}
Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=1374052&r1=1374051&r2=1374052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Thu Aug 16
20:59:25 2012
@@ -72,7 +72,7 @@ public final class ExpressionBuilder imp
}
private static final ConcurrentCache<String, Node> cache =
- new ConcurrentCache<String, Node>(CACHE_SIZE);
+ new ConcurrentCache<>(CACHE_SIZE);
private FunctionMapper fnMapper;
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=1374052&r1=1374051&r2=1374052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Thu Aug 16
20:59:25 2012
@@ -58,7 +58,7 @@ public class FunctionMapperImpl extends
public void addFunction(String prefix, String localName, Method m) {
if (this.functions == null) {
- this.functions = new HashMap<String, Function>();
+ this.functions = new HashMap<>();
}
Function f = new Function(prefix, localName, m);
synchronized (this) {
@@ -81,7 +81,6 @@ public class FunctionMapperImpl extends
*
* @see java.io.Externalizable#readExternal(java.io.ObjectInput)
*/
- @SuppressWarnings("unchecked")
@Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
Modified: tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java?rev=1374052&r1=1374051&r2=1374052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java Thu Aug 16
20:59:25 2012
@@ -31,7 +31,7 @@ public class VariableMapperImpl extends
private static final long serialVersionUID = 1L;
- private Map<String, ValueExpression> vars = new HashMap<String,
ValueExpression>();
+ private Map<String, ValueExpression> vars = new HashMap<>();
public VariableMapperImpl() {
super();
@@ -48,9 +48,9 @@ public class VariableMapperImpl extends
return this.vars.put(variable, expression);
}
- @SuppressWarnings("unchecked")
@Override
- public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
this.vars = (Map<String, ValueExpression>) in.readObject();
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java?rev=1374052&r1=1374051&r2=1374052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java Thu Aug 16
20:59:25 2012
@@ -31,7 +31,7 @@ public final class AstMethodParameters e
}
public Object[] getParameters(EvaluationContext ctx) {
- ArrayList<Object> params = new ArrayList<Object>();
+ ArrayList<Object> params = new ArrayList<>();
for (int i = 0; i < this.jjtGetNumChildren(); i++) {
params.add(this.jjtGetChild(i).getValue(ctx));
}
Modified: tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java?rev=1374052&r1=1374051&r2=1374052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ConcurrentCache.java Thu Aug 16
20:59:25 2012
@@ -30,8 +30,8 @@ public final class ConcurrentCache<K,V>
public ConcurrentCache(int size) {
this.size = size;
- this.eden = new ConcurrentHashMap<K,V>(size);
- this.longterm = new WeakHashMap<K,V>(size);
+ this.eden = new ConcurrentHashMap<>(size);
+ this.longterm = new WeakHashMap<>(size);
}
public V get(K k) {
Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1374052&r1=1374051&r2=1374052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Thu Aug 16
20:59:25 2012
@@ -134,7 +134,7 @@ public class ReflectionUtil {
}
Method[] methods = base.getClass().getMethods();
- Map<Method,Integer> candidates = new HashMap<Method,Integer>();
+ Map<Method,Integer> candidates = new HashMap<>();
for (Method m : methods) {
if (!m.getName().equals(methodName)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
