Author: markt
Date: Thu Aug 16 21:58:19 2012
New Revision: 1374080
URL: http://svn.apache.org/viewvc?rev=1374080&view=rev
Log:
Code clean-up
- Java 7 <>
- UCDetector use of final
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=1374080&r1=1374079&r2=1374080&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Thu Aug 16
21:58:19 2012
@@ -333,14 +333,14 @@ public class AntCompiler extends Compile
* Thread <-> PrintStream associations.
*/
protected static final ThreadLocal<PrintStream> streams =
- new ThreadLocal<PrintStream>();
+ new ThreadLocal<>();
/**
* Thread <-> ByteArrayOutputStream associations.
*/
protected static final ThreadLocal<ByteArrayOutputStream> data =
- new ThreadLocal<ByteArrayOutputStream>();
+ new ThreadLocal<>();
// --------------------------------------------------------- Public
Methods
Modified: tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1374080&r1=1374079&r2=1374080&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java Thu Aug
16 21:58:19 2012
@@ -96,7 +96,7 @@ public class AttributeParser {
private final boolean strict;
/* The type ($ or #) of expression. Literals have a type of null. */
- private char type;
+ private final char type;
/* The length of the quoted input string. */
private final int size;
@@ -108,7 +108,7 @@ public class AttributeParser {
private boolean lastChEscaped = false;
/* The unquoted result. */
- private StringBuilder result;
+ private final StringBuilder result;
/**
Modified: tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java?rev=1374080&r1=1374079&r2=1374080&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java Thu Aug 16
21:58:19 2012
@@ -29,9 +29,9 @@ import org.apache.jasper.JasperException
*/
public class BeanRepository {
- protected HashMap<String, String> beanTypes;
- protected ClassLoader loader;
- protected ErrorDispatcher errDispatcher;
+ protected final HashMap<String, String> beanTypes;
+ protected final ClassLoader loader;
+ protected final ErrorDispatcher errDispatcher;
/**
* Constructor.
@@ -39,7 +39,7 @@ public class BeanRepository {
public BeanRepository(ClassLoader loader, ErrorDispatcher err) {
this.loader = loader;
this.errDispatcher = err;
- beanTypes = new HashMap<String, String>();
+ beanTypes = new HashMap<>();
}
public void addBean(Node.UseBean n, String s, String type, String scope)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
