markt 2004/02/05 14:16:47
Modified: jasper2/src/share/org/apache/jasper
JspCompilationContext.java Options.java
jasper2/src/share/org/apache/jasper/compiler
ErrorHandler.java JspRuntimeContext.java
SmapStratum.java
jasper2/src/share/org/apache/jasper/compiler/tagplugin
TagPluginContext.java
jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
jasper2/src/share/org/apache/jasper/servlet
JasperLoader.java
jasper2/src/share/org/apache/jasper/xmlparser
XMLEncodingDetector.java
XercesEncodingDetector.java
Log:
- Fix bugs 13960, 13961. Edit javadoc comments to prevent warnings during compile. A
minor issue but enables a couple of bugs to be closed.
- Reported against TC4 but equally relevant here.
- Reported by David Medinets.
Revision Changes Path
1.44 +5 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- JspCompilationContext.java 8 Oct 2003 17:39:15 -0000 1.43
+++ JspCompilationContext.java 5 Feb 2004 22:16:46 -0000 1.44
@@ -374,8 +374,9 @@
}
/**
- * True if we are compiling a tag file in prototype mode, i.e. we only
- * Generate codes with class for the tag handler with empty method bodies.
+ * True if we are compiling a tag file in prototype mode.
+ * ie we only generate codes with class for the tag handler with empty
+ * method bodies.
*/
public boolean isPrototypeMode() {
return protoTypeMode;
1.20 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Options.java 10 Nov 2003 22:26:20 -0000 1.19
+++ Options.java 5 Feb 2004 22:16:47 -0000 1.20
@@ -122,7 +122,7 @@
public boolean isSmapSuppressed();
/**
- * Should SMAP info for JSR45 debugging be dumped to a file?
+ * Indicates that SMAP info for JSR45 debugging should be dumped to a file.
* Ignored is suppressSmap() is true
*/
public boolean isSmapDumped();
1.3 +5 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java
Index: ErrorHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ErrorHandler.java 7 Oct 2002 19:37:21 -0000 1.2
+++ ErrorHandler.java 5 Feb 2004 22:16:47 -0000 1.3
@@ -81,7 +81,7 @@
* @param fname Name of the JSP file in which the parse error occurred
* @param line Parse error line number
* @param column Parse error column number
- * @param errMsg Parse error message
+ * @param msg Parse error message
* @param exception Parse exception
*/
public void jspError(String fname, int line, int column, String msg,
@@ -90,7 +90,7 @@
/**
* Processes the given JSP parse error.
*
- * @param errMsg Parse error message
+ * @param msg Parse error message
* @param exception Parse exception
*/
public void jspError(String msg, Exception exception)
1.18 +10 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
Index: JspRuntimeContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JspRuntimeContext.java 28 Oct 2003 19:18:53 -0000 1.17
+++ JspRuntimeContext.java 5 Feb 2004 22:16:47 -0000 1.18
@@ -89,7 +89,7 @@
/**
* Class for tracking JSP compile time file dependencies when the
- * <[EMAIL PROTECTED] file="..."%> directive is used.
+ * &060;[EMAIL PROTECTED] file="..."%&062; directive is used.
*
* A background thread periodically checks the files a JSP page
* is dependent upon. If a dpendent file changes the JSP page
@@ -122,7 +122,7 @@
*
* Loads in any previously generated dependencies from file.
*
- * @param ServletContext for web application
+ * @param context ServletContext for web application
*/
public JspRuntimeContext(ServletContext context, Options options) {
@@ -215,8 +215,8 @@
/**
* Add a new JspServletWrapper.
*
- * @param String uri of JSP
- * @param JspServletWrapper for JSP
+ * @param jspUri of JSP
+ * @param jsw Servlet wrapper for JSP
*/
public void addWrapper(String jspUri, JspServletWrapper jsw) {
jsps.remove(jspUri);
@@ -226,7 +226,7 @@
/**
* Get an already existing JspServletWrapper.
*
- * @param String JSP URI
+ * @param jspUri JSP URI
* @return JspServletWrapper for JSP
*/
public JspServletWrapper getWrapper(String jspUri) {
@@ -236,7 +236,7 @@
/**
* Remove a JspServletWrapper.
*
- * @param String JSP URI of JspServletWrapper to remove
+ * @param jspUri of JspServletWrapper to remove
*/
public void removeWrapper(String jspUri) {
jsps.remove(jspUri);
1.12 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapStratum.java
Index: SmapStratum.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapStratum.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SmapStratum.java 16 Sep 2003 17:46:43 -0000 1.11
+++ SmapStratum.java 5 Feb 2004 22:16:47 -0000 1.12
@@ -183,7 +183,7 @@
/**
* Adds record of a new file, by filename.
*
- * @param fileName the filename to add, unqualified by path.
+ * @param filename the filename to add, unqualified by path.
*/
public void addFile(String filename) {
addFile(filename, filename);
@@ -193,7 +193,7 @@
* Adds record of a new file, by filename and path. The path
* may be relative to a source compilation path.
*
- * @param fileName the filename to add, unqualified by path
+ * @param filename the filename to add, unqualified by path
* @param filePath the path for the filename, potentially relative
* to a source compilation path
*/
1.13 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
Index: TagPluginContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/tagplugin/TagPluginContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TagPluginContext.java 2 Sep 2003 21:40:00 -0000 1.12
+++ TagPluginContext.java 5 Feb 2004 22:16:47 -0000 1.13
@@ -87,7 +87,7 @@
/**
* Generate an import statement
- * @param importName Name of the import class, '*' allowed.
+ * @param s Name of the import class, '*' allowed.
*/
void generateImport(String s);
1.26 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JspRuntimeLibrary.java 4 Nov 2003 19:28:49 -0000 1.25
+++ JspRuntimeLibrary.java 5 Feb 2004 22:16:47 -0000 1.26
@@ -604,7 +604,7 @@
/**
* Decode an URL formatted string.
- * @param s The string to decode.
+ * @param encoded The string to decode.
* @return The decoded string.
*/
1.12 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JasperLoader.java
Index: JasperLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JasperLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JasperLoader.java 2 Sep 2003 21:39:59 -0000 1.11
+++ JasperLoader.java 5 Feb 2004 22:16:47 -0000 1.12
@@ -199,7 +199,7 @@
* a web application context, we just return our preset
* PermissionCollection for the web app context.
*
- * @param CodeSource where the code was loaded from
+ * @param codeSource where the code was loaded from
* @return PermissionCollection for CodeSource
*/
public final PermissionCollection getPermissions(CodeSource codeSource) {
1.6 +0 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XMLEncodingDetector.java
Index: XMLEncodingDetector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XMLEncodingDetector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLEncodingDetector.java 12 Feb 2003 23:44:23 -0000 1.5
+++ XMLEncodingDetector.java 5 Feb 2004 22:16:47 -0000 1.6
@@ -74,7 +74,6 @@
* Encoding autodetection is done according to the XML 1.0 specification,
* Appendix F.1: Detection Without External Encoding Information.
*
- * @param in The input stream to read
* @param err The error dispatcher
*
* @return Two-element array, where the first element (of type
1.6 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XercesEncodingDetector.java
Index: XercesEncodingDetector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/XercesEncodingDetector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesEncodingDetector.java 12 Feb 2003 23:44:23 -0000 1.5
+++ XercesEncodingDetector.java 5 Feb 2004 22:16:47 -0000 1.6
@@ -703,7 +703,7 @@
*
* @param delimiter The string that signifies the end of the character
* data to be scanned.
- * @param data The data structure to fill.
+ * @param buffer The data structure to fill.
*
* @return Returns true if there is more data to scan, false otherwise.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
