remm 2005/04/05 16:14:43 Modified: jasper2/src/share/org/apache/jasper/compiler DefaultErrorHandler.java TagFileProcessor.java Generator.java jasper2/src/share/org/apache/jasper/runtime JspSourceDependent.java jasper2/src/share/org/apache/jasper EmbeddedServletOptions.java jasper2/src/share/org/apache/jasper/servlet JspServletWrapper.java Log: - Use ArrayList instead of Vector. - Add ugly hack until I find the cause of the issue with JDT and the source dependent interface. Functionally, the hack on the type obviously does not change anything. Revision Changes Path 1.13 +22 -23 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java Index: DefaultErrorHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- DefaultErrorHandler.java 25 May 2004 21:27:55 -0000 1.12 +++ DefaultErrorHandler.java 5 Apr 2005 23:14:43 -0000 1.13 @@ -24,7 +24,7 @@ * @author Jan Luehe */ class DefaultErrorHandler implements ErrorHandler { - + /* * Processes the given JSP parse error. * @@ -35,11 +35,11 @@ * @param exception Parse exception */ public void jspError(String fname, int line, int column, String errMsg, - Exception ex) throws JasperException { - throw new JasperException(fname + "(" + line + "," + column + ")" - + " " + errMsg, ex); + Exception ex) throws JasperException { + throw new JasperException(fname + "(" + line + "," + column + ")" + + " " + errMsg, ex); } - + /* * Processes the given JSP parse error. * @@ -47,9 +47,9 @@ * @param exception Parse exception */ public void jspError(String errMsg, Exception ex) throws JasperException { - throw new JasperException(errMsg, ex); + throw new JasperException(errMsg, ex); } - + /* * Processes the given javac compilation errors. * @@ -57,34 +57,33 @@ * compilation errors */ public void javacError(JavacErrorDetail[] details) throws JasperException { - + if (details == null) { return; } - - Object[] args = null; + + Object[] args = null; StringBuffer buf = new StringBuffer(); - + for (int i=0; i < details.length; i++) { if (details[i].getJspBeginLineNumber() >= 0) { args = new Object[] { new Integer(details[i].getJspBeginLineNumber()), details[i].getJspFileName() }; buf.append(Localizer.getMessage("jsp.error.single.line.number", - args)); + args)); buf.append("\n"); } - + buf.append( - Localizer.getMessage("jsp.error.corresponding.servlet")); + Localizer.getMessage("jsp.error.corresponding.servlet")); buf.append(details[i].getErrorMessage()); buf.append("\n\n"); } - - throw new JasperException( - Localizer.getMessage("jsp.error.unable.compile") + "\n\n" + buf); + + throw new JasperException(Localizer.getMessage("jsp.error.unable.compile") + "\n\n" + buf); } - + /** * Processes the given javac error report and exception. * @@ -92,10 +91,10 @@ * @param exception Compilation exception */ public void javacError(String errorReport, Exception exception) - throws JasperException { - - throw new JasperException( - Localizer.getMessage("jsp.error.unable.compile"), exception); + throws JasperException { + + throw new JasperException( + Localizer.getMessage("jsp.error.unable.compile"), exception); } - + } 1.60 +2 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java Index: TagFileProcessor.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- TagFileProcessor.java 12 May 2004 23:59:19 -0000 1.59 +++ TagFileProcessor.java 5 Apr 2005 23:14:43 -0000 1.60 @@ -21,6 +21,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Iterator; +import java.util.List; import java.util.Vector; import java.util.HashMap; @@ -524,7 +525,7 @@ Object tagIns = tagClazz.newInstance(); if (tagIns instanceof JspSourceDependent) { Iterator iter = - ((JspSourceDependent)tagIns).getDependants().iterator(); + ((List) ((JspSourceDependent) tagIns).getDependants()).iterator(); while (iter.hasNext()) { parentPageInfo.addDependant((String)iter.next()); } 1.240 +3 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java Index: Generator.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- Generator.java 8 Feb 2005 18:03:58 -0000 1.239 +++ Generator.java 5 Apr 2005 23:14:43 -0000 1.240 @@ -428,14 +428,14 @@ */ private void genPreambleStaticInitializers() throws JasperException { // Static data for getDependants() - out.printil("private static java.util.Vector _jspx_dependants;"); + out.printil("private static java.util.List _jspx_dependants;"); out.println(); List dependants = pageInfo.getDependants(); Iterator iter = dependants.iterator(); if (!dependants.isEmpty()) { out.printil("static {"); out.pushIndent(); - out.printin("_jspx_dependants = new java.util.Vector("); + out.printin("_jspx_dependants = new java.util.ArrayList("); out.print("" + dependants.size()); out.println(");"); while (iter.hasNext()) { @@ -473,7 +473,7 @@ */ private void genPreambleMethods() throws JasperException { // Method used to get compile time file dependencies - out.printil("public java.util.List getDependants() {"); + out.printil("public Object getDependants() {"); out.pushIndent(); out.printil("return _jspx_dependants;"); out.popIndent(); 1.4 +3 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspSourceDependent.java Index: JspSourceDependent.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspSourceDependent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JspSourceDependent.java 17 Mar 2004 19:23:04 -0000 1.3 +++ JspSourceDependent.java 5 Apr 2005 23:14:43 -0000 1.4 @@ -31,6 +31,8 @@ * Returns a list of files names that the current page has a source * dependency on. */ - public java.util.List getDependants(); + // FIXME: Type used is Object due to very weird behavior + // with Eclipse JDT 3.1 in Java 5 mode + public Object getDependants(); } 1.23 +1 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java Index: EmbeddedServletOptions.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- EmbeddedServletOptions.java 4 Apr 2005 13:57:49 -0000 1.22 +++ EmbeddedServletOptions.java 5 Apr 2005 23:14:43 -0000 1.23 @@ -356,7 +356,7 @@ // JVM version numbers try { - if (Float.parseFloat(System.getProperty("java.specification.version")) >= 1.4) { + if (Float.parseFloat(System.getProperty("java.specification.version")) > 1.4) { compilerSourceVM = compilerTargetVM = "1.5"; } else { compilerSourceVM = compilerTargetVM = "1.4"; 1.41 +1 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java Index: JspServletWrapper.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- JspServletWrapper.java 23 Mar 2005 16:38:05 -0000 1.40 +++ JspServletWrapper.java 5 Apr 2005 23:14:43 -0000 1.41 @@ -246,7 +246,7 @@ target = getServlet(); } if (target != null && target instanceof JspSourceDependent) { - return ((JspSourceDependent) target).getDependants(); + return ((java.util.List) ((JspSourceDependent) target).getDependants()); } } catch (Throwable ex) { }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]