horwat 2004/08/16 14:38:29
Modified: standard build_sample_standard.properties
standard/examples/src/org/apache/taglibs/standard/examples/startup
Init.java
standard/examples/src/org/apache/taglibs/standard/examples/taglib
Functions.java
standard/examples/web/format Demo.jsp
standard/src/org/apache/taglibs/standard/extra/spath
SPathParser.java
standard/src/org/apache/taglibs/standard/functions
Functions.java
standard/src/org/apache/taglibs/standard/lang/jstl
ImplicitObjects.java
standard/src/org/apache/taglibs/standard/lang/jstl/parser
ELParser.java
standard/src/org/apache/taglibs/standard/tag/common/fmt
BundleSupport.java SetLocaleSupport.java
standard/src/org/apache/taglibs/standard/tag/common/xml
XPathUtil.java
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=30646
"enum" is a keyword under J2SE 5.0. JSTL 1.1.1 will now compile under 5.0. Note that
you will need to specify the JAXP 1.2 classes since J2SE 5.0 uses JAXP 1.3.
Revision Changes Path
1.3 +2 -0 jakarta-taglibs/standard/build_sample_standard.properties
Index: build_sample_standard.properties
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/build_sample_standard.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build_sample_standard.properties 7 Jun 2004 21:09:41 -0000 1.2
+++ build_sample_standard.properties 16 Aug 2004 21:38:27 -0000 1.3
@@ -23,6 +23,7 @@
# JAXP 1.2
# {No need to specify if using J2SE 1.4.2 or higher)
+# {NOTE: J2SE 5.0 uses JAXP 1.3 so you will need to specify}
#jaxp-api.jar=
#dom.jar=
@@ -31,6 +32,7 @@
# Xalan
# {No need to specify if using J2SE 1.4.2 or higher)
+# {NOTE: J2SE 5.0 uses JAXP 1.3 so you will need to specify}
#xalan.jar=
1.4 +3 -3
jakarta-taglibs/standard/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
Index: Init.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/examples/src/org/apache/taglibs/standard/examples/startup/Init.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Init.java 28 Feb 2004 01:01:41 -0000 1.3
+++ Init.java 16 Aug 2004 21:38:27 -0000 1.4
@@ -122,10 +122,10 @@
/**
* Enumeration
*/
- Enumeration enum = numberMap.keys();
+ Enumeration enum_ = numberMap.keys();
// don't use 'enum' for attribute name because it is a
// reserved word in EcmaScript.
- sce.getServletContext().setAttribute("enumeration", enum);
+ sce.getServletContext().setAttribute("enumeration", enum_);
/**
* Message arguments for parametric replacement
1.4 +3 -3
jakarta-taglibs/standard/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java
Index: Functions.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Functions.java 28 Feb 2004 01:01:41 -0000 1.3
+++ Functions.java 16 Aug 2004 21:38:27 -0000 1.4
@@ -49,9 +49,9 @@
return "FIXME";
}
if (obj instanceof Enumeration) {
- Enumeration enum = (Enumeration)obj;
- while (enum.hasMoreElements()) {
- enum.nextElement();
+ Enumeration enum_ = (Enumeration)obj;
+ while (enum_.hasMoreElements()) {
+ enum_.nextElement();
}
return "FIXME";
}
1.3 +3 -3 jakarta-taglibs/standard/examples/web/format/Demo.jsp
Index: Demo.jsp
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/Demo.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Demo.jsp 26 Apr 2003 01:15:28 -0000 1.2
+++ Demo.jsp 16 Aug 2004 21:38:28 -0000 1.3
@@ -56,9 +56,9 @@
Browser-Based locales:
<%
- Enumeration enum = request.getLocales();
- while (enum.hasMoreElements()) {
- Locale locale = (Locale)enum.nextElement();
+ Enumeration enum_ = request.getLocales();
+ while (enum_.hasMoreElements()) {
+ Locale locale = (Locale)enum_.nextElement();
out.print(locale);
out.print(" ");
}
1.5 +2 -2
jakarta-taglibs/standard/src/org/apache/taglibs/standard/extra/spath/SPathParser.java
Index: SPathParser.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/extra/spath/SPathParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SPathParser.java 21 Jan 2004 01:01:02 -0000 1.4
+++ SPathParser.java 16 Aug 2004 21:38:28 -0000 1.5
@@ -437,8 +437,8 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements();
enum.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement());
+ for (java.util.Enumeration enum_ = jj_expentries.elements();
enum_.hasMoreElements();) {
+ int[] oldentry = (int[])(enum_.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
1.9 +4 -4
jakarta-taglibs/standard/src/org/apache/taglibs/standard/functions/Functions.java
Index: Functions.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/functions/Functions.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Functions.java 11 Jun 2004 01:47:42 -0000 1.8
+++ Functions.java 16 Aug 2004 21:38:28 -0000 1.9
@@ -204,11 +204,11 @@
return count;
}
if (obj instanceof Enumeration) {
- Enumeration enum = (Enumeration)obj;
+ Enumeration enum_ = (Enumeration)obj;
count = 0;
- while (enum.hasMoreElements()) {
+ while (enum_.hasMoreElements()) {
count++;
- enum.nextElement();
+ enum_.nextElement();
}
return count;
}
@@ -231,4 +231,4 @@
return buf.toString();
}
-}
\ No newline at end of file
+}
1.9 +4 -4
jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
Index: ImplicitObjects.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ImplicitObjects.java 28 Feb 2004 01:01:42 -0000 1.8
+++ ImplicitObjects.java 16 Aug 2004 21:38:28 -0000 1.9
@@ -980,13 +980,13 @@
List l = new ArrayList ();
- Enumeration enum = request.getHeaders ((String) pKey);
+ Enumeration enum_ = request.getHeaders ((String) pKey);
- if (enum != null) {
+ if (enum_ != null) {
- while (enum.hasMoreElements ()) {
+ while (enum_.hasMoreElements ()) {
- l.add (enum.nextElement ());
+ l.add (enum_.nextElement ());
}
1.13 +2 -2
jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
Index: ELParser.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ELParser.java 27 Feb 2004 02:54:39 -0000 1.12
+++ ELParser.java 16 Aug 2004 21:38:28 -0000 1.13
@@ -1104,8 +1104,8 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements();
enum.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement());
+ for (java.util.Enumeration enum_ = jj_expentries.elements();
enum_.hasMoreElements();) {
+ int[] oldentry = (int[])(enum_.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
1.35 +3 -3
jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
Index: BundleSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- BundleSupport.java 28 Feb 2004 01:01:44 -0000 1.34
+++ BundleSupport.java 16 Aug 2004 21:38:29 -0000 1.35
@@ -246,9 +246,9 @@
// Determine locale from client's browser settings.
- for (Enumeration enum =
Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
- enum.hasMoreElements(); ) {
- Locale pref = (Locale) enum.nextElement();
+ for (Enumeration enum_ =
Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
+ enum_.hasMoreElements(); ) {
+ Locale pref = (Locale) enum_.nextElement();
ResourceBundle match = findMatch(basename, pref);
if (match != null) {
locCtxt = new LocalizationContext(match, pref);
1.18 +3 -3
jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
Index: SetLocaleSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SetLocaleSupport.java 28 Feb 2004 01:01:45 -0000 1.17
+++ SetLocaleSupport.java 16 Aug 2004 21:38:29 -0000 1.18
@@ -401,9 +401,9 @@
private static Locale findFormattingMatch(PageContext pageContext,
Locale[] avail) {
Locale match = null;
- for (Enumeration enum =
Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
- enum.hasMoreElements(); ) {
- Locale locale = (Locale)enum.nextElement();
+ for (Enumeration enum_ =
Util.getRequestLocales((HttpServletRequest)pageContext.getRequest());
+ enum_.hasMoreElements(); ) {
+ Locale locale = (Locale)enum_.nextElement();
match = findFormattingMatch(locale, avail);
if (match != null) {
break;
1.18 +21 -21
jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
Index: XPathUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XPathUtil.java 10 Mar 2004 03:44:13 -0000 1.17
+++ XPathUtil.java 16 Aug 2004 21:38:29 -0000 1.18
@@ -74,10 +74,10 @@
globalVarSize = 0;
Vector variableVector = new Vector ( );
// Now construct attributes in different scopes
- Enumeration enum = pageContext.getAttributeNamesInScope(
+ Enumeration enum_ = pageContext.getAttributeNamesInScope(
PageContext.PAGE_SCOPE );
- while ( enum.hasMoreElements() ) {
- String varName = (String)enum.nextElement();
+ while ( enum_.hasMoreElements() ) {
+ String varName = (String)enum_.nextElement();
QName varQName = new QName ( PAGE_NS_URL, PAGE_P, varName);
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
@@ -86,10 +86,10 @@
variableVector.addElement( new QName(null, varName ) );
globalVarSize++;
}
- enum = pageContext.getAttributeNamesInScope(
+ enum_ = pageContext.getAttributeNamesInScope(
PageContext.REQUEST_SCOPE );
- while ( enum.hasMoreElements() ) {
- String varName = (String)enum.nextElement();
+ while ( enum_.hasMoreElements() ) {
+ String varName = (String)enum_.nextElement();
QName varQName = new QName ( REQUEST_NS_URL,REQUEST_P, varName);
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
@@ -97,10 +97,10 @@
variableVector.addElement( new QName(null, varName ) );
globalVarSize++;
}
- enum = pageContext.getAttributeNamesInScope(
+ enum_ = pageContext.getAttributeNamesInScope(
PageContext.SESSION_SCOPE );
- while ( enum.hasMoreElements() ) {
- String varName = (String)enum.nextElement();
+ while ( enum_.hasMoreElements() ) {
+ String varName = (String)enum_.nextElement();
QName varQName = new QName ( SESSION_NS_URL, SESSION_P,varName);
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
@@ -108,10 +108,10 @@
variableVector.addElement( new QName(null, varName ) );
globalVarSize++;
}
- enum = pageContext.getAttributeNamesInScope(
+ enum_ = pageContext.getAttributeNamesInScope(
PageContext.APPLICATION_SCOPE );
- while ( enum.hasMoreElements() ) {
- String varName = (String)enum.nextElement();
+ while ( enum_.hasMoreElements() ) {
+ String varName = (String)enum_.nextElement();
QName varQName = new QName ( APP_NS_URL, APP_P,varName );
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
@@ -119,25 +119,25 @@
variableVector.addElement( new QName(null, varName ) );
globalVarSize++;
}
- enum = pageContext.getRequest().getParameterNames();
- while ( enum.hasMoreElements() ) {
- String varName = (String)enum.nextElement();
+ enum_ = pageContext.getRequest().getParameterNames();
+ while ( enum_.hasMoreElements() ) {
+ String varName = (String)enum_.nextElement();
QName varQName = new QName ( PARAM_NS_URL, PARAM_P,varName );
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
globalVarSize++;
}
- enum = pageContext.getServletContext().getInitParameterNames();
- while ( enum.hasMoreElements() ) {
- String varName = (String)enum.nextElement();
+ enum_ = pageContext.getServletContext().getInitParameterNames();
+ while ( enum_.hasMoreElements() ) {
+ String varName = (String)enum_.nextElement();
QName varQName = new QName ( INITPARAM_NS_URL, INITPARAM_P,varName );
//Adding both namespace qualified QName and just localName
variableVector.addElement( varQName );
globalVarSize++;
}
- enum = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames();
- while ( enum.hasMoreElements() ) {
- String varName = (String)enum.nextElement();
+ enum_ = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames();
+ while ( enum_.hasMoreElements() ) {
+ String varName = (String)enum_.nextElement();
QName varQName = new QName ( HEADER_NS_URL, HEADER_P,varName );
//Adding namespace qualified QName
variableVector.addElement( varQName );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
