Author: markt
Date: Fri Feb 15 21:03:34 2013
New Revision: 1446766
URL: http://svn.apache.org/r1446766
Log:
UCDetector
- use of final
- reduce visibility
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Fri Feb
15 21:03:34 2013
@@ -44,9 +44,9 @@ class ParserController implements TagCon
private static final String CHARSET = "charset=";
- private JspCompilationContext ctxt;
- private Compiler compiler;
- private ErrorDispatcher err;
+ private final JspCompilationContext ctxt;
+ private final Compiler compiler;
+ private final ErrorDispatcher err;
/*
* Indicates the syntax (XML or standard) of the file being processed
@@ -57,7 +57,7 @@ class ParserController implements TagCon
* A stack to keep track of the 'current base directory'
* for include directives that refer to relative paths.
*/
- private Stack<String> baseDirStack = new Stack<>();
+ private final Stack<String> baseDirStack = new Stack<>();
private boolean isEncodingSpecifiedInProlog;
private boolean isBomPresent;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java Fri
Feb 15 21:03:34 2013
@@ -42,7 +42,7 @@ class ScriptingVariabler {
* to help identify, for every custom tag, the scripting variables that it
* needs to declare.
*/
- static class CustomTagCounter extends Node.Visitor {
+ private static class CustomTagCounter extends Node.Visitor {
private int count;
private Node.CustomTag parent;
@@ -62,10 +62,10 @@ class ScriptingVariabler {
* For every custom tag, determines the scripting variables it needs to
* declare.
*/
- static class ScriptingVariableVisitor extends Node.Visitor {
+ private static class ScriptingVariableVisitor extends Node.Visitor {
- private ErrorDispatcher err;
- private Map<String, Integer> scriptVars;
+ private final ErrorDispatcher err;
+ private final Map<String, Integer> scriptVars;
public ScriptingVariableVisitor(ErrorDispatcher err) {
this.err = err;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java Fri Feb 15
21:03:34 2013
@@ -25,15 +25,15 @@ import java.io.PrintWriter;
* @author Kin-man Chung
*/
public class ServletWriter {
- public static final int TAB_WIDTH = 2;
- public static final String SPACES = " ";
+ private static final int TAB_WIDTH = 2;
+ private static final String SPACES = " ";
// Current indent level:
private int indent = 0;
private int virtual_indent = 0;
// The sink writer:
- PrintWriter writer;
+ private final PrintWriter writer;
// servlet line numbers start from 1
private int javaLine = 1;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Fri Feb 15
21:03:34 2013
@@ -47,8 +47,8 @@ public class SmapGenerator {
private String outputFileName;
private String defaultStratum = "Java";
- private List<SmapStratum> strata = new ArrayList<>();
- private List<String> embedded = new ArrayList<>();
+ private final List<SmapStratum> strata = new ArrayList<>();
+ private final List<String> embedded = new ArrayList<>();
private boolean doEmbedded = true;
//*********************************************************************
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java?rev=1446766&r1=1446765&r2=1446766&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java Fri Feb 15
21:03:34 2013
@@ -36,7 +36,7 @@ public class SmapStratum {
* Represents a single LineSection in an SMAP, associated with
* a particular stratum.
*/
- public static class LineInfo {
+ private static class LineInfo {
private int inputStartLine = -1;
private int outputStartLine = -1;
private int lineFileID = 0;
@@ -115,10 +115,10 @@ public class SmapStratum {
//*********************************************************************
// Private state
- private String stratumName;
- private List<String> fileNameList;
- private List<String> filePathList;
- private List<LineInfo> lineData;
+ private final String stratumName;
+ private final List<String> fileNameList;
+ private final List<String> filePathList;
+ private final List<LineInfo> lineData;
private int lastFileID;
//*********************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
