kinman 2002/10/28 16:53:02
Modified: jasper2/src/share/org/apache/jasper/runtime
JspSourceDependent.java JspWriterImpl.java
PageContextImpl.java
Log:
- Protected fields are made private.
Revision Changes Path
1.2 +4 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspSourceDependent.java
Index: JspSourceDependent.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspSourceDependent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspSourceDependent.java 28 Aug 2002 23:00:19 -0000 1.1
+++ JspSourceDependent.java 29 Oct 2002 00:53:02 -0000 1.2
@@ -58,9 +58,10 @@
/**
* Interface for tracking the source files dependencies, for the purpose
* of compiling out of date pages. This is used for
- * 1) files that are included by pge directives
- * 2) Files that are included by include-prelude and include-coda in jsp:config
- * 3) Files that are tag files and referenced
+ * 1) files that are included by page directives
+ * 2) files that are included by include-prelude and include-coda in jsp:config
+ * 3) files that are tag files and referenced
+ * 4) TLDs referenced
*/
public interface JspSourceDependent {
1.5 +11 -11
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java
Index: JspWriterImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspWriterImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspWriterImpl.java 7 Oct 2002 22:52:22 -0000 1.4
+++ JspWriterImpl.java 29 Oct 2002 00:53:02 -0000 1.5
@@ -84,12 +84,12 @@
*/
public class JspWriterImpl extends JspWriter {
- protected Writer out;
- protected ServletResponse response;
- protected char cb[];
- protected int nextChar;
- protected boolean flushed = false;
- protected boolean closed = false;
+ private Writer out;
+ private ServletResponse response;
+ private char cb[];
+ private int nextChar;
+ private boolean flushed = false;
+ private boolean closed = false;
public JspWriterImpl() {
super( Constants.DEFAULT_BUFFER_SIZE, true );
@@ -159,7 +159,7 @@
nextChar = 0;
}
- protected void initOut() throws IOException {
+ private void initOut() throws IOException {
if (out == null) {
out = response.getWriter();
}
@@ -226,7 +226,7 @@
}
/** check to make sure that the stream has not been closed */
- protected void ensureOpen() throws IOException {
+ private void ensureOpen() throws IOException {
if (response == null || closed)
throw new IOException("Stream closed");
}
1.28 +23 -23
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- PageContextImpl.java 24 Oct 2002 19:18:55 -0000 1.27
+++ PageContextImpl.java 29 Oct 2002 00:53:02 -0000 1.28
@@ -145,7 +145,7 @@
_initialize(servlet, request, response, errorPageURL, needsSession,
bufferSize, autoFlush);
}
- void _initialize(Servlet servlet, ServletRequest request,
+ private void _initialize(Servlet servlet, ServletRequest request,
ServletResponse response, String errorPageURL,
boolean needsSession, int bufferSize,
boolean autoFlush)
@@ -495,8 +495,8 @@
}
}
- protected BodyContentImpl[] outs = new BodyContentImpl[0];
- protected int depth = -1;
+ private BodyContentImpl[] outs = new BodyContentImpl[0];
+ private int depth = -1;
public BodyContent pushBody() {
return (BodyContent) pushBody(null);
@@ -642,7 +642,7 @@
}
}
- protected JspWriterImpl _createOut(int bufferSize, boolean autoFlush)
+ private JspWriterImpl _createOut(int bufferSize, boolean autoFlush)
throws IOException, IllegalArgumentException {
try {
return new JspWriterImpl(response, bufferSize, autoFlush);
@@ -658,36 +658,36 @@
// per Servlet state
- protected Servlet servlet;
- protected ServletConfig config;
- protected ServletContext context;
+ private Servlet servlet;
+ private ServletConfig config;
+ private ServletContext context;
- protected JspFactory factory;
+ private JspFactory factory;
- protected boolean needsSession;
+ private boolean needsSession;
- protected String errorPageURL;
+ private String errorPageURL;
- protected boolean autoFlush;
- protected int bufferSize;
+ private boolean autoFlush;
+ private int bufferSize;
// page scope attributes
- protected transient Hashtable attributes = new Hashtable(16);
+ private transient Hashtable attributes = new Hashtable(16);
// per request state
- protected transient ServletRequest request;
- protected transient ServletResponse response;
- protected transient Object page;
+ private transient ServletRequest request;
+ private transient ServletResponse response;
+ private transient Object page;
- protected transient HttpSession session;
+ private transient HttpSession session;
- protected boolean isIncluded;
+ private boolean isIncluded;
// initial output stream
- protected transient JspWriter out;
- protected transient JspWriterImpl baseOut;
+ private transient JspWriter out;
+ private transient JspWriterImpl baseOut;
}
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
