Author: markt
Date: Wed Nov 26 16:08:32 2008
New Revision: 721041
URL: http://svn.apache.org/viewvc?rev=721041&view=rev
Log:
Generics fixes require change in code generated for JSPs
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=721041&r1=721040&r2=721041&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed Nov 26
16:08:32 2008
@@ -485,14 +485,14 @@
out.println();
// Static data for getDependants()
- out.printil("private static java.util.List _jspx_dependants;");
+ out.printil("private static java.util.List<String> _jspx_dependants;");
out.println();
List<String> dependants = pageInfo.getDependants();
Iterator<String> iter = dependants.iterator();
if (!dependants.isEmpty()) {
out.printil("static {");
out.pushIndent();
- out.printin("_jspx_dependants = new java.util.ArrayList(");
+ out.printin("_jspx_dependants = new java.util.ArrayList<String>(");
out.print("" + dependants.size());
out.println(");");
while (iter.hasNext()) {
@@ -537,7 +537,7 @@
*/
private void genPreambleMethods() throws JasperException {
// Method used to get compile time file dependencies
- out.printil("public Object getDependants() {");
+ out.printil("public java.util.List<String> getDependants() {");
out.pushIndent();
out.printil("return _jspx_dependants;");
out.popIndent();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
