Author: markt Date: Mon Feb 20 10:03:47 2006 New Revision: 379188 URL: http://svn.apache.org/viewcvs?rev=379188&view=rev Log: enum -> enumeration to allow building on Java 5.0 generally and Gump in particular without having to set source compatibility to 1.4 or lower.
Modified: tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/EmbededServletOptions.java tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/Validator.java Modified: tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/EmbededServletOptions.java URL: http://svn.apache.org/viewcvs/tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/EmbededServletOptions.java?rev=379188&r1=379187&r2=379188&view=diff ============================================================================== --- tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/EmbededServletOptions.java (original) +++ tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/EmbededServletOptions.java Mon Feb 20 10:03:47 2006 @@ -237,9 +237,9 @@ public EmbededServletOptions(ServletConfig config, ServletContext context) { - Enumeration enum=config.getInitParameterNames(); - while( enum.hasMoreElements() ) { - String k=(String)enum.nextElement(); + Enumeration enumeration=config.getInitParameterNames(); + while( enumeration.hasMoreElements() ) { + String k=(String)enumeration.nextElement(); String v=config.getInitParameter( k ); setProperty( k, v); Modified: tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/Validator.java URL: http://svn.apache.org/viewcvs/tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/Validator.java?rev=379188&r1=379187&r2=379188&view=diff ============================================================================== --- tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/Validator.java (original) +++ tomcat/jasper/branches/tc4.1.x/src/share/org/apache/jasper/compiler/Validator.java Mon Feb 20 10:03:47 2006 @@ -589,9 +589,10 @@ StringBuffer errMsg = null; ErrorDispatcher errDisp = compiler.getErrorDispatcher(); - Enumeration enum = compiler.getPageInfo().getTagLibraries().elements(); - while (enum.hasMoreElements()) { - TagLibraryInfo tli = (TagLibraryInfo) enum.nextElement(); + Enumeration enumeration = + compiler.getPageInfo().getTagLibraries().elements(); + while (enumeration.hasMoreElements()) { + TagLibraryInfo tli = (TagLibraryInfo) enumeration.nextElement(); ValidationMessage[] errors = ((TagLibraryInfoImpl) tli).validate(xmlView); if ((errors != null) && (errors.length != 0)) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]