vgritsenko 2004/07/20 13:34:35
Modified: java/src/org/apache/xindice/core/filer BTreeFiler.java
HashFiler.java MemFiler.java SizeableMemFiler.java
java/src/org/apache/xindice/xml/dom ContainerNodeImpl.java
DocumentImpl.java NamedNodeMapImpl.java
java/src/org/apache/xindice/xml/sax SetContentHandler.java
Log:
Rename "enum" to "iter".
Submitted by: "Dave Brosius" <[EMAIL PROTECTED]>
Revision Changes Path
1.24 +7 -7
xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java
Index: BTreeFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- BTreeFiler.java 20 Mar 2004 14:02:38 -0000 1.23
+++ BTreeFiler.java 20 Jul 2004 20:34:34 -0000 1.24
@@ -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();
}
}
1.24 +7 -7
xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java
Index: HashFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- HashFiler.java 20 Mar 2004 14:02:38 -0000 1.23
+++ HashFiler.java 20 Jul 2004 20:34:34 -0000 1.24
@@ -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();
}
}
1.11 +7 -7
xml-xindice/java/src/org/apache/xindice/core/filer/MemFiler.java
Index: MemFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/MemFiler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MemFiler.java 8 Feb 2004 02:49:45 -0000 1.10
+++ MemFiler.java 20 Jul 2004 20:34:34 -0000 1.11
@@ -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();
}
}
}
1.7 +7 -7
xml-xindice/java/src/org/apache/xindice/core/filer/SizeableMemFiler.java
Index: SizeableMemFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/SizeableMemFiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SizeableMemFiler.java 8 Feb 2004 02:49:45 -0000 1.6
+++ SizeableMemFiler.java 20 Jul 2004 20:34:34 -0000 1.7
@@ -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();
}
}
}
1.17 +6 -6
xml-xindice/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java
Index: ContainerNodeImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ContainerNodeImpl.java 8 Feb 2004 03:11:56 -0000 1.16
+++ ContainerNodeImpl.java 20 Jul 2004 20:34:35 -0000 1.17
@@ -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);
}
1.18 +5 -5
xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java
Index: DocumentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DocumentImpl.java 20 May 2004 01:35:58 -0000 1.17
+++ DocumentImpl.java 20 Jul 2004 20:34:35 -0000 1.18
@@ -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;
}
1.9 +6 -6
xml-xindice/java/src/org/apache/xindice/xml/dom/NamedNodeMapImpl.java
Index: NamedNodeMapImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/NamedNodeMapImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NamedNodeMapImpl.java 8 Feb 2004 03:11:56 -0000 1.8
+++ NamedNodeMapImpl.java 20 Jul 2004 20:34:35 -0000 1.9
@@ -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()))) {
1.7 +5 -5
xml-xindice/java/src/org/apache/xindice/xml/sax/SetContentHandler.java
Index: SetContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/sax/SetContentHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SetContentHandler.java 8 Feb 2004 03:50:14 -0000 1.6
+++ SetContentHandler.java 20 Jul 2004 20:34:35 -0000 1.7
@@ -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(":");
