larryi 01/05/15 11:53:52 Modified: src/share/org/apache/jasper/compiler JikesJavaCompiler.java JspParseEventListener.java Log: Update to avoid JDK1.1 compile errors. Revision Changes Path 1.9 +6 -11 jakarta-tomcat/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java Index: JikesJavaCompiler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- JikesJavaCompiler.java 2001/03/25 13:33:45 1.8 +++ JikesJavaCompiler.java 2001/05/15 18:53:33 1.9 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v 1.8 2001/03/25 13:33:45 nacho Exp $ - * $Revision: 1.8 $ - * $Date: 2001/03/25 13:33:45 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v 1.9 2001/05/15 18:53:33 larryi Exp $ + * $Revision: 1.9 $ + * $Date: 2001/05/15 18:53:33 $ * * ==================================================================== * @@ -77,14 +77,9 @@ static final int OUTPUT_BUFFER_SIZE = 1024; static final int BUFFER_SIZE = 512; - static final String q; - static { - if( System.getProperty("file.separator").equals("\\") ){ - q="\""; - } else { - q=""; - } - } + static final String q = + "\\".equals(System.getProperty("file.separator")) ? "\"" : ""; + /* * Contains extra classpath for Jikes use from Microsoft systems: * Microsoft does not report it's internal classpath in 1.29 +1 -1 jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java Index: JspParseEventListener.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- JspParseEventListener.java 2001/04/28 21:13:36 1.28 +++ JspParseEventListener.java 2001/05/15 18:53:37 1.29 @@ -938,7 +938,7 @@ // if we haven't added a tag pool generator for this tag, then add one String tagPoolVarName = TagPoolGenerator.getPoolName(tli, ti, attrs); if (! tagPools.contains(tagPoolVarName)) { - tagPools.add(tagPoolVarName); + tagPools.addElement(tagPoolVarName); TagPoolGenerator tpg = new TagPoolGenerator(prefix, shortTagName, attrs, tli, ti); gen = new GeneratorWrapper(tpg, start, stop); addGenerator(gen);