[Exist-commits] SF.net SVN: exist:[11729] trunk/eXist/src/org/exist/dom

[<br...@us...>]

Revision: 11729
          http://exist.svn.sourceforge.net/exist/?rev=11729&view=rev
Author:   brihaye
Date:     2010-04-29 14:04:52 +0000 (Thu, 29 Apr 2010)

Log Message:
-----------
stronger typing

Modified Paths:
--------------
    trunk/eXist/src/org/exist/dom/ElementImpl.java
    trunk/eXist/src/org/exist/dom/NewArrayNodeSet.java

Modified: trunk/eXist/src/org/exist/dom/ElementImpl.java
===================================================================
--- trunk/eXist/src/org/exist/dom/ElementImpl.java	2010-04-29 14:03:45 UTC (rev 11728)
+++ trunk/eXist/src/org/exist/dom/ElementImpl.java	2010-04-29 14:04:52 UTC (rev 11729)
@@ -716,7 +716,7 @@
             DBBroker broker = null;
             try {
                 broker = ownerDocument.getBrokerPool().get(null);
-                final Iterator iterator = broker.getNodeIterator(this);
+                final Iterator<StoredNode> iterator = broker.getNodeIterator(this);
                 iterator.next();
                 final int ccount = getChildCount();
                 for (int i = 0; i < ccount; i++) {
@@ -749,7 +749,7 @@
         DBBroker broker = null;
         try {
             broker = ownerDocument.getBrokerPool().get(null);
-            final Iterator iterator = broker.getNodeIterator(this);
+            final Iterator<StoredNode> iterator = broker.getNodeIterator(this);
             iterator.next();
             return findAttribute(qname, iterator, this);
         } catch (EXistException e) {
@@ -760,11 +760,11 @@
         return null;
     }
 
-    private AttrImpl findAttribute(String qname, Iterator iterator, StoredNode current) {
+    private AttrImpl findAttribute(String qname, Iterator<StoredNode> iterator, StoredNode current) {
     	final int ccount = current.getChildCount();
         StoredNode next;
         for (int i = 0; i < ccount; i++) {
-            next = (StoredNode) iterator.next();
+            next = iterator.next();
             if (next.getNodeType() != Node.ATTRIBUTE_NODE)
             	break;
             if (next.getNodeName().equals(qname))
@@ -777,7 +777,7 @@
         DBBroker broker = null;
         try {
             broker = ownerDocument.getBrokerPool().get(null);
-            final Iterator iterator = broker.getNodeIterator(this);
+            final Iterator<StoredNode> iterator = broker.getNodeIterator(this);
             iterator.next();
             return findAttribute(qname, iterator, this);
         } catch (EXistException e) {
@@ -788,10 +788,10 @@
         return null;
     }
 
-    private AttrImpl findAttribute(QName qname, Iterator iterator, StoredNode current) {
+    private AttrImpl findAttribute(QName qname, Iterator<StoredNode> iterator, StoredNode current) {
     	final int ccount = current.getChildCount();        
         for (int i = 0; i < ccount; i++) {
-        	StoredNode next = (StoredNode) iterator.next();
+        	StoredNode next = iterator.next();
             if (next.getNodeType() != Node.ATTRIBUTE_NODE)
             	break;
     		if (next.getQName().equalsSimple(qname))
@@ -890,7 +890,7 @@
         DBBroker broker = null;
         try {
             broker = ownerDocument.getBrokerPool().get(null);
-            final Iterator iterator = broker.getNodeIterator(this);
+            final Iterator<StoredNode> iterator = broker.getNodeIterator(this);
             iterator.next();
             StoredNode next;
             for (int i = 0; i < getChildCount(); i++) {

Modified: trunk/eXist/src/org/exist/dom/NewArrayNodeSet.java
===================================================================
--- trunk/eXist/src/org/exist/dom/NewArrayNodeSet.java	2010-04-29 14:03:45 UTC (rev 11728)
+++ trunk/eXist/src/org/exist/dom/NewArrayNodeSet.java	2010-04-29 14:04:52 UTC (rev 11729)
@@ -1173,7 +1173,7 @@
 
     // DocumentSet methods
 
-    public Iterator getDocumentIterator() {
+    public Iterator<DocumentImpl> getDocumentIterator() {
         sort();
         if (docIter != null)
             return docIter.reset();
@@ -1329,7 +1329,7 @@
      *
      * @return an <code>Iterator</code> value
      */
-    public Iterator getCollectionIterator() {
+    public Iterator<Collection> getCollectionIterator() {
         sort();
         if (cachedCollections == null) {
             cachedCollections = new HashSet<Collection>();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.