[FOray-commit] SF.net SVN: foray: [9670] trunk/foray

[<vic...@us...>]

Revision: 9670
          http://svn.sourceforge.net/foray/?rev=9670&view=rev
Author:   victormote
Date:     2007-05-30 14:16:42 -0700 (Wed, 30 May 2007)

Log Message:
-----------
Use iterator to find the descendant PageNumberCitation instances.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2007-05-30 20:53:41 UTC (rev 9669)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2007-05-30 21:16:42 UTC (rev 9670)
@@ -159,9 +159,11 @@
             return false;
         }
         this.optimized = true;
-        // Resolve the page-number-citations.
-        for (int i = 0; i < getChildren().size(); i++) {
-            final Object o = getChildren().get(i);
+        /* Resolve the page-number-citations. */
+        final Iterator<OrderedTreeNode> iterator =
+                this.postOrderDescendantIterator();
+        while (iterator.hasNext()) {
+            final OrderedTreeNode o = iterator.next();
             if (o instanceof PageNumberCitationArea) {
                 final PageNumberCitationArea pia = (PageNumberCitationArea) o;
                 pia.resolve();
@@ -216,8 +218,8 @@
         if (leaderSpaceAvailable == 0) {
             return;
         }
-        final Iterator<? extends OrderedTreeNode> iterator =
-            this.postOrderDescendantIterator();
+        final Iterator<OrderedTreeNode> iterator =
+                this.postOrderDescendantIterator();
         while (iterator.hasNext()) {
             final OrderedTreeNode object = iterator.next();
             if (object instanceof LeaderArea) {
@@ -245,7 +247,7 @@
     private int computeLeaderCapacity(final int unusedSpace) {
         // First, compute how much capacity the leaders have.
         int leaderSpaceAvailable = 0;
-        final Iterator<? extends OrderedTreeNode> iterator =
+        final Iterator<OrderedTreeNode> iterator =
                 this.postOrderDescendantIterator();
         while (iterator.hasNext()) {
             final OrderedTreeNode object = iterator.next();

Modified: trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java	2007-05-30 20:53:41 UTC (rev 9669)
+++ trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java	2007-05-30 21:16:42 UTC (rev 9670)
@@ -66,7 +66,7 @@
      * in post-traversal (depth-first) order.
      * @return A post-traversal iterator of this node's descendants.
      */
-    public Iterator<? extends OrderedTreeNode> postOrderDescendantIterator() {
+    public Iterator<OrderedTreeNode> postOrderDescendantIterator() {
         return new PostOrderDescendantIterator(this);
     }
 


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