From a9690e631c24fd94017a89161ca38be249a3767a Mon Sep 17 00:00:00 2001 From: timw Date: Wed, 29 Sep 2010 08:08:32 +0000 Subject: [PATCH] https://issues.apache.org/bugzilla/show_bug.cgi?id=50018 Minor javadoc corrections in Jasper. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1002509 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/ParserController.java | 6 +++--- java/org/apache/jasper/compiler/TagFileProcessor.java | 4 ++-- webapps/docs/changelog.xml | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/java/org/apache/jasper/compiler/ParserController.java b/java/org/apache/jasper/compiler/ParserController.java index 97c776391..d6e18e377 100644 --- a/java/org/apache/jasper/compiler/ParserController.java +++ b/java/org/apache/jasper/compiler/ParserController.java @@ -125,7 +125,7 @@ class ParserController implements TagConstants { * * @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 TagConstants { * 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 TagConstants { * @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, diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java index cd39877f9..481f4fd06 100644 --- a/java/org/apache/jasper/compiler/TagFileProcessor.java +++ b/java/org/apache/jasper/compiler/TagFileProcessor.java @@ -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. diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9b31a7425..9260301b6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -171,6 +171,10 @@ 49909: Fix a regression introduced with the fix for 47950 that prevented JSTL classes being loaded. (markt) + + 50018: Fix some minor Javadoc errors in Jasper source. + Based on a patch by sebb. (timw) + -- 2.11.0