costin 01/06/09 14:23:32
Modified: jasper34/generator/org/apache/jasper34/core Options.java
jasper34/generator/org/apache/jasper34/generator
CharDataGenerator.java ExpressionGenerator.java
StoredCharDataGenerator.java
jasper34/generator/org/apache/jasper34/javagen
JavaSourceGenerator.java
jasper34/generator/org/apache/jasper34/jsptree
JspPageInfo.java
Log:
Various changes to support the line mapping.
Javagen adds a getter for the line number.
Various generators fixed to not include \n in the generated code
( that could be also fixed by treating all println as printMultiLn, but
it's better to have generators respect the conventions.
( we have a stack trace each time we detect a generator including \n, for
debugging - it'll be removed after we fix everything )
Revision Changes Path
1.3 +4 -0
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/Options.java
Index: Options.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/Options.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Options.java 2001/06/06 06:27:39 1.2
+++ Options.java 2001/06/09 21:23:31 1.3
@@ -137,4 +137,8 @@
* page servlet.
*/
public String getJavaEncoding();
+
+ /** Generate comment-style line number mappings
+ */
+ public boolean getGenerateCommentMapping();
}
1.3 +4 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CharDataGenerator.java 2001/06/06 06:17:42 1.2
+++ CharDataGenerator.java 2001/06/09 21:23:31 1.3
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
1.3 2001/06/09 21:23:31 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/06/09 21:23:31 $
*
* ====================================================================
*
@@ -127,7 +127,7 @@
}
}
writer.print(sb.toString());
- writer.print("\");\n");
+ writer.println("\");");
}
1.3 +5 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExpressionGenerator.java 2001/06/06 06:17:44 1.2
+++ ExpressionGenerator.java 2001/06/09 21:23:31 1.3
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ExpressionGenerator.java,v
1.3 2001/06/09 21:23:31 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/06/09 21:23:31 $
*
* ====================================================================
*
@@ -78,7 +78,8 @@
}
public void generateServiceMethod(ServletWriter writer) {
- writer.println("out.print("+new String(JspUtil.removeQuotes(chars))+");");
+ writer.printMultiLn("out.print("+
+ new String(JspUtil.removeQuotes(chars))+");");
}
}
1.3 +6 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StoredCharDataGenerator.java 2001/06/06 06:17:51 1.2
+++ StoredCharDataGenerator.java 2001/06/09 21:23:31 1.3
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/StoredCharDataGenerator.java,v
1.3 2001/06/09 21:23:31 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/06/09 21:23:31 $
*
* ====================================================================
*
@@ -63,6 +63,7 @@
import java.util.Vector;
import org.apache.jasper34.runtime.JasperException;
import org.apache.jasper34.parser.*;
+import org.apache.jasper34.core.Constants;
import org.apache.jasper34.jsptree.*;
/**
* StoredCharDataGenerator generates HTML and other data present in
@@ -109,7 +110,8 @@
writer.popIndent();
writer.println("} catch (Exception ex) {");
writer.pushIndent();
- writer.println("throw new org.apache.jasper.JasperException(\"Unable to
open data file\");");
+ writer.println("throw new " +
+ Constants.JSP_RUNTIME_PACKAGE + ".JasperException(\"Unable
to open data file\");");
writer.popIndent();
writer.println("} finally {");
writer.pushIndent();
1.2 +21 -1
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/javagen/JavaSourceGenerator.java
Index: JavaSourceGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/javagen/JavaSourceGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaSourceGenerator.java 2001/06/06 05:48:37 1.1
+++ JavaSourceGenerator.java 2001/06/09 21:23:31 1.2
@@ -79,10 +79,11 @@
// Current indent level:
protected int indent = 0;
+ // line numbers start from 1, but we pre-increment
protected int javaLine=0;
// The sink writer:
- protected PrintWriter writer;
+ private PrintWriter writer;
public JavaSourceGenerator(PrintWriter writer) {
this.writer = writer;
@@ -99,7 +100,12 @@
}
+ // -------------------- Access informations --------------------
+ public int getJavaLine() {
+ return javaLine;
+ }
+
// -------------------- Prepare generator --------------------
// File components
@@ -238,11 +244,21 @@
*/
public void println(String line) {
javaLine++;
+ if( line.indexOf( '\n' ) >= 0 ) {
+ System.out.println("Warning, wrong line " + line );
+ /*DEBUG*/ try {throw new Exception(); } catch(Exception ex)
{ex.printStackTrace();}
+ }
writer.println(SPACES.substring(0, indent)+line);
}
+ /** Println with no indentation
+ */
public void printlnNI(String line) {
javaLine++;
+ if( line.indexOf( '\n' ) >= 0 ) {
+ System.out.println("Warning, wrong line " + line );
+ /*DEBUG*/ try {throw new Exception(); } catch(Exception ex)
{ex.printStackTrace();}
+ }
writer.println(line);
}
@@ -259,6 +275,10 @@
public void print(String s) {
+ if( s.indexOf( '\n' ) >= 0 ) {
+ System.out.println("Warning, wrong line " + s );
+ /*DEBUG*/ try {throw new Exception(); } catch(Exception ex)
{ex.printStackTrace();}
+ }
writer.print(s);
}
1.3 +9 -0
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/jsptree/JspPageInfo.java
Index: JspPageInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/jsptree/JspPageInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspPageInfo.java 2001/06/07 06:59:05 1.2
+++ JspPageInfo.java 2001/06/09 21:23:32 1.3
@@ -148,6 +148,15 @@
ctxt.getServletClassName() + ".dat";
}
+ // -------------------- Getters --------------------
+ // XXX remove all public fields.
+
+ public Options getOptions() {
+ return ctxt.getOptions();
+ }
+
+ // -------------------- Setters --------------------
+
public final void addGenerator(GeneratorBase gen) throws JasperException {
gen.init(ctxt);
generators.addElement(gen);