Switched from fox:bookmarks to fo:bookmark-tree (of XSL 1.1 2WD). Two more

bookmark-related FO's (fox:outline and fox:label) need conversion and will
be done next.


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

2 files changed, 8 insertions, 8 deletions

diff --git a/src/java/org/apache/fop/area/AreaTreeHandler.java b/src/java/org/apache/fop/area/AreaTreeHandler.java
index 949d6a2e4..36bc691a1 100644
--- a/src/java/org/apache/fop/area/AreaTreeHandler.java
+++ b/src/java/org/apache/fop/area/AreaTreeHandler.java
@@ -36,9 +36,9 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.FOEventHandler;
-import org.apache.fop.fo.extensions.Bookmarks;
 import org.apache.fop.fo.pagination.PageSequence;
 import org.apache.fop.fo.pagination.Root;
+import org.apache.fop.fo.pagination.bookmarks.BookmarkTree;
 import org.apache.fop.layoutmgr.PageSequenceLayoutManager;
 import org.apache.fop.layoutmgr.LayoutManagerMaker;
 import org.apache.fop.layoutmgr.LayoutManagerMapping;
@@ -251,9 +251,9 @@ public class AreaTreeHandler extends FOEventHandler {
     public void endDocument() throws SAXException {
 
         // process fo:bookmark-tree
-        Bookmarks bookmarks = rootFObj.getBookmarks();
-        if (bookmarks != null) {
-            BookmarkData data = new BookmarkData(bookmarks);
+        BookmarkTree bookmarkTree = rootFObj.getBookmarkTree();
+        if (bookmarkTree != null) {
+            BookmarkData data = new BookmarkData(bookmarkTree);
             addOffDocumentItem(data);
         }
 
diff --git a/src/java/org/apache/fop/area/BookmarkData.java b/src/java/org/apache/fop/area/BookmarkData.java
index 8a0a4b39d..23fd92583 100644
--- a/src/java/org/apache/fop/area/BookmarkData.java
+++ b/src/java/org/apache/fop/area/BookmarkData.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.HashMap;
 
-import org.apache.fop.fo.extensions.Bookmarks;
+import org.apache.fop.fo.pagination.bookmarks.BookmarkTree;
 import org.apache.fop.fo.extensions.Outline;
 
 /**
@@ -52,12 +52,12 @@ public class BookmarkData extends OffDocumentItem implements Resolvable {
      *
      * @param bookmarks fo:bookmark-tree for this document
      */
-    public BookmarkData(Bookmarks bookmarks) {
+    public BookmarkData(BookmarkTree bookmarkTree) {
         idRef = null;
         whenToProcess = END_OF_DOC;
         
-        for (int count = 0; count < bookmarks.getOutlines().size(); count++) {
-            Outline out = (Outline)(bookmarks.getOutlines()).get(count);
+        for (int count = 0; count < bookmarkTree.getBookmarks().size(); count++) {
+            Outline out = (Outline)(bookmarkTree.getBookmarks()).get(count);
             addSubData(createBookmarkData(out));
         }
     }