This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 92afb018a10d71fc34456a3fbfe532864f656864
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 29 17:27:28 2024 +0000
Prepare for automated formatting
---
java/org/apache/jasper/compiler/Generator.java | 38 +++++++---------------
.../apache/jasper/compiler/JspDocumentParser.java | 1 +
2 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 9e228aa19b..e6b7fc90bd 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -59,24 +59,10 @@ import org.xml.sax.Attributes;
/**
* Generate Java source from Nodes
*
- * @author Anil K. Vijendran
- * @author Danno Ferrin
- * @author Mandar Raje
- * @author Rajiv Mordani
- * @author Pierre Delisle
- *
- * Tomcat 4.1.x and Tomcat 5:
- * @author Kin-man Chung
- * @author Jan Luehe
- * @author Shawn Bayern
- * @author Mark Roth
- * @author Denis Benoit
- *
- * Tomcat 6.x
- * @author Jacob Hookom
- * @author Remy Maucherat
+ * @author Anil K. Vijendran, Danno Ferrin, Mandar Raje, Rajiv Mordani, Pierre
Delisle
+ * @author Tomcat 4.1.x and Tomcat 5: Kin-man Chung, Jan Luehe, Shawn Bayern,
Mark Roth, Denis Benoit
+ * @author Tomcat 6.x: Jacob Hookom, Remy Maucherat
*/
-
class Generator {
private final Log log = LogFactory.getLog(Generator.class); // must not be
static
@@ -414,9 +400,7 @@ class Generator {
}
/*
- * Generates getters for
- * - instance manager
- * - expression factory
+ * Generates getters for instance manager & expression factory.
*
* For JSPs these methods use lazy init. This is not an option for tag
files
* (at least it would be more complicated to generate) because the
@@ -488,7 +472,7 @@ class Generator {
* Generates the _jspInit() method for instantiating the tag handler pools.
* For tag file, _jspInit has to be invoked manually, and the ServletConfig
* object explicitly passed.
- *
+ * <p>
* In JSP 2.1, we also instantiate an ExpressionFactory
*/
private void generateInit() {
@@ -658,7 +642,7 @@ class Generator {
* Declare tag handler pools (tags of the same type and with the same
* attribute set share the same tag handler pool) (shared by servlet and
tag
* handler preamble generation)
- *
+ * <p>
* In JSP 2.1, we also scope an instance of ExpressionFactory
*/
private void genPreambleClassVariableDeclarations() {
@@ -868,9 +852,9 @@ class Generator {
private void generateXmlProlog(Node.Nodes page) {
/*
- * An XML declaration is generated under the following conditions: -
+ * An XML declaration is generated under the following conditions: a)
* 'omit-xml-declaration' attribute of <jsp:output> action is set to
- * "no" or "false" - JSP document without a <jsp:root>
+ * "no" or "false"; b) JSP document without a <jsp:root>.
*/
String omitXmlDecl = pageInfo.getOmitXmlDecl();
if ((omitXmlDecl != null && !JspUtil.booleanValue(omitXmlDecl)) ||
@@ -886,7 +870,6 @@ class Generator {
* doctype-public appears: <!DOCTYPE name PUBLIC "doctypePublic"
* "doctypeSystem"> else <!DOCTYPE name SYSTEM "doctypeSystem" >
*/
-
String doctypeName = pageInfo.getDoctypeName();
if (doctypeName != null) {
String doctypePublic = pageInfo.getDoctypePublic();
@@ -914,8 +897,11 @@ class Generator {
/*
* Map containing introspection information on tag handlers:
+ *
* <key>: tag prefix <value>: Map containing introspection on tag
- * handlers: <key>: tag short name <value>: introspection info of tag
+ * handlers
+ *
+ * <key>: tag short name <value>: introspection info of tag
* handler for <prefix:shortName> tag
*/
private final Map<String,Map<String,TagHandlerInfo>> handlerInfos;
diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java
b/java/org/apache/jasper/compiler/JspDocumentParser.java
index 930cd0da9b..711e3834e4 100644
--- a/java/org/apache/jasper/compiler/JspDocumentParser.java
+++ b/java/org/apache/jasper/compiler/JspDocumentParser.java
@@ -499,6 +499,7 @@ class JspDocumentParser
* and any leading and trailing white-space-only textual nodes in a
* jsp:attribute whose 'trim' attribute is set to FALSE, which are to
* be kept verbatim.
+ * <p>
* JSP.6.2.3 defines white space characters.
*/
boolean isAllSpace = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
