Author: cziegeler
Date: Thu Mar 10 08:57:14 2005
New Revision: 156962
URL: http://svn.apache.org/viewcvs?view=rev&rev=156962
Log:
Enum is a keyword starting with jdk 5.0 :(
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/EnumerationFactory.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java?view=diff&r1=156961&r2=156962
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java
Thu Mar 10 08:57:14 2005
@@ -32,7 +32,7 @@
* "input-module" holds InputModule to obtain the string from.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Id: DateMetaInputModule.java,v 1.4 2004/03/05 13:02:48
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class DateMetaInputModule extends AbstractMetaModule implements
ThreadSafe {
@@ -133,10 +133,10 @@
// done reading configuration
// setup modules and read values
- Iterator enum = getNames(objectModel,
- this.input, this.defaultInput, inputConfig,
- null, inputName, mConf);
- return enum;
+ Iterator enumeration = getNames(objectModel,
+ this.input, this.defaultInput, inputConfig,
+ null, inputName, mConf);
+ return enumeration;
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java?view=diff&r1=156961&r2=156962
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
Thu Mar 10 08:57:14 2005
@@ -21,13 +21,15 @@
/**
* Wraps an Enumeration and provides Iterator interface.
*
- * @version CVS $Id: IteratorHelper.java,v 1.4 2004/03/05 13:02:48 bdelacretaz
Exp $
+ * @version CVS $Id$
*/
class IteratorHelper implements Iterator {
- Enumeration enum = null;
- public IteratorHelper( Enumeration e ) { this.enum = e; }
- public boolean hasNext() { return this.enum.hasMoreElements(); }
- public Object next() { return this.enum.nextElement(); }
+
+ protected Enumeration enumeration;
+
+ public IteratorHelper( Enumeration e ) { this.enumeration = e; }
+ public boolean hasNext() { return this.enumeration.hasMoreElements(); }
+ public Object next() { return this.enumeration.nextElement(); }
/** ignored */
public void remove() {}
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java?view=diff&r1=156961&r2=156962
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
Thu Mar 10 08:57:14 2005
@@ -506,10 +506,10 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements();
- enum.hasMoreElements();
+ for (java.util.Enumeration enumeration = jj_expentries.elements();
+ enumeration.hasMoreElements();
) {
- int[] oldentry = (int[]) (enum.nextElement());
+ int[] oldentry = (int[]) (enumeration.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/EnumerationFactory.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/EnumerationFactory.java?view=diff&r1=156961&r2=156962
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/EnumerationFactory.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/EnumerationFactory.java
Thu Mar 10 08:57:14 2005
@@ -136,22 +136,22 @@
/**
* Order relations Object.op (OtherObject) representing the relation
* Object op OtherObject.
- * @param enum the right operand
+ * @param e the right operand
*/
- public boolean lt(EnumerationFactory enum) { // "<"
- return this.getPos() < enum.getPos ();
+ public boolean lt(EnumerationFactory e) { // "<"
+ return this.getPos() < e.getPos ();
}
- public boolean le(EnumerationFactory enum) { // "<="
- return this.getPos() <= enum.getPos ();
+ public boolean le(EnumerationFactory e) { // "<="
+ return this.getPos() <= e.getPos ();
}
- public boolean gt(EnumerationFactory enum) { // ">"
- return this.getPos() > enum.getPos ();
+ public boolean gt(EnumerationFactory e) { // ">"
+ return this.getPos() > e.getPos ();
}
- public boolean ge(EnumerationFactory enum) { // ">="
- return this.getPos() >= enum.getPos ();
+ public boolean ge(EnumerationFactory e) { // ">="
+ return this.getPos() >= e.getPos ();
}
// "==" and "equals" are inherited.
