Author: markt
Date: Fri Feb 15 22:42:33 2013
New Revision: 1446795
URL: http://svn.apache.org/r1446795
Log:
UCDetector
- use of final
- reduce visibility
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Fri Feb 15
22:42:33 2013
@@ -48,7 +48,7 @@ public class SmapUtil {
//*********************************************************************
// Constants
- public static final String SMAP_ENCODING = "UTF-8";
+ private static final String SMAP_ENCODING = "UTF-8";
//*********************************************************************
// Public entry points
@@ -458,11 +458,11 @@ public class SmapUtil {
}
}
- static class SmapGenVisitor extends Node.Visitor {
+ private static class SmapGenVisitor extends Node.Visitor {
private SmapStratum smap;
- private boolean breakAtLF;
- private HashMap<String, SmapStratum> innerClassMap;
+ private final boolean breakAtLF;
+ private final HashMap<String, SmapStratum> innerClassMap;
SmapGenVisitor(SmapStratum s, boolean breakAtLF, HashMap<String,
SmapStratum> map) {
this.smap = s;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Fri
Feb 15 22:42:33 2013
@@ -65,13 +65,13 @@ class TagLibraryInfoImpl extends TagLibr
// Logger
private final Log log = LogFactory.getLog(TagLibraryInfoImpl.class);
- private JspCompilationContext ctxt;
+ private final JspCompilationContext ctxt;
- private PageInfo pi;
+ private final PageInfo pi;
- private ErrorDispatcher err;
+ private final ErrorDispatcher err;
- private ParserController parserController;
+ private final ParserController parserController;
private final void print(String name, String value, PrintWriter w) {
if (value != null) {
@@ -761,5 +761,5 @@ class TagLibraryInfoImpl extends TagLibr
return tlv.validate(getPrefixString(), uri, thePage);
}
- protected TagLibraryValidator tagLibraryValidator;
+ private TagLibraryValidator tagLibraryValidator;
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java Fri Feb
15 22:42:33 2013
@@ -44,7 +44,7 @@ public class TagPluginManager {
private boolean initialized = false;
private HashMap<String, TagPlugin> tagPlugins = null;
- private ServletContext ctxt;
+ private final ServletContext ctxt;
private PageInfo pageInfo;
public TagPluginManager(ServletContext ctxt) {
@@ -172,11 +172,11 @@ public class TagPluginManager {
tagPlugin.doTag(tagPluginContext);
}
- static class TagPluginContextImpl implements TagPluginContext {
- private Node.CustomTag node;
+ private static class TagPluginContextImpl implements TagPluginContext {
+ private final Node.CustomTag node;
private Node.Nodes curNodes;
- private PageInfo pageInfo;
- private HashMap<String, Object> pluginAttributes;
+ private final PageInfo pageInfo;
+ private final HashMap<String, Object> pluginAttributes;
TagPluginContextImpl(Node.CustomTag n, PageInfo pageInfo) {
this.node = n;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java Fri Feb 15
22:42:33 2013
@@ -26,12 +26,12 @@ public class TextOptimizer {
/**
* A visitor to concatenate contiguous template texts.
*/
- static class TextCatVisitor extends Node.Visitor {
+ private static class TextCatVisitor extends Node.Visitor {
private static final String EMPTY_TEXT = "";
- private Options options;
- private PageInfo pageInfo;
+ private final Options options;
+ private final PageInfo pageInfo;
private int textNodeCount = 0;
private Node.TemplateText firstTextNode = null;
private StringBuilder textBuffer;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java Fri Feb 15
22:42:33 2013
@@ -19,8 +19,8 @@ package org.apache.jasper.compiler;
public class TldLocation {
- private String entryName;
- private JarResource jar;
+ private final String entryName;
+ private final JarResource jar;
public TldLocation(String entryName) {
this(entryName, (JarResource)null);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Fri Feb
15 22:42:33 2013
@@ -151,10 +151,10 @@ public class TldLocationsCache {
* [0] The location
* [1] If the location is a jar file, this is the location of the tld.
*/
- private Hashtable<String, TldLocation> mappings;
+ private final Hashtable<String, TldLocation> mappings;
private volatile boolean initialized;
- private ServletContext ctxt;
+ private final ServletContext ctxt;
/** Constructor.
*
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1446795&r1=1446794&r2=1446795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Fri Feb 15
22:42:33 2013
@@ -57,11 +57,11 @@ class Validator {
/**
* A visitor to validate and extract page directive info
*/
- static class DirectiveVisitor extends Node.Visitor {
+ private static class DirectiveVisitor extends Node.Visitor {
- private PageInfo pageInfo;
+ private final PageInfo pageInfo;
- private ErrorDispatcher err;
+ private final ErrorDispatcher err;
private static final JspUtil.ValidAttribute[] pageDirectiveAttrs = {
new JspUtil.ValidAttribute("language"),
@@ -414,13 +414,13 @@ class Validator {
/**
* A visitor for validating nodes other than page directives
*/
- static class ValidateVisitor extends Node.Visitor {
+ private static class ValidateVisitor extends Node.Visitor {
- private PageInfo pageInfo;
+ private final PageInfo pageInfo;
- private ErrorDispatcher err;
+ private final ErrorDispatcher err;
- private ClassLoader loader;
+ private final ClassLoader loader;
private final StringBuilder buf = new StringBuilder(32);
@@ -1511,7 +1511,7 @@ class Validator {
class FVVisitor extends ELNode.Visitor {
- Node n;
+ private Node n;
FVVisitor(Node n) {
this.n = n;
@@ -1653,7 +1653,7 @@ class Validator {
}
class MapperELVisitor extends ELNode.Visitor {
- ValidateFunctionMapper fmapper;
+ private ValidateFunctionMapper fmapper;
MapperELVisitor(ValidateFunctionMapper fmapper) {
this.fmapper = fmapper;
@@ -1705,9 +1705,9 @@ class Validator {
/**
* A visitor for validating TagExtraInfo classes of all tags
*/
- static class TagExtraInfoVisitor extends Node.Visitor {
+ private static class TagExtraInfoVisitor extends Node.Visitor {
- private ErrorDispatcher err;
+ private final ErrorDispatcher err;
/*
* Constructor
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
