Merged revisions 654563,654600,654654 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r654563 | pietsch | 2008-05-08 16:53:23 +0100 (Thu, 08 May 2008) | 1 line
  
  Fix validation errors
........
  r654600 | vhennebert | 2008-05-08 20:29:55 +0100 (Thu, 08 May 2008) | 2 lines
  
  In collapsed borders, the 'nonLeadingTrailing' case actually corresponds to the usual, 'normal' case, when no break occurs in the table. Renamed fields and parameters accordingly for readability and simplicity
........
  r654654 | adelmelle | 2008-05-09 00:46:45 +0100 (Fri, 09 May 2008) | 1 line
  
  Quick-fix to avoid creating unnecessarily large ArrayLists when adding inline ids to the page
........


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@654753 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/area/IDTracker.java b/src/java/org/apache/fop/area/IDTracker.java
index d073bdb94..e8b53b20c 100644
--- a/src/java/org/apache/fop/area/IDTracker.java
+++ b/src/java/org/apache/fop/area/IDTracker.java
@@ -78,7 +78,11 @@ public class IDTracker {
                 tryIDResolution(id, pv, pvList);
             }
         } else {
-            pvList.add(pv);
+            /* TODO: The check is a quick-fix to avoid a waste 
+             * when adding inline-ids to the page */
+            if (!pvList.contains(pv)) {
+                pvList.add(pv);
+            }
         }
     }
 
@@ -140,7 +144,7 @@ public class IDTracker {
      * 
      * @param id ID to resolve
      * @param pv page viewport whose ID refs to resolve
-     * @param List of PageViewports
+     * @param pvList of PageViewports
      */
     private void tryIDResolution(String id, PageViewport pv, List pvList) {
         Set todo = (Set) unresolvedIDRefs.get(id);