Author: markt
Date: Wed Feb 13 22:02:49 2013
New Revision: 1445953
URL: http://svn.apache.org/r1445953
Log:
UCdetector
Reduce visibility, make fields final, remove unused code.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java
tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=1445953&r1=1445952&r2=1445953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Wed Feb
13 22:02:49 2013
@@ -38,8 +38,8 @@ import org.apache.jasper.JasperException
public class ELFunctionMapper {
private int currFunc = 0;
- StringBuilder ds; // Contains codes to initialize the functions mappers.
- StringBuilder ss; // Contains declarations of the functions mappers.
+ private StringBuilder ds; // Contains codes to initialize the functions
mappers.
+ private StringBuilder ss; // Contains declarations of the functions
mappers.
/**
* Creates the functions mappers for all EL expressions in the JSP page.
@@ -70,7 +70,7 @@ public class ELFunctionMapper {
* A visitor for the page. The places where EL is allowed are scanned
* for functions, and if found functions mappers are created.
*/
- class ELFunctionVisitor extends Node.Visitor {
+ private class ELFunctionVisitor extends Node.Visitor {
/**
* Use a global name map to facilitate reuse of function maps.
@@ -165,8 +165,9 @@ public class ELFunctionMapper {
// Only care about functions in ELNode's
class Fvisitor extends ELNode.Visitor {
- final ArrayList<ELNode.Function> funcs = new ArrayList<>();
- final HashMap<String, String> keyMap = new HashMap<>();
+ private final ArrayList<ELNode.Function> funcs =
+ new ArrayList<>();
+ private final HashMap<String, String> keyMap = new HashMap<>();
@Override
public void visit(ELNode.Function n) throws JasperException {
String key = n.getPrefix() + ":" + n.getName();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java?rev=1445953&r1=1445952&r2=1445953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java Wed Feb 13
22:02:49 2013
@@ -186,7 +186,7 @@ abstract class ELNode {
/* Name used for creating a map for the functions in this
EL expression, for communication to Generator.
*/
- String mapName = null; // The function map associated this EL
+ private String mapName = null; // The function map associated this
EL
private final List<ELNode> list;
public Nodes() {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java?rev=1445953&r1=1445952&r2=1445953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java Wed Feb
13 22:02:49 2013
@@ -44,10 +44,10 @@ import org.xml.sax.SAXException;
public class ErrorDispatcher {
// Custom error handler
- private ErrorHandler errHandler;
+ private final ErrorHandler errHandler;
// Indicates whether the compilation was initiated by JspServlet or JspC
- private boolean jspcMode = false;
+ private final boolean jspcMode;
/*
@@ -575,16 +575,16 @@ public class ErrorDispatcher {
* Visitor responsible for mapping a line number in the generated servlet
* source code to the corresponding JSP node.
*/
- static class ErrorVisitor extends Node.Visitor {
+ private static class ErrorVisitor extends Node.Visitor {
// Java source line number to be mapped
- private int lineNum;
+ private final int lineNum;
/*
* JSP node whose Java source code range in the generated servlet
* contains the Java source line number to be mapped
*/
- Node found;
+ private Node found;
/*
* Constructor.
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1445953&r1=1445952&r2=1445953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed Feb 13
22:02:49 2013
@@ -748,7 +748,7 @@ class Generator {
/**
* A visitor that generates codes for the elements in the page.
*/
- class GenerateVisitor extends Node.Visitor {
+ private class GenerateVisitor extends Node.Visitor {
/*
* Hashtable containing introspection information on tag handlers:
@@ -862,7 +862,7 @@ class Generator {
throws JasperException {
class ParamVisitor extends Node.Visitor {
- String separator;
+ private String separator;
ParamVisitor(String separator) {
this.separator = separator;
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?rev=1445953&r1=1445952&r2=1445953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
Wed Feb 13 22:02:49 2013
@@ -53,11 +53,11 @@ class ImplicitTagLibraryInfo extends Tag
private static final String IMPLICIT_TLD = "implicit.tld";
// Maps tag names to tag file paths
- private Hashtable<String,String> tagFileMap;
+ private final Hashtable<String,String> tagFileMap;
- private ParserController pc;
- private PageInfo pi;
- private Vector<TagFileInfo> vec;
+ private final ParserController pc;
+ private final PageInfo pi;
+ private final Vector<TagFileInfo> vec;
/**
* Constructor.
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java?rev=1445953&r1=1445952&r2=1445953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java Wed Feb 13
22:02:49 2013
@@ -25,11 +25,7 @@ import java.util.jar.JarFile;
public class JarURLResource implements JarResource {
- private String jarUrl;
-
- public JarURLResource(URL jarURL) {
- this(jarURL.toExternalForm());
- }
+ private final String jarUrl;
public JarURLResource(String jarUrl) {
this.jarUrl = jarUrl;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java?rev=1445953&r1=1445952&r2=1445953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java Wed Feb 13
22:02:49 2013
@@ -31,7 +31,7 @@ import javax.servlet.jsp.tagext.TagVaria
*/
class JasperTagInfo extends TagInfo {
- private String dynamicAttrsMapName;
+ private final String dynamicAttrsMapName;
public JasperTagInfo(String tagName,
String tagClassName,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
