[FOray-commit] SF.net SVN: foray:[12435] trunk/foray/foray-areatree/src/main/java/org/ foray/area

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

Revision: 12435
          http://sourceforge.net/p/foray/code/12435
Author:   victormote
Date:     2022-01-20 21:50:48 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
Remove duplicate list of child PageCollection instance.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection4a.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2022-01-20 15:36:14 UTC (rev 12434)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2022-01-20 21:50:48 UTC (rev 12435)
@@ -99,13 +99,6 @@
     /* Checkstyle-IllegalType-On. */
 
     /**
-     * An ordered list of all of the PageCollection objects that have been processed.
-     * Since there is a one-to-one relationship between PageCollection and PageSequence, it can also be used to get an
-     * ordered list of PageSequence objects.
-     */
-    private List<PageCollection4a> pageCollectionsProcessed = new ArrayList<PageCollection4a>();
-
-    /**
      * Collection of objects that have registered to be notified about {@link AreaTreeEvent} firings.
      */
     private List<AreaTreeListener> areaTreeListeners = new ArrayList<AreaTreeListener>();
@@ -159,21 +152,17 @@
     }
 
     @Override
-    public PageCollection4a makePageCollection(
-            final PageSequence pageSequence) throws AreaTreeException {
+    public PageCollection4a makePageCollection(final PageSequence pageSequence) throws AreaTreeException {
         final int lastPageNumber;
-        final int collectionsProcessed = this.pageCollectionsProcessed.size();
+        final int collectionsProcessed = this.children.size();
         if (collectionsProcessed > 0) {
-            final PageCollection4a lastPageCollection =
-                    this.pageCollectionsProcessed.get(collectionsProcessed - 1);
+            final PageCollection4a lastPageCollection = this.children.get(collectionsProcessed - 1);
             lastPageNumber = lastPageCollection.getLastPageNumber();
         } else {
             lastPageNumber = 0;
         }
-        final PageCollection4a pageCollection = PageCollection4a.makePageCollection(
-                pageSequence, this, lastPageNumber);
+        final PageCollection4a pageCollection = PageCollection4a.makePageCollection(pageSequence, this, lastPageNumber);
         this.children.add(pageCollection);
-        this.pageCollectionsProcessed.add(pageCollection);
         pageCollection.padPagesAtBeginning();
         return pageCollection;
     }
@@ -363,14 +352,6 @@
         return visitor.visit(this);
     }
 
-    /**
-     * Returns the collection of page collections that have been processed.
-     * @return Returns the pageCollectionsProcessed.
-     */
-    public List<PageCollection4a> getPageCollectionsProcessed() {
-        return this.pageCollectionsProcessed;
-    }
-
     @Override
     public AreaNode4a getParent() {
         return null;

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection4a.java	2022-01-20 15:36:14 UTC (rev 12434)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection4a.java	2022-01-20 21:50:48 UTC (rev 12435)
@@ -143,7 +143,7 @@
      * -1 if this PageCollection is not found.
      */
     public int sequence() {
-        return getAreaTree().getPageCollectionsProcessed().indexOf(this);
+        return getAreaTree().getChildren().indexOf(this);
     }
 
     /**
@@ -154,8 +154,7 @@
     public PageCollection4a previousPageCollection() {
         final int sequence = sequence();
         if (sequence > 0) {
-            return getAreaTree().getPageCollectionsProcessed()
-                    .get(sequence - 1);
+            return getAreaTree().getChildren().get(sequence - 1);
         }
         return null;
     }

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