costin 01/06/05 23:18:04
Modified: jasper34/generator/org/apache/jasper34/generator
BeanEndGenerator.java BeanGenerator.java
CharDataGenerator.java CompileException.java
DeclarationGenerator.java ExpressionGenerator.java
ForwardGenerator.java GetPropertyGenerator.java
IncludeGenerator.java InfoGenerator.java
MappedCharDataGenerator.java PluginGenerator.java
ScriptletGenerator.java SetPropertyGenerator.java
StoredCharDataGenerator.java TagBeginGenerator.java
TagEndGenerator.java TagGeneratorBase.java
TagPoolGenerator.java TagPoolManagerGenerator.java
Log:
Various changes to support the refactoring. Mostly adding import
statements and doing small fixes.
Revision Changes Path
1.2 +5 -6
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/BeanEndGenerator.java
Index: BeanEndGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/BeanEndGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanEndGenerator.java 2001/05/27 23:19:30 1.1
+++ BeanEndGenerator.java 2001/06/06 06:17:41 1.2
@@ -1,8 +1,4 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/BeanEndGenerator.java,v
1.1 2001/05/27 23:19:30 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:30 $
- *
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -61,18 +57,21 @@
package org.apache.jasper34.generator;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
+
/**
* Deal with </jsp:useBean>.
*
* @author Mandar Raje.
*/
-public class BeanEndGenerator extends GeneratorBase implements ServiceMethodPhase {
+public class BeanEndGenerator extends GeneratorBase {
// Will chage this later.
public BeanEndGenerator() {
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateServiceMethod(ServletWriter writer) {
writer.println("}");
}
1.2 +29 -21
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/BeanGenerator.java
Index: BeanGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/BeanGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanGenerator.java 2001/05/27 23:19:30 1.1
+++ BeanGenerator.java 2001/06/06 06:17:41 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/BeanGenerator.java,v
1.1 2001/05/27 23:19:30 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/BeanGenerator.java,v
1.2 2001/06/06 06:17:41 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:41 $
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
@@ -58,12 +58,14 @@
package org.apache.jasper34.generator;
+import org.apache.jasper34.jsptree.*;
import java.util.Hashtable;
import java.util.Vector;
import java.util.Enumeration;
import java.lang.reflect.Method;
import org.apache.jasper34.core.*;
+import org.apache.jasper34.parser.*;
import org.apache.jasper34.runtime.JasperException;
/**
@@ -71,14 +73,13 @@
*
* @author Mandar Raje
*/
-public class BeanGenerator extends GeneratorBase implements ServiceMethodPhase,
- ClassDeclarationPhase {
+public class BeanGenerator extends GeneratorBase {
- Hashtable attrs;
- BeanRepository beanInfo;
- boolean genSession;
- boolean beanRT = false;
- Mark start;
+ Hashtable attrs;
+ BeanRepository beanInfo;
+ boolean genSession;
+ boolean beanRT = false;
+ Mark start;
public BeanGenerator (Mark start, Hashtable attrs, BeanRepository beanInfo,
boolean genSession) {
@@ -88,17 +89,21 @@
this.start = start;
}
- public void generate (ServletWriter writer, Class phase)
- throws JasperException {
+ public void generateServiceMethod(ServletWriter writer)
+ throws JasperException
+ {
+ generateMethod (writer);
+ }
- if (ClassDeclarationPhase.class.equals (phase))
- checkSyntax (writer, phase);
- else if (ServiceMethodPhase.class.equals (phase))
- generateMethod (writer, phase);
+ public void generateClassDeclaration(ServletWriter writer)
+ throws JasperException
+ {
+ checkSyntax (writer);
}
- public void checkSyntax (ServletWriter writer, Class phase)
- throws JasperException {
+ public void checkSyntax (ServletWriter writer)
+ throws JasperException
+ {
String name = getAttribute ("id");
String varname = name;
String serfile = name;
@@ -155,8 +160,9 @@
}
}
- public void generateMethod (ServletWriter writer, Class phase)
- throws JasperException {
+ public void generateMethod (ServletWriter writer)
+ throws JasperException
+ {
String name = getAttribute ("id");
String varname = name;
String serfile = name;
@@ -265,7 +271,7 @@
private void lock (ServletWriter writer, String scope) {
- writer.println(" synchronized (" + scope + ") {");
+ writer.println("synchronized (" + scope + ") {");
writer.pushIndent();
}
@@ -296,8 +302,10 @@
String scope) {
writer.println (varname + "= (" + type + ")");
+ writer.pushIndent();
writer.println ("pageContext.getAttribute(" +
writer.quoteString(name) + "," + scope + ");");
+ writer.popIndent();
}
private void createBean(ServletWriter writer, String varname, String clsname,
1.2 +8 -7
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java
Index: CharDataGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CharDataGenerator.java 2001/05/27 23:19:30 1.1
+++ CharDataGenerator.java 2001/06/06 06:17:42 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
1.1 2001/05/27 23:19:30 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
1.2 2001/06/06 06:17:42 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:42 $
*
* ====================================================================
*
@@ -61,6 +61,9 @@
package org.apache.jasper34.generator;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
+
/**
* CharDataGenerator generates the character data present in the JSP
* file. Typically this is HTML which lands up as strings in
@@ -68,9 +71,7 @@
*
* @author Anil K. Vijendran
*/
-public class CharDataGenerator
- extends GeneratorBase
- implements ServiceMethodPhase
+public class CharDataGenerator extends GeneratorBase
{
char[] chars;
@@ -81,7 +82,7 @@
this.chars = chars;
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateServiceMethod(ServletWriter writer) {
writer.indent();
int current = 0;
int limit = chars.length;
1.2 +3 -2
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CompileException.java
Index: CompileException.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CompileException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompileException.java 2001/05/27 23:19:30 1.1
+++ CompileException.java 2001/06/06 06:17:43 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CompileException.java,v
1.1 2001/05/27 23:19:30 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CompileException.java,v
1.2 2001/06/06 06:17:43 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:43 $
*
* ====================================================================
*
@@ -63,6 +63,7 @@
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.JasperException;
import org.apache.jasper34.runtime.*;
+import org.apache.jasper34.parser.*;
/**
* Class for parser exceptions.
1.2 +7 -7
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/DeclarationGenerator.java
Index: DeclarationGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/DeclarationGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeclarationGenerator.java 2001/05/27 23:19:30 1.1
+++ DeclarationGenerator.java 2001/06/06 06:17:43 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/DeclarationGenerator.java,v
1.1 2001/05/27 23:19:30 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/DeclarationGenerator.java,v
1.2 2001/06/06 06:17:43 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:43 $
*
* ====================================================================
*
@@ -61,6 +61,8 @@
package org.apache.jasper34.generator;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
@@ -71,9 +73,7 @@
*
* @author Anil K. Vijendran
*/
-public class DeclarationGenerator
- extends GeneratorBase
- implements ClassDeclarationPhase
+public class DeclarationGenerator extends GeneratorBase
{
char[] chars;
@@ -81,7 +81,7 @@
this.chars = chars;
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateClassDeclaration(ServletWriter writer) {
writer.printMultiLn(new String(JspUtil.removeQuotes(chars)));
}
1.2 +8 -7
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ExpressionGenerator.java
Index: ExpressionGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ExpressionGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExpressionGenerator.java 2001/05/27 23:19:30 1.1
+++ ExpressionGenerator.java 2001/06/06 06:17:44 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ExpressionGenerator.java,v
1.1 2001/05/27 23:19:30 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ExpressionGenerator.java,v
1.2 2001/06/06 06:17:44 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:44 $
*
* ====================================================================
*
@@ -61,14 +61,15 @@
package org.apache.jasper34.generator;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
+
/**
* Generator to deal with JSP expressions: <%= ... %> stuff.
*
* @author Anil K. Vijendran
*/
-public class ExpressionGenerator
- extends GeneratorBase
- implements ServiceMethodPhase
+public class ExpressionGenerator extends GeneratorBase
{
char[] chars;
@@ -76,7 +77,7 @@
this.chars = chars;
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateServiceMethod(ServletWriter writer) {
writer.println("out.print("+new String(JspUtil.removeQuotes(chars))+");");
}
}
1.2 +7 -7
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ForwardGenerator.java
Index: ForwardGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ForwardGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ForwardGenerator.java 2001/05/27 23:19:31 1.1
+++ ForwardGenerator.java 2001/06/06 06:17:44 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ForwardGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ForwardGenerator.java,v
1.2 2001/06/06 06:17:44 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:44 $
*
* ====================================================================
*
@@ -66,15 +66,15 @@
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.JasperException;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
/**
* Generator for <jsp:forward>
*
* @author Anil K. Vijendran
*/
-public class ForwardGenerator
- extends GeneratorBase
- implements ServiceMethodPhase
+public class ForwardGenerator extends GeneratorBase
{
String page;
boolean isExpression = false;
@@ -94,7 +94,7 @@
isExpression = JspUtil.isExpression (page);
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateServiceMethod(ServletWriter writer) {
boolean initial = true;
String sep = "?";
writer.println("if (true) {");
1.2 +9 -8
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/GetPropertyGenerator.java
Index: GetPropertyGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/GetPropertyGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetPropertyGenerator.java 2001/05/27 23:19:31 1.1
+++ GetPropertyGenerator.java 2001/06/06 06:17:45 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/GetPropertyGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/GetPropertyGenerator.java,v
1.2 2001/06/06 06:17:45 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:45 $
*
* ====================================================================
*
@@ -65,6 +65,8 @@
import org.apache.jasper34.runtime.JasperException;
import org.apache.jasper34.runtime.*;
import java.lang.reflect.Method;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
@@ -73,9 +75,7 @@
*
* @author Mandar Raje
*/
-public class GetPropertyGenerator
- extends GeneratorBase
- implements ServiceMethodPhase
+public class GetPropertyGenerator extends GeneratorBase
{
Hashtable attrs;
BeanRepository beanInfo;
@@ -86,8 +86,9 @@
this.beanInfo = beanInfo;
}
- public void generate (ServletWriter writer, Class phase)
- throws JasperException {
+ public void generateServiceMethod (ServletWriter writer)
+ throws JasperException
+ {
String name = getAttribute ("name");
String property = getAttribute ("property");
1.2 +4 -4
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/IncludeGenerator.java
Index: IncludeGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/IncludeGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IncludeGenerator.java 2001/05/27 23:19:31 1.1
+++ IncludeGenerator.java 2001/06/06 06:17:46 1.2
@@ -63,6 +63,8 @@
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.JasperException;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
/**
* Generator for <jsp:include.../>
@@ -71,9 +73,7 @@
* @author Anil K. Vijendran
* @author Mandar Raje
*/
-public class IncludeGenerator
- extends GeneratorBase
- implements ServiceMethodPhase
+public class IncludeGenerator extends GeneratorBase
{
String page;
boolean isExpression = false;
@@ -104,7 +104,7 @@
isExpression = JspUtil.isExpression (page);
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateServiceMethod(ServletWriter writer) {
boolean initial = true;
String sep = "?";
writer.println("{");
1.2 +7 -7
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/InfoGenerator.java
Index: InfoGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/InfoGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InfoGenerator.java 2001/05/27 23:19:31 1.1
+++ InfoGenerator.java 2001/06/06 06:17:46 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/InfoGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/InfoGenerator.java,v
1.2 2001/06/06 06:17:46 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:46 $
*
* ====================================================================
*
@@ -61,6 +61,8 @@
package org.apache.jasper34.generator;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
@@ -71,9 +73,7 @@
*
* @author Unknown
*/
-class InfoGenerator
- extends GeneratorBase
- implements ClassDeclarationPhase
+class InfoGenerator extends GeneratorBase
{
private String info;
@@ -81,7 +81,7 @@
this.info = info;
}
- public void generate (ServletWriter writer, Class phase) {
+ public void generateClassDeclaration (ServletWriter writer) {
writer.println ("public String getServletInfo() {");
writer.pushIndent();
writer.println ("return \"" + this.info + "\";");
1.2 +6 -4
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/MappedCharDataGenerator.java
Index: MappedCharDataGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/MappedCharDataGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MappedCharDataGenerator.java 2001/05/27 23:19:31 1.1
+++ MappedCharDataGenerator.java 2001/06/06 06:17:47 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/MappedCharDataGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/MappedCharDataGenerator.java,v
1.2 2001/06/06 06:17:47 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:47 $
*
* ====================================================================
*
@@ -60,6 +60,8 @@
*/
package org.apache.jasper34.generator;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
/**
* CharDataGenerator generates the character data present in the JSP
@@ -77,7 +79,7 @@
super(chars);
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateServiceMethod(ServletWriter writer) {
writer.indent();
writer.print("out.write(\"");
// Generate the char data:
1.2 +5 -6
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/PluginGenerator.java
Index: PluginGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/PluginGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginGenerator.java 2001/05/27 23:19:31 1.1
+++ PluginGenerator.java 2001/06/06 06:17:48 1.2
@@ -63,15 +63,14 @@
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.JasperException;
import org.apache.jasper34.core.*;
-
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
/**
* Generator for <jsp:plugin>
*
* @author Rajiv Mordani [[EMAIL PROTECTED]]
*/
-public class PluginGenerator
- extends GeneratorBase
- implements ServiceMethodPhase
+public class PluginGenerator extends GeneratorBase
{
Hashtable attrs;
Hashtable param;
@@ -93,8 +92,8 @@
ieClassId = ctxt.getOptions().getIeClassId();
}
- public void generate(ServletWriter writer, Class phase)
- throws JasperException
+ public void generateServiceMethod(ServletWriter writer)
+ throws JasperException
{
String type = getAttribute ("type");
1.2 +7 -8
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ScriptletGenerator.java
Index: ScriptletGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ScriptletGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScriptletGenerator.java 2001/05/27 23:19:31 1.1
+++ ScriptletGenerator.java 2001/06/06 06:17:49 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ScriptletGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ScriptletGenerator.java,v
1.2 2001/06/06 06:17:49 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:49 $
*
* ====================================================================
*
@@ -61,18 +61,17 @@
package org.apache.jasper34.generator;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
-
/**
* Generator for <% .... %> stuff.
*
* @author Anil K. Vijendran
*/
-public class ScriptletGenerator
- extends GeneratorBase
- implements ServiceMethodPhase
+public class ScriptletGenerator extends GeneratorBase
{
char[] chars;
@@ -81,7 +80,7 @@
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateServiceMethod(ServletWriter writer) {
writer.printMultiLn(new String(JspUtil.removeQuotes(chars)));
}
1.3 +6 -5
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/SetPropertyGenerator.java
Index: SetPropertyGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/SetPropertyGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetPropertyGenerator.java 2001/05/28 06:48:14 1.2
+++ SetPropertyGenerator.java 2001/06/06 06:17:50 1.3
@@ -61,6 +61,8 @@
import java.lang.reflect.Method;
import java.util.Enumeration;
import java.beans.*;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
import org.apache.jasper34.runtime.JasperException;
@@ -69,9 +71,7 @@
*
* @author Mandar Raje
*/
-public class SetPropertyGenerator
- extends GeneratorBase
- implements ServiceMethodPhase
+public class SetPropertyGenerator extends GeneratorBase
{
Hashtable attrs;
BeanRepository beanInfo;
@@ -84,8 +84,9 @@
this.start = start;
}
- public void generate (ServletWriter writer, Class phase)
- throws JasperException {
+ public void generateServiceMethod (ServletWriter writer)
+ throws JasperException
+ {
String name = getAttribute ("name");
String property = getAttribute ("property");
String param = getAttribute ("param");
1.2 +12 -18
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/StoredCharDataGenerator.java
Index: StoredCharDataGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/StoredCharDataGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StoredCharDataGenerator.java 2001/05/27 23:19:31 1.1
+++ StoredCharDataGenerator.java 2001/06/06 06:17:51 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/StoredCharDataGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/27 23:19:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/StoredCharDataGenerator.java,v
1.2 2001/06/06 06:17:51 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/06/06 06:17:51 $
*
* ====================================================================
*
@@ -62,15 +62,15 @@
import java.util.Vector;
import org.apache.jasper34.runtime.JasperException;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
/**
* StoredCharDataGenerator generates HTML and other data present in
* JSP files to be stored/serialized into a .dat file.
*
* @author Anil K. Vijendran
*/
-public class StoredCharDataGenerator
- extends GeneratorBase
- implements ServiceMethodPhase, InitMethodPhase, ClassDeclarationPhase
+public class StoredCharDataGenerator extends GeneratorBase
{
int stringId;
char[] chars;
@@ -89,12 +89,14 @@
return "_jspx_html_data["+stringId+"]";
}
- private final void generateRef(ServletWriter writer) {
+ // private final void generateRef(ServletWriter writer) {
+ public void generateClassDeclaration(ServletWriter writer) {
if (stringId == 0)
writer.println("static char[][] _jspx_html_data = null;");
}
- private final void generateInit(ServletWriter writer) {
+ // private final void generateInit(ServletWriter writer) {
+ public void generateInitMethod(ServletWriter writer) {
if (stringId == 0) {
String name = writer.quoteString(fileName);
writer.println("java.io.ObjectInputStream oin = null;");
@@ -120,18 +122,10 @@
}
}
- private final void generatePrint(ServletWriter writer) {
+ // private final void generatePrint(ServletWriter writer) {
+ public void generateServiceMethod(ServletWriter writer) {
writer.println("out.print("+getStringVar()+");");
vector.addElement(chars);
- }
-
- public void generate(ServletWriter writer, Class phase) {
- if (phase.equals(ClassDeclarationPhase.class))
- generateRef(writer);
- else if (phase.equals(InitMethodPhase.class))
- generateInit(writer);
- else if (phase.equals(ServiceMethodPhase.class))
- generatePrint(writer);
}
public boolean generateCoordinates(Class phase) {
1.2 +24 -31
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagBeginGenerator.java
Index: TagBeginGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagBeginGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TagBeginGenerator.java 2001/05/27 23:19:31 1.1
+++ TagBeginGenerator.java 2001/06/06 06:17:51 1.2
@@ -71,8 +71,9 @@
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.JasperException;
import org.apache.jasper34.core.*;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
-
//import org.apache.jasper.compiler.ServletWriter;
/**
@@ -80,26 +81,25 @@
*
* @author Anil K. Vijendran
*/
-public class TagBeginGenerator
- extends TagGeneratorBase
- implements ServiceMethodPhase
+public class TagBeginGenerator extends TagGeneratorBase
{
String prefix;
String shortTagName;
Hashtable attrs;
TagLibraryInfo tli;
- TagInfo ti;
+ TagInfoImpl ti;
TagAttributeInfo[] attributes;
String baseVarName, thVarName;
- TagCache tc;
+ // TagCache tc; // part of TagInfoImpl
TagData tagData;
Mark start;
TagLibraries libraries;
- public TagBeginGenerator(Mark start, String prefix, String shortTagName,
Hashtable attrs,
- TagLibraryInfo tli, TagInfo ti, TagLibraries libraries,
- Stack tagHandlerStack, Hashtable tagVarNumbers)
+ public TagBeginGenerator(Mark start, String prefix, String shortTagName,
+ Hashtable attrs,TagLibraryInfo tli, TagInfo ti,
+ TagLibraries libraries, Stack tagHandlerStack,
+ Hashtable tagVarNumbers)
throws JasperException
{
setTagHandlerStack(tagHandlerStack);
@@ -108,7 +108,7 @@
this.shortTagName = shortTagName;
this.attrs = attrs;
this.tli = tli;
- this.ti = ti;
+ this.ti = (TagInfoImpl)ti;
this.attributes = ti.getAttributes();
this.baseVarName = getTagVarName(prefix, shortTagName);
this.thVarName = "_jspx_th_"+baseVarName;
@@ -118,24 +118,21 @@
public void init(JspCompilationContext ctxt) throws JasperException {
validate();
- tc = libraries.getTagCache(prefix, shortTagName);
- if (tc == null) {
- tc = new TagCache(shortTagName);
-
+ //tc = libraries.getTagInfoImpl(prefix, shortTagName);
+ if( ti.getTagHandlerClass() == null ) {
ClassLoader cl = ctxt.getClassLoader();
Class clz = null;
try {
clz = cl.loadClass(ti.getTagClassName());
} catch (Exception ex) {
throw new CompileException(start,
-
Constants.getString("jsp.error.unable.loadclass",
- new Object[] {
ti.getTagClassName(),
-
ex.getMessage()
- }
- ));
+ Constants.getString("jsp.error.unable.loadclass",
+ new Object[] { ti.getTagClassName(),
+ ex.getMessage() }
+ ));
}
- tc.setTagHandlerClass(clz);
- libraries.putTagCache(prefix, shortTagName, tc);
+ ti.setTagHandlerClass(clz);
+ //libraries.putTagInfo(prefix, shortTagName, tc);
}
}
@@ -193,7 +190,7 @@
String attrValue = (String) attrs.get(attributes[i].getName());
if (attrValue != null) {
String attrName = attributes[i].getName();
- Method m = tc.getSetterMethod(attrName);
+ Method m = ti.getSetterMethod(attrName);
if (m == null)
throw new CompileException
(start, Constants.getString
@@ -273,7 +270,8 @@
}
}
- public void generateServiceMethodStatements(ServletWriter writer)
+ // public void generateServiceMethodStatements(ServletWriter writer)
+ public void generateServiceMethod(ServletWriter writer)
throws JasperException
{
TagVariableData top = topTag();
@@ -318,7 +316,7 @@
writer.println("int "+evalVar+" = "
+thVarName+".doStartTag();");
- boolean implementsBodyTag =
BodyTag.class.isAssignableFrom(tc.getTagHandlerClass());
+ boolean implementsBodyTag =
BodyTag.class.isAssignableFrom(ti.getTagHandlerClass());
// Need to update AT_BEGIN variables here
declareVariables(writer, vi, false, true, VariableInfo.AT_BEGIN);
@@ -331,13 +329,13 @@
if (implementsBodyTag) {
writer.println("if ("+evalVar+" ==
javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)");
writer.pushIndent();
- writer.println("throw new JspTagException(\"Since tag handler
"+tc.getTagHandlerClass()+
+ writer.println("throw new JspTagException(\"Since tag handler
"+ti.getTagHandlerClass()+
" implements BodyTag, it can't return
Tag.EVAL_BODY_INCLUDE\");");
writer.popIndent();
} else {
writer.println("if ("+evalVar+" ==
javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_TAG)");
writer.pushIndent();
- writer.println("throw new JspTagException(\"Since tag handler
"+tc.getTagHandlerClass()+
+ writer.println("throw new JspTagException(\"Since tag handler
"+ti.getTagHandlerClass()+
" does not implement BodyTag, it can't return
BodyTag.EVAL_BODY_TAG\");");
writer.popIndent();
}
@@ -369,9 +367,4 @@
declareVariables(writer, vi, false, true, VariableInfo.AT_BEGIN);
}
- public void generate(ServletWriter writer, Class phase)
- throws JasperException
- {
- generateServiceMethodStatements(writer);
- }
}
1.2 +6 -6
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagEndGenerator.java
Index: TagEndGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagEndGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TagEndGenerator.java 2001/05/27 23:19:31 1.1
+++ TagEndGenerator.java 2001/06/06 06:17:52 1.2
@@ -65,15 +65,15 @@
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.BodyTag;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
/**
* Custom tag support.
*
* @author Anil K. Vijendran
*/
-public class TagEndGenerator
- extends TagGeneratorBase
- implements ServiceMethodPhase
+public class TagEndGenerator extends TagGeneratorBase
{
String prefix, shortTagName;
TagLibraryInfo tli;
@@ -96,7 +96,7 @@
this.libraries = libraries;
}
- public void generate(ServletWriter writer, Class phase) {
+ public void generateServiceMethod(ServletWriter writer) {
TagVariableData tvd = tagEnd();
String thVarName = tvd.tagHandlerInstanceName;
String evalVarName = tvd.tagEvalVarName;
@@ -104,8 +104,8 @@
VariableInfo[] vi = ti.getVariableInfo(new TagData(attrs));
- Class tagHandlerClass =
- libraries.getTagCache(prefix, shortTagName).getTagHandlerClass();
+ Class tagHandlerClass = ((TagInfoImpl)ti).getTagHandlerClass();
+
boolean implementsBodyTag = BodyTag.class.isAssignableFrom(tagHandlerClass);
writer.popIndent();
1.2 +2 -0
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagGeneratorBase.java
Index: TagGeneratorBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagGeneratorBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TagGeneratorBase.java 2001/05/27 23:19:31 1.1
+++ TagGeneratorBase.java 2001/06/06 06:17:52 1.2
@@ -61,6 +61,8 @@
import java.util.Hashtable;
import javax.servlet.jsp.tagext.VariableInfo;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
/**
* Common stuff for use with TagBegin and TagEndGenerators.
1.2 +20 -19
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagPoolGenerator.java
Index: TagPoolGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagPoolGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TagPoolGenerator.java 2001/05/27 23:19:31 1.1
+++ TagPoolGenerator.java 2001/06/06 06:17:53 1.2
@@ -1,5 +1,5 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagPoolGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagPoolGenerator.java,v
1.2 2001/06/06 06:17:53 costin Exp $
*
* ====================================================================
*
@@ -67,7 +67,8 @@
import org.apache.jasper34.runtime.*;
import org.apache.jasper34.core.*;
-
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
/**
* This class generates tag pooling related information. Specifically,
* it generates code to declare tag pools and to obtain tag pools
@@ -77,7 +78,7 @@
* @see org.apache.jasper.runtime.TagPoolManager
*/
public class TagPoolGenerator extends GeneratorBase
- implements ClassDeclarationPhase, InitMethodPhase {
+{
// Tag related info.
// Some of them aren't used now, but might be in the future.
@@ -170,23 +171,23 @@
* @param writer
* @param phase
*/
- public void generate(ServletWriter writer, Class phase) {
- if (ClassDeclarationPhase.class.isAssignableFrom(phase)) {
- writer.println(Constants.JSP_RUNTIME_PACKAGE +
- ".TagHandlerPool " + poolVarName + " = null;");
- } else if (InitMethodPhase.class.isAssignableFrom(phase)) {
- writer.println("if (" + TagPoolManagerGenerator.MANAGER_VARIABLE + " !=
null) {");
- writer.pushIndent();
- writer.println(poolVarName + " = ");
- writer.pushIndent();
- writer.println(TagPoolManagerGenerator.MANAGER_VARIABLE + ".getPool(\""
+ poolName + "\",");
- writer.println(ti.getTagClassName() + ".class);");
- writer.popIndent();
- writer.popIndent();
- writer.println("}");
- }
+ public void generateClassDeclaration(ServletWriter writer) {
+ writer.println(Constants.JSP_RUNTIME_PACKAGE +
+ ".TagHandlerPool " + poolVarName + " = null;");
+ }
+
+ public void generateInitMethod(ServletWriter writer ) {
+ writer.println("if (" + TagPoolManagerGenerator.MANAGER_VARIABLE + " != null)
{");
+ writer.pushIndent();
+ writer.println(poolVarName + " = ");
+ writer.pushIndent();
+ writer.println(TagPoolManagerGenerator.MANAGER_VARIABLE + ".getPool(\"" +
poolName + "\",");
+ writer.println(ti.getTagClassName() + ".class);");
+ writer.popIndent();
+ writer.popIndent();
+ writer.println("}");
}
-
+
/**
* This method generates a string based on a set of tag attributes.
1.2 +13 -14
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagPoolManagerGenerator.java
Index: TagPoolManagerGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagPoolManagerGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TagPoolManagerGenerator.java 2001/05/27 23:19:31 1.1
+++ TagPoolManagerGenerator.java 2001/06/06 06:17:53 1.2
@@ -1,5 +1,5 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagPoolManagerGenerator.java,v
1.1 2001/05/27 23:19:31 costin Exp $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/TagPoolManagerGenerator.java,v
1.2 2001/06/06 06:17:53 costin Exp $
*
* ====================================================================
*
@@ -61,8 +61,9 @@
import org.apache.jasper34.runtime.*;
import org.apache.jasper34.core.*;
+import org.apache.jasper34.parser.*;
+import org.apache.jasper34.jsptree.*;
-
/**
* This class generates code during the initilization phase that
* declares and attempts to obtain a TagPoolManager.
@@ -71,7 +72,7 @@
* @see org.apache.jasper.runtime.TagPoolManager
*/
public class TagPoolManagerGenerator extends GeneratorBase
- implements InitMethodPhase {
+{
/**
* variable name generated into java file
@@ -84,16 +85,14 @@
* @param writer
* @param phase
*/
- public void generate(ServletWriter writer, Class phase) {
- if (InitMethodPhase.class.isAssignableFrom(phase)) {
- writer.println(Constants.JSP_RUNTIME_PACKAGE +
- ".TagPoolManager " + MANAGER_VARIABLE + " =");
- writer.pushIndent();
- //
writer.println("org.apache.jasper.runtime.TagPoolManager.getDefaultPoolManager();");
- writer.println("(" + Constants.JSP_RUNTIME_PACKAGE
- + ".TagPoolManager) getServletContext().getAttribute(\"" +
- TagPoolManager.CONTEXT_ATTRIBUTE_NAME + "\");");
- writer.popIndent();
- }
+ public void generateInitMethod(ServletWriter writer) {
+ writer.println(Constants.JSP_RUNTIME_PACKAGE +
+ ".TagPoolManager " + MANAGER_VARIABLE + " =");
+ writer.pushIndent();
+ //
writer.println("org.apache.jasper.runtime.TagPoolManager.getDefaultPoolManager();");
+ writer.println("(" + Constants.JSP_RUNTIME_PACKAGE
+ + ".TagPoolManager) getServletContext().getAttribute(\"" +
+ TagPoolManager.CONTEXT_ATTRIBUTE_NAME + "\");");
+ writer.popIndent();
}
}
