markt 2004/05/05 14:51:03
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Compiler.java
Log:
Replace tabs with spaces prior to making other changes.
Revision Changes Path
No revision
No revision
1.18.2.15 +30 -30
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.18.2.14
retrieving revision 1.18.2.15
diff -u -r1.18.2.14 -r1.18.2.15
--- Compiler.java 5 Feb 2004 22:19:07 -0000 1.18.2.14
+++ Compiler.java 5 May 2004 21:51:03 -0000 1.18.2.15
@@ -155,7 +155,7 @@
logger.setMessageOutputLevel( Project.MSG_INFO );
}
project.addBuildListener( logger );
- if (System.getProperty("catalina.home") != null) {
+ if (System.getProperty("catalina.home") != null) {
project.setBasedir( System.getProperty("catalina.home"));
}
@@ -197,43 +197,43 @@
public void generateJava()
throws FileNotFoundException, JasperException, Exception
{
- // Setup page info area
- pageInfo = new PageInfo(new BeanRepository(ctxt.getClassLoader()));
+ // Setup page info area
+ pageInfo = new PageInfo(new BeanRepository(ctxt.getClassLoader()));
String javaFileName = ctxt.getServletJavaFileName();
// Setup the ServletWriter
String javaEncoding = ctxt.getOptions().getJavaEncoding();
- OutputStreamWriter osw = null;
- try {
- osw = new OutputStreamWriter(new FileOutputStream(javaFileName),
- javaEncoding);
- } catch (UnsupportedEncodingException ex) {
- errDispatcher.jspError("jsp.error.needAlternateJavaEncoding",
javaEncoding);
- }
+ OutputStreamWriter osw = null;
+ try {
+ osw = new OutputStreamWriter(new FileOutputStream(javaFileName),
+ javaEncoding);
+ } catch (UnsupportedEncodingException ex) {
+ errDispatcher.jspError("jsp.error.needAlternateJavaEncoding",
javaEncoding);
+ }
- ServletWriter writer = new ServletWriter(new PrintWriter(osw));
+ ServletWriter writer = new ServletWriter(new PrintWriter(osw));
ctxt.setWriter(writer);
- // Parse the file
- ParserController parserCtl = new ParserController(ctxt, this);
- pageNodes = parserCtl.parse(ctxt.getJspFile());
+ // Parse the file
+ ParserController parserCtl = new ParserController(ctxt, this);
+ pageNodes = parserCtl.parse(ctxt.getJspFile());
- // Validate and process attributes
- Validator.validate(this, pageNodes);
+ // Validate and process attributes
+ Validator.validate(this, pageNodes);
- // Dump out the page (for debugging)
- // Dumper.dump(pageNodes);
+ // Dump out the page (for debugging)
+ // Dumper.dump(pageNodes);
- // Collect page info
- Collector.collect(this, pageNodes);
+ // Collect page info
+ Collector.collect(this, pageNodes);
- // Determine which custom tag needs to declare which scripting vars
- ScriptingVariabler.set(pageNodes);
+ // Determine which custom tag needs to declare which scripting vars
+ ScriptingVariabler.set(pageNodes);
- // generate servlet .java file
- Generator.generate(writer, this, pageNodes);
+ // generate servlet .java file
+ Generator.generate(writer, this, pageNodes);
writer.close();
// The writer is only used during the compile, dereference
// it in the JspCompilationContext when done to allow it
@@ -481,7 +481,7 @@
* Gets the error dispatcher.
*/
public ErrorDispatcher getErrorDispatcher() {
- return errDispatcher;
+ return errDispatcher;
}
@@ -489,12 +489,12 @@
* Gets the info about the page under compilation
*/
public PageInfo getPageInfo() {
- return pageInfo;
+ return pageInfo;
}
public JspCompilationContext getCompilationContext() {
- return ctxt;
+ return ctxt;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
