Author: timw
Date: Wed Sep 29 08:08:32 2010
New Revision: 1002509
URL: http://svn.apache.org/viewvc?rev=1002509&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50018
Minor javadoc corrections in Jasper.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
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=1002509&r1=1002508&r2=1002509&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Wed Sep
29 08:08:32 2010
@@ -125,7 +125,7 @@ class ParserController implements TagCon
*
* @param inFileName The path to the resource to be included.
* @param parent The parent node of the include directive.
- * @param jarFileUrl The JAR file from which to read the included resource,
+ * @param jarResource The JAR file from which to read the included
resource,
* or null of the included resource is to be read from the filesystem
*/
public Node.Nodes parse(String inFileName, Node parent,
@@ -142,7 +142,7 @@ class ParserController implements TagCon
* This is invoked by the compiler
*
* @param inFileName The name of the tag file to be parsed.
- * @param tagFileJarUrl The location of the tag file.
+ * @param jarResource The location of the tag file.
*/
public Node.Nodes parseTagFileDirectives(String inFileName,
JarResource jarResource)
@@ -168,7 +168,7 @@ class ParserController implements TagCon
* @param directivesOnly true if the file to be parsed is a tag file and
* we are only interested in the directives needed for constructing a
* TagFileInfo.
- * @param jarFile The JAR file from which to read the JSP page or tag file,
+ * @param jarResource The JAR file from which to read the JSP page or tag
file,
* or null if the JSP page or tag file is to be read from the filesystem
*/
private Node.Nodes doParse(String inFileName,
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1002509&r1=1002508&r2=1002509&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Wed Sep
29 08:08:32 2010
@@ -480,8 +480,8 @@ class TagFileProcessor {
* the tag name as specified in the TLD
* @param path
* the path for the tagfile
- * @param tagFileJarUrl
- * the url for the Jar containing the tag file
+ * @param jarResource
+ * the Jar resource containing the tag file
* @param tagLibInfo
* the TagLibraryInfo object associated with this TagInfo
* @return a TagInfo object assembled from the directives in the tag file.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1002509&r1=1002508&r2=1002509&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 29 08:08:32 2010
@@ -171,6 +171,10 @@
<bug>49909</bug>: Fix a regression introduced with the fix for
<bug>47950</bug> that prevented JSTL classes being loaded. (markt)
</fix>
+ <fix>
+ <bug>50018</bug>: Fix some minor Javadoc errors in Jasper source.
+ Based on a patch by sebb. (timw)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
