Index: java/src/org/apache/xindice/core/filer/BTreeFiler.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java,v retrieving revision 1.23 diff -u -r1.23 BTreeFiler.java --- java/src/org/apache/xindice/core/filer/BTreeFiler.java 20 Mar 2004 14:02:38 -0000 1.23 +++ java/src/org/apache/xindice/core/filer/BTreeFiler.java 16 Jul 2004 04:58:51 -0000 @@ -184,12 +184,12 @@ private class BTreeFilerRecordSet implements RecordSet, BTreeCallback { private List keys = new ArrayList(); - private Iterator enum; + private Iterator iter; public BTreeFilerRecordSet() throws DBException { try { query(null, this); - enum = keys.iterator(); + iter = keys.iterator(); } catch (IOException e) { throw new FilerException(FaultCodes.GEN_CRITICAL_ERROR, "Error generating RecordSet", e); @@ -202,11 +202,11 @@ } public synchronized Key getNextKey() { - return (Key) enum.next(); + return (Key) iter.next(); } public synchronized Record getNextRecord() throws DBException { - return readRecord((Key) enum.next()); + return readRecord((Key) iter.next()); } public synchronized Value getNextValue() throws DBException { @@ -214,7 +214,7 @@ } public synchronized boolean hasMoreRecords() { - return enum.hasNext(); + return iter.hasNext(); } } Index: java/src/org/apache/xindice/core/filer/HashFiler.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java,v retrieving revision 1.23 diff -u -r1.23 HashFiler.java --- java/src/org/apache/xindice/core/filer/HashFiler.java 20 Mar 2004 14:02:38 -0000 1.23 +++ java/src/org/apache/xindice/core/filer/HashFiler.java 16 Jul 2004 04:59:54 -0000 @@ -284,7 +284,7 @@ */ private class HashFilerRecordSet implements RecordSet { private List keys = new ArrayList(); - private Iterator enum; + private Iterator iter; public HashFilerRecordSet() { try { @@ -302,7 +302,7 @@ pageNum++; } - enum = keys.iterator(); + iter = keys.iterator(); } catch (Exception e) { if (log.isWarnEnabled()) { log.warn("ignored exception", e); @@ -311,11 +311,11 @@ } public synchronized Key getNextKey() { - return (Key) enum.next(); + return (Key) iter.next(); } public synchronized Record getNextRecord() throws DBException { - return readRecord((Key) enum.next()); + return readRecord((Key) iter.next()); } public synchronized Value getNextValue() throws DBException { @@ -323,7 +323,7 @@ } public synchronized boolean hasMoreRecords() { - return enum.hasNext(); + return iter.hasNext(); } } Index: java/src/org/apache/xindice/core/filer/MemFiler.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/core/filer/MemFiler.java,v retrieving revision 1.10 diff -u -r1.10 MemFiler.java --- java/src/org/apache/xindice/core/filer/MemFiler.java 8 Feb 2004 02:49:45 -0000 1.10 +++ java/src/org/apache/xindice/core/filer/MemFiler.java 16 Jul 2004 05:00:53 -0000 @@ -154,24 +154,24 @@ */ private class MemRecordSet implements RecordSet { - private Iterator enum = hashTable.values().iterator(); + private Iterator iter = hashTable.values().iterator(); public synchronized boolean hasMoreRecords() throws DBException { - return enum.hasNext(); + return iter.hasNext(); } public synchronized Record getNextRecord() throws DBException { checkOpened(); - return (Record) enum.next(); + return (Record) iter.next(); } public synchronized Value getNextValue() throws DBException { checkOpened(); - return ((Record) enum.next()).getValue(); + return ((Record) iter.next()).getValue(); } public synchronized Key getNextKey() { - return ((Record) enum.next()).getKey(); + return ((Record) iter.next()).getKey(); } } } Index: java/src/org/apache/xindice/core/filer/SizeableMemFiler.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/core/filer/SizeableMemFiler.java,v retrieving revision 1.6 diff -u -r1.6 SizeableMemFiler.java --- java/src/org/apache/xindice/core/filer/SizeableMemFiler.java 8 Feb 2004 02:49:45 -0000 1.6 +++ java/src/org/apache/xindice/core/filer/SizeableMemFiler.java 16 Jul 2004 05:01:37 -0000 @@ -168,24 +168,24 @@ */ private class MemRecordSet implements RecordSet { - private Iterator enum = hashTable.values().iterator(); + private Iterator iter = hashTable.values().iterator(); public synchronized boolean hasMoreRecords() throws DBException { - return enum.hasNext(); + return iter.hasNext(); } public synchronized Record getNextRecord() throws DBException { checkOpened(); - return (Record) enum.next(); + return (Record) iter.next(); } public synchronized Value getNextValue() throws DBException { checkOpened(); - return ((Record) enum.next()).getValue(); + return ((Record) iter.next()).getValue(); } public synchronized Key getNextKey() { - return ((Record) enum.next()).getKey(); + return ((Record) iter.next()).getKey(); } } } Index: java/src/org/apache/xindice/core/indexer/IndexManager.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/core/indexer/IndexManager.java,v retrieving revision 1.32 diff -u -r1.32 IndexManager.java --- java/src/org/apache/xindice/core/indexer/IndexManager.java 20 Mar 2004 14:10:45 -0000 1.32 +++ java/src/org/apache/xindice/core/indexer/IndexManager.java 16 Jul 2004 05:02:19 -0000 @@ -383,9 +383,9 @@ Indexer idx = (Indexer) tbl.get(pattern); if (idx == null) { int highScore = 0; - Iterator enum = indexes.values().iterator(); - while (enum.hasNext()) { - IndexerInfo info = (IndexerInfo) enum.next(); + Iterator iter = indexes.values().iterator(); + while (iter.hasNext()) { + IndexerInfo info = (IndexerInfo) iter.next(); if (info.status != STATUS_READY || !info.indexer.getIndexStyle().equals(style)) { continue; } Index: java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java,v retrieving revision 1.16 diff -u -r1.16 ContainerNodeImpl.java --- java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java 8 Feb 2004 03:11:56 -0000 1.16 +++ java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java 16 Jul 2004 05:03:19 -0000 @@ -441,10 +441,10 @@ } }; - NodeIterator enum = ((DocumentTraversal) getOwnerDocument()).createNodeIterator(this, NodeFilter.SHOW_ELEMENT, filter, false); + NodeIterator iter = ((DocumentTraversal) getOwnerDocument()).createNodeIterator(this, NodeFilter.SHOW_ELEMENT, filter, false); Node node = null; do { - node = enum.nextNode(); + node = iter.nextNode(); if (node != null) { list.add(node); } @@ -466,10 +466,10 @@ } }; - NodeIterator enum = ((DocumentTraversal) getOwnerDocument()).createNodeIterator(this, NodeFilter.SHOW_ELEMENT, filter, false); + NodeIterator iter = ((DocumentTraversal) getOwnerDocument()).createNodeIterator(this, NodeFilter.SHOW_ELEMENT, filter, false); Node node = null; do { - node = enum.nextNode(); + node = iter.nextNode(); if (node != null) { list.add(node); } Index: java/src/org/apache/xindice/xml/dom/DocumentImpl.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java,v retrieving revision 1.17 diff -u -r1.17 DocumentImpl.java --- java/src/org/apache/xindice/xml/dom/DocumentImpl.java 20 May 2004 01:35:58 -0000 1.17 +++ java/src/org/apache/xindice/xml/dom/DocumentImpl.java 16 Jul 2004 05:03:58 -0000 @@ -234,9 +234,9 @@ */ public Element getDocumentElement() { checkLoaded(); - Iterator enum = childNodes.iterator(); - while (enum.hasNext()) { - Node node = (Node) enum.next(); + Iterator iter = childNodes.iterator(); + while (iter.hasNext()) { + Node node = (Node) iter.next(); if (node.getNodeType() == Node.ELEMENT_NODE) { return (Element) node; } Index: java/src/org/apache/xindice/xml/dom/NamedNodeMapImpl.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/xml/dom/NamedNodeMapImpl.java,v retrieving revision 1.8 diff -u -r1.8 NamedNodeMapImpl.java --- java/src/org/apache/xindice/xml/dom/NamedNodeMapImpl.java 8 Feb 2004 03:11:56 -0000 1.8 +++ java/src/org/apache/xindice/xml/dom/NamedNodeMapImpl.java 16 Jul 2004 05:04:44 -0000 @@ -104,8 +104,8 @@ public Node getNamedItemNS(String namespaceURI, String localName) { Node node; - for (Iterator enum = iterator(); enum.hasNext(); ) { - node = (Node) enum.next(); + for (Iterator iter = iterator(); iter.hasNext(); ) { + node = (Node) iter.next(); String ns = node.getNamespaceURI(); String ln = node.getLocalName(); if (ns != null @@ -138,8 +138,8 @@ **/ public Node removeNamedItemNS(String namespaceURI, String localName) throws DOMException { Node node; - for (Iterator enum = iterator(); enum.hasNext(); ) { - node = (Node) enum.next(); + for (Iterator iter = iterator(); iter.hasNext(); ) { + node = (Node) iter.next(); if (localName.equals(node.getLocalName())) { if ((namespaceURI == null && node.getNamespaceURI() == null) || (namespaceURI != null && namespaceURI.equals(node.getNamespaceURI()))) { Index: java/src/org/apache/xindice/xml/sax/SetContentHandler.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/src/org/apache/xindice/xml/sax/SetContentHandler.java,v retrieving revision 1.6 diff -u -r1.6 SetContentHandler.java --- java/src/org/apache/xindice/xml/sax/SetContentHandler.java 8 Feb 2004 03:50:14 -0000 1.6 +++ java/src/org/apache/xindice/xml/sax/SetContentHandler.java 16 Jul 2004 05:05:22 -0000 @@ -226,9 +226,9 @@ } } - Iterator enum = namespaces.keySet().iterator(); - while (enum.hasNext()) { - String key = (String) enum.next(); + Iterator iter = namespaces.keySet().iterator(); + while (iter.hasNext()) { + String key = (String) iter.next(); newContent.append(" xmlns"); if (key.length() > 0) { newContent.append(":");