costin 01/06/12 08:13:12
Modified: jasper34/generator/org/apache/jasper34/generator
BeanGenerator.java ForwardGenerator.java
GeneratorBase.java IncludeGenerator.java
JspParseEventListener.java PageDirectives.java
PluginGenerator.java ServletWriter.java
SetPropertyGenerator.java TagBeginGenerator.java
Log:
Changes required by the api changes in core.
Nothing more than replacing calls to JspContext and Constants to
ContainerLiaison and state info in JspPageInfo.
Revision Changes Path
1.3 +9 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanGenerator.java 2001/06/06 06:17:41 1.2
+++ BeanGenerator.java 2001/06/12 15:12:54 1.3
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/BeanGenerator.java,v
1.3 2001/06/12 15:12:54 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/06/12 15:12:54 $
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
@@ -114,32 +114,32 @@
// Check for mandatory attributes:
if ( name == null ) {
- String m =
Constants.getString("jsp.error.usebean.missing.attribute");
+ String m =
containerL.getString("jsp.error.usebean.missing.attribute");
throw new CompileException(start, m);
}
if (clsname == null && type == null) {
- String m = Constants.getString("jsp.error.usebean.missing.type",
+ String m = containerL.getString("jsp.error.usebean.missing.type",
new Object[] {name});
throw new CompileException (start, m);
}
if (beanInfo.checkVariable(name) == true) {
- String m = Constants.getString("jsp.error.usebean.duplicate",
+ String m = containerL.getString("jsp.error.usebean.duplicate",
new Object[] {name});
throw new CompileException (start, m);
}
if (scope != null && scope.equalsIgnoreCase ("session")) {
if (genSession != true) {
- String m =
Constants.getString("jsp.error.usebean.prohibited.as.session",
+ String m =
containerL.getString("jsp.error.usebean.prohibited.as.session",
new Object[] {name});
throw new CompileException (start, m);
}
}
if (clsname != null && beanName != null) {
- String m = Constants.getString("jsp.error.usebean.not.both",
+ String m = containerL.getString("jsp.error.usebean.not.both",
new Object[] {name});
throw new CompileException (start, m);
}
@@ -154,7 +154,7 @@
} else if (scope.equals("application")) {
beanInfo.addApplicationBean(name,clsname);
} else {
- String m = Constants.getString("jsp.error.usebean.invalid.scope",
+ String m = containerL.getString("jsp.error.usebean.invalid.scope",
new Object[] {name, scope});
throw new CompileException (start, m);
}
1.3 +5 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ForwardGenerator.java 2001/06/06 06:17:44 1.2
+++ ForwardGenerator.java 2001/06/12 15:12:56 1.3
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ForwardGenerator.java,v
1.3 2001/06/12 15:12:56 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/06/12 15:12:56 $
*
* ====================================================================
*
@@ -83,12 +83,12 @@
public ForwardGenerator(Mark start, Hashtable attrs, Hashtable param)
throws JasperException {
if (attrs.size() != 1)
- throw new
JasperException(Constants.getString("jsp.error.invalid.forward"));
+ throw new
JasperException(containerL.getString("jsp.error.invalid.forward"));
page = (String) attrs.get("page");
if (page == null)
throw new CompileException(start,
-
Constants.getString("jsp.error.invalid.forward"));
+
containerL.getString("jsp.error.invalid.forward"));
this.params = param;
isExpression = JspUtil.isExpression (page);
1.5 +4 -3
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/GeneratorBase.java
Index: GeneratorBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/GeneratorBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GeneratorBase.java 2001/06/09 21:19:29 1.4
+++ GeneratorBase.java 2001/06/12 15:12:56 1.5
@@ -71,7 +71,8 @@
* @author Costin Manolache
*/
public abstract class GeneratorBase {
- protected JspCompilationContext ctxt;
+ // protected JspCompilationContext ctxt;
+ protected ContainerLiaison containerL;
Mark start, stop;
// protected CommentGenerator commentGenerator;
@@ -209,10 +210,10 @@
}
// void init(JspCompilationContext ctxt) throws JasperException;
- public void init(JspCompilationContext ctxt)
+ public void init(ContainerLiaison containerL)
throws JasperException
{
- this.ctxt = ctxt;
+ this.containerL = containerL;
// generator.init(ctxt);
// will be overriden
}
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IncludeGenerator.java 2001/06/06 06:17:46 1.2
+++ IncludeGenerator.java 2001/06/12 15:12:57 1.3
@@ -84,20 +84,20 @@
page = (String) attrs.get("page");
if (page == null){
throw new CompileException(start,
- Constants.getString("jsp.error.include.tag"));
+ containerL.getString("jsp.error.include.tag"));
}
String flush = (String) attrs.get("flush");
if (flush == null){
throw new CompileException(start,
-
Constants.getString("jsp.error.include.noflush"));
+
containerL.getString("jsp.error.include.noflush"));
}
if (!flush.equals("true")){
throw new CompileException(start,
-
Constants.getString("jsp.error.include.badflush"));
+
containerL.getString("jsp.error.include.badflush"));
}
if (attrs.size() != 2){
throw new CompileException(start,
- Constants.getString("jsp.error.include.tag"));
+ containerL.getString("jsp.error.include.tag"));
}
this.params = param;
1.6 +32 -17
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java
Index: JspParseEventListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JspParseEventListener.java 2001/06/08 04:56:58 1.5
+++ JspParseEventListener.java 2001/06/12 15:12:58 1.6
@@ -90,26 +90,39 @@
*/
public class JspParseEventListener implements ParseEventListener {
- JspCompilationContext ctxt;
+ // JspCompilationContext ctxt;
+ ContainerLiaison containerL;
protected JspReader reader;
protected ServletWriter writer;
JspPageInfo pageInfo;
- PageDirectives pageD=new PageDirectives();
+ PageDirectives pageD;
/*
* Package private since I want everyone to come in through
* org.apache.jasper.compiler.Main.
*/
- public JspParseEventListener(JspCompilationContext ctxt) {
- reader=ctxt.getReader();
- writer=ctxt.getWriter();
- pageInfo=new JspPageInfo(ctxt);
- this.ctxt = ctxt;
+ public JspParseEventListener(ContainerLiaison containerL,
+ JspReader reader, ServletWriter writer,
+ JspPageInfo pageInfo)
+ {
+ this.containerL=containerL;
+ this.reader=reader;
+ this.writer=writer;
+ this.pageInfo=pageInfo;
+ pageD=new PageDirectives(containerL);
+ //reader=ctxt.getReader();
+ //writer=ctxt.getWriter();
+ // pageInfo=new JspPageInfo(containerL, ctxt);
+ // this.ctxt = ctxt;
}
+ public ContainerLiaison getContainerLiaison() {
+ return containerL;
+ }
+
public void setTemplateInfo(Mark start, Mark stop) {
}
@@ -121,14 +134,14 @@
}
public void endPageProcessing() throws JasperException {
- writer.generateServlet(ctxt, pageInfo);
+ writer.generateServlet(pageInfo);
}
// -------------------- Normal event listeners --------------------
public void handleComment(Mark start, Mark stop) throws JasperException {
- Constants.message("jsp.message.htmlcomment",
+ containerL.message("jsp.message.htmlcomment",
new Object[] { reader.getChars(start, stop) },
Log.DEBUG);
}
@@ -137,7 +150,7 @@
Mark stop, Hashtable attrs)
throws JasperException
{
- Constants.message("jsp.message.handling_directive",
+ containerL.message("jsp.message.handling_directive",
new Object[] { directive, attrs },
Log.DEBUG);
@@ -152,7 +165,7 @@
pageInfo.libraries.addTagLibrary( prefix, uri );
} catch (Exception ex) {
Object[] args = new Object[] { uri, ex.getMessage() };
- throw new CompileException(start,
Constants.getString("jsp.error.badtaglib",
+ throw new CompileException(start,
containerL.getString("jsp.error.badtaglib",
args));
}
}
@@ -161,7 +174,7 @@
String file = (String) attrs.get("file");
if (file == null)
throw new CompileException(start,
-
Constants.getString("jsp.error.include.missing.file"));
+
containerL.getString("jsp.error.include.missing.file"));
// jsp.error.include.bad.file needs taking care of here??
@@ -173,7 +186,7 @@
pageInfo.addGenerator( dg );
} catch (FileNotFoundException fnfe) {
throw new CompileException(start,
-
Constants.getString("jsp.error.include.bad.file"));
+
containerL.getString("jsp.error.include.bad.file"));
}
}
}
@@ -248,7 +261,7 @@
Hashtable param, String fallback)
throws JasperException
{
- Constants.message("jsp.message.handling_plugin",
+ containerL.message("jsp.message.handling_plugin",
new Object[] { attrs },
Log.DEBUG);
@@ -283,9 +296,11 @@
public void handleCharData(Mark start, Mark stop, char[] chars) throws
JasperException {
GeneratorBase cdg;
- if (ctxt.getOptions().getLargeFile())
- cdg = new StoredCharDataGenerator(pageInfo.vector, pageInfo.dataFile,
pageInfo.stringId++, chars);
- else if(ctxt.getOptions().getMappedFile())
+ if (pageInfo.getOptions().getLargeFile())
+ cdg = new StoredCharDataGenerator(pageInfo.vector,
+ pageInfo.getDataFile(),
+ pageInfo.stringId++, chars);
+ else if(pageInfo.getOptions().getMappedFile())
cdg = new MappedCharDataGenerator(chars);
else
cdg = new CharDataGenerator(chars);
1.2 +30 -26
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/PageDirectives.java
Index: PageDirectives.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/PageDirectives.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageDirectives.java 2001/06/06 06:08:51 1.1
+++ PageDirectives.java 2001/06/12 15:12:59 1.2
@@ -85,8 +85,12 @@
/**
*/
public class PageDirectives {
- public PageDirectives() {}
+ ContainerLiaison containerL;
+ public PageDirectives(ContainerLiaison containerL) {
+ this.containerL=containerL;
+ }
+
public void handlePageDirective( JspParseEventListener listener,
String directive, Mark start,
Mark stop, Hashtable attrs)
@@ -108,7 +112,7 @@
// Do some validations...
if (listener.pageInfo.bufferSize == 0 && listener.pageInfo.autoFlush ==
false)
- throw new CompileException(start, Constants.getString(
+ throw new CompileException(start, containerL.getString(
"jsp.error.page.bad_b_and_a_combo"));
@@ -169,11 +173,11 @@
{
if (listener.pageInfo.contentTypeDir == true)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.multiple.contenttypes"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.contenttypes"));
listener.pageInfo.contentTypeDir = true;
if (contentType == null)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.invalid.contenttype"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.contenttype"));
listener.pageInfo.servletContentType = contentType;
}
}
@@ -186,11 +190,11 @@
{
if (listener.pageInfo.sessionDir == true)
throw new CompileException (start,
-
Constants.getString("jsp.error.page.multiple.session"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.session"));
listener.pageInfo.sessionDir = true;
if (session == null)
throw new CompileException (start,
-
Constants.getString("jsp.error.page.invalid.session"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.session"));
if (session.equalsIgnoreCase("true"))
listener.pageInfo.genSessionVariable = true;
else if (session.equalsIgnoreCase("false"))
@@ -208,7 +212,7 @@
{
if (listener.pageInfo.bufferDir == true)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.multiple.buffer"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.buffer"));
listener.pageInfo.bufferDir = true;
if (buffer != null) {
if (buffer.equalsIgnoreCase("none"))
@@ -224,7 +228,7 @@
num = buffer.substring(0, ind);
i = new Integer(num);
} catch (NumberFormatException n) {
- throw new CompileException(start, Constants.getString(
+ throw new CompileException(start,
listener.getContainerLiaison().getString(
"jsp.error.page.invalid.buffer"));
}
listener.pageInfo.bufferSize = i.intValue()*1024;
@@ -232,7 +236,7 @@
}
else
throw new CompileException(start,
-
Constants.getString("jsp.error.page.invalid.buffer"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.buffer"));
}
}
@@ -244,12 +248,12 @@
{
if (listener.pageInfo.autoFlushDir == true)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.multiple.autoflush"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.autoflush"));
listener.pageInfo.autoFlushDir = true;
if (autoflush == null)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.invalid.autoflush"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.autoflush"));
if (autoflush.equalsIgnoreCase("true"))
listener.pageInfo.autoFlush = true;
@@ -257,7 +261,7 @@
listener.pageInfo.autoFlush = false;
else
throw new CompileException(start,
-
Constants.getString("jsp.error.page.invalid.autoflush"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.autoflush"));
}
}
@@ -269,12 +273,12 @@
{
if (listener.pageInfo.threadsafeDir == true)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.multiple.threadsafe"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.threadsafe"));
listener.pageInfo.threadsafeDir = true;
if (threadsafe == null)
throw new CompileException (start,
-
Constants.getString("jsp.error.page.invalid.threadsafe"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.threadsafe"));
if (threadsafe.equalsIgnoreCase("true"))
listener.pageInfo.singleThreaded = false;
@@ -282,7 +286,7 @@
listener.pageInfo.singleThreaded = true;
else
throw new CompileException (start,
-
Constants.getString("jsp.error.page.invalid.threadsafe"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.threadsafe"));
}
}
@@ -294,12 +298,12 @@
{
if (listener.pageInfo.infoDir == true)
throw new CompileException (start,
-
Constants.getString("jsp.error.page.multiple.info"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.info"));
listener.pageInfo.infoDir = true;
if (info == null)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.invalid.info"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.info"));
GeneratorBase gen = new InfoGenerator(info);
gen.setMark( start, stop );
@@ -316,20 +320,20 @@
{
if (listener.pageInfo.iserrorpageDir == true)
throw new CompileException (start,
-
Constants.getString("jsp.error.page.multiple.iserrorpage"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.iserrorpage"));
listener.pageInfo.iserrorpageDir = true;
if (iserrorpage == null)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.invalid.iserrorpage"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.iserrorpage"));
if (iserrorpage.equalsIgnoreCase("true"))
- listener.pageInfo.ctxt.setErrorPage(true);
+ listener.pageInfo.setErrorPage(true);
else if (iserrorpage.equalsIgnoreCase("false"))
- listener.pageInfo.ctxt.setErrorPage(false);
+ listener.pageInfo.setErrorPage(false);
else
throw new CompileException(start,
-
Constants.getString("jsp.error.page.invalid.iserrorpage"));
+
listener.getContainerLiaison().getString("jsp.error.page.invalid.iserrorpage"));
}
}
@@ -341,7 +345,7 @@
{
if (listener.pageInfo.errorpageDir == true)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.multiple.errorpage"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.errorpage"));
listener.pageInfo.errorpageDir = true;
if (errorpage != null)
@@ -357,13 +361,13 @@
{
if (listener.pageInfo.languageDir == true)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.multiple.language"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.language"));
listener.pageInfo.languageDir = true;
if (language != null)
if (!language.equalsIgnoreCase("java"))
throw new CompileException(start,
-
Constants.getString("jsp.error.page.nomapping.language")+language);
+
listener.getContainerLiaison().getString("jsp.error.page.nomapping.language")+language);
}
}
@@ -389,7 +393,7 @@
{
if (listener.pageInfo.extendsDir == true)
throw new CompileException(start,
-
Constants.getString("jsp.error.page.multiple.extends"));
+
listener.getContainerLiaison().getString("jsp.error.page.multiple.extends"));
listener.pageInfo.extendsDir = true;
if (extendsClzz != null) {
1.3 +4 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PluginGenerator.java 2001/06/06 06:17:48 1.2
+++ PluginGenerator.java 2001/06/12 15:12:59 1.3
@@ -88,8 +88,8 @@
this.start = start;
}
- public void init(JspCompilationContext ctxt) throws JasperException {
- ieClassId = ctxt.getOptions().getIeClassId();
+ public void init(ContainerLiaison containerL) throws JasperException {
+ ieClassId = containerL.getOptions().getIeClassId();
}
public void generateServiceMethod(ServletWriter writer)
@@ -106,10 +106,10 @@
String iepluginurl = getAttribute ("iepluginurl");
if (type == null)
- throw new CompileException (start, Constants.getString (
+ throw new CompileException (start, containerL.getString (
"jsp.error.plugin.notype"));
if (code == null)
- throw new CompileException (start, Constants.getString (
+ throw new CompileException (start, containerL.getString (
"jsp.error.plugin.nocode"));
writer.popIndent ();
1.6 +8 -6
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ServletWriter.java
Index: ServletWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ServletWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletWriter.java 2001/06/09 21:21:17 1.5
+++ ServletWriter.java 2001/06/12 15:13:00 1.6
@@ -73,17 +73,18 @@
* @author Costin Manolache
*/
public class ServletWriter extends JavaSourceGenerator {
+ ContainerLiaison containerL;
public ServletWriter(PrintWriter writer) {
super( writer );
}
- public void generateServlet(JspCompilationContext ctxt,
- JspPageInfo pageInfo )
+ public void generateServlet(JspPageInfo pageInfo )
throws JasperException
{
+ containerL=pageInfo.getContainerLiaison();
// Do we need that ??
- ctxt.setContentType(pageInfo.servletContentType);
+ //??? ctxt.setContentType(pageInfo.servletContentType);
generateHeader(pageInfo);
@@ -453,9 +454,10 @@
throws JasperException
{
- if (pageInfo.ctxt.getOptions().getLargeFile()) {
+ if (pageInfo.getOptions().getLargeFile()) {
try {
- FileOutputStream fos=new FileOutputStream(pageInfo.dataFile);
+ FileOutputStream fos=
+ new FileOutputStream(pageInfo.getDataFile());
ObjectOutputStream o
= new ObjectOutputStream(fos);
@@ -470,7 +472,7 @@
o.close();
this.close();
} catch (IOException ex) {
- throw new
JasperException(Constants.getString("jsp.error.data.file.write"), ex);
+ throw new
JasperException(containerL.getString("jsp.error.data.file.write"), ex);
}
}
}
1.4 +1 -1
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetPropertyGenerator.java 2001/06/06 06:17:50 1.3
+++ SetPropertyGenerator.java 2001/06/12 15:13:01 1.4
@@ -95,7 +95,7 @@
if (property.equals("*")) {
if (value != null) {
- String m =
Constants.getString("jsp.error.setproperty.invalidSyantx");
+ String m =
containerL.getString("jsp.error.setproperty.invalidSyantx");
throw new CompileException(start, m);
}
1.3 +10 -10
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TagBeginGenerator.java 2001/06/06 06:17:51 1.2
+++ TagBeginGenerator.java 2001/06/12 15:13:02 1.3
@@ -116,17 +116,17 @@
this.libraries = libraries;
}
- public void init(JspCompilationContext ctxt) throws JasperException {
+ public void init(ContainerLiaison containerL) throws JasperException {
validate();
//tc = libraries.getTagInfoImpl(prefix, shortTagName);
if( ti.getTagHandlerClass() == null ) {
- ClassLoader cl = ctxt.getClassLoader();
+ ClassLoader cl = containerL.getClassLoader();
Class clz = null;
try {
clz = cl.loadClass(ti.getTagClassName());
} catch (Exception ex) {
throw new CompileException(start,
- Constants.getString("jsp.error.unable.loadclass",
+ containerL.getString("jsp.error.unable.loadclass",
new Object[] { ti.getTagClassName(),
ex.getMessage() }
));
@@ -145,7 +145,7 @@
for(int i = 0; i < attributes.length; i++)
if (attributes[i].isRequired() && attribs.get(attributes[i].getName())
== null)
throw new CompileException(start,
-
Constants.getString("jsp.error.missing_attribute",
+
containerL.getString("jsp.error.missing_attribute",
new Object[] {
attributes[i].getName(),
shortTagName
@@ -166,7 +166,7 @@
if (!found)
throw new CompileException(start,
-
Constants.getString("jsp.error.bad_attribute",
+
containerL.getString("jsp.error.bad_attribute",
new Object[] {
attr
}
@@ -176,7 +176,7 @@
tagData = new TagData(attribs);
if (!ti.isValid(tagData))
throw new CompileException(start,
-
Constants.getString("jsp.error.invalid_attributes"));
+
containerL.getString("jsp.error.invalid_attributes"));
}
private final void generateSetters(ServletWriter writer, String parent)
@@ -193,7 +193,7 @@
Method m = ti.getSetterMethod(attrName);
if (m == null)
throw new CompileException
- (start, Constants.getString
+ (start, containerL.getString
("jsp.error.unable.to_find_method",
new Object[] { attrName }));
Class c[] = m.getParameterTypes();
@@ -231,7 +231,7 @@
// this trick avoids escaping issues
return "((char) " + (int) ch + ")";
} else {
- throw new NumberFormatException(Constants.getString(
+ throw new NumberFormatException(containerL.getString(
"jsp.error.bad_string_char",
new Object[0]));
}
@@ -242,7 +242,7 @@
// this trick avoids escaping issues
return "new Character((char) " + (int) ch + ")";
} else {
- throw new NumberFormatException(Constants.getString(
+ throw new NumberFormatException(containerL.getString(
"jsp.error.bad_string_Character",
new Object[0]));
}
@@ -264,7 +264,7 @@
return "new Long(" + Long.valueOf(s).toString() + "l)";
} else {
throw new CompileException
- (start, Constants.getString
+ (start, containerL.getString
("jsp.error.unable.to_convert_string",
new Object[] { c.getName(), attrName }));
}
