You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by gm...@apache.org on 2004/10/04 02:59:38 UTC
cvs commit: xml-fop/src/java/org/apache/fop/area/extensions BookmarkData.java
gmazza 2004/10/03 17:59:38
Modified: src/java/org/apache/fop/area AreaTreeHandler.java
src/java/org/apache/fop/area/extensions BookmarkData.java
Log:
1.) BookmarkData now activates AreaTreeModel instead of AreaTreeHandler.
2.) Some methods moved from public to private in AreaTreeHandler.
Revision Changes Path
1.13 +6 -17 xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java
Index: AreaTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AreaTreeHandler.java 2 Oct 2004 04:34:13 -0000 1.12
+++ AreaTreeHandler.java 4 Oct 2004 00:59:38 -0000 1.13
@@ -172,7 +172,7 @@
* to resolve or add the resolveable ids for later resolution.
* @param ext the tree extension to add.
*/
- public void addTreeExtension(TreeExt ext) {
+ private void addTreeExtension(TreeExt ext) {
treeExtensions.add(ext);
if (ext.isResolveable()) {
Resolveable res = (Resolveable)ext;
@@ -190,22 +190,11 @@
}
}
} else {
- handleTreeExtension(ext, TreeExt.IMMEDIATELY);
+ model.addExtension(ext, TreeExt.IMMEDIATELY);
}
}
/**
- * Handle a tree extension.
- * This sends the extension to the model for handling.
- * @param ext the tree extension to handle
- * @param when when the extension should be handled by the model
- */
- public void handleTreeExtension(TreeExt ext, int when) {
- // queue tree extension according to the when
- model.addExtension(ext, when);
- }
-
- /**
* Prepare AreaTreeHandler for document processing
* This is called from FOTreeBuilder.startDocument()
*
@@ -271,7 +260,7 @@
/**
* Create the bookmark data in the area tree.
*/
- public void addBookmarks(Bookmarks bookmarks) {
+ private void addBookmarks(Bookmarks bookmarks) {
if (bookmarks == null) {
return;
}
@@ -283,7 +272,7 @@
data.addSubData(createBookmarkData(out));
}
addTreeExtension(data);
- data.setAreaTreeHandler(this);
+ data.setAreaTreeModel(model);
}
/**
@@ -295,7 +284,7 @@
* created
* @return the new bookmark data
*/
- public BookmarkData createBookmarkData(Outline outline) {
+ private BookmarkData createBookmarkData(Outline outline) {
BookmarkData data = new BookmarkData(outline.getInternalDestination());
data.setLabel(outline.getLabel());
for (int count = 0; count < outline.getOutlines().size(); count++) {
1.5 +11 -11 xml-fop/src/java/org/apache/fop/area/extensions/BookmarkData.java
Index: BookmarkData.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/extensions/BookmarkData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BookmarkData.java 13 Jul 2004 00:16:22 -0000 1.4
+++ BookmarkData.java 4 Oct 2004 00:59:38 -0000 1.5
@@ -21,7 +21,7 @@
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.Resolveable;
import org.apache.fop.area.TreeExt;
-import org.apache.fop.area.AreaTreeHandler;
+import org.apache.fop.area.AreaTreeModel;
import java.util.ArrayList;
import java.util.List;
@@ -36,8 +36,8 @@
private ArrayList subData = new ArrayList();
private HashMap idRefs = new HashMap();
- // area tree handler for the top level object to notify when resolved
- private AreaTreeHandler areaTreeHandler = null;
+ // area tree model for the top level object to activate when resolved
+ private AreaTreeModel areaTreeModel = null;
private String idRef;
private PageViewport pageRef = null;
@@ -65,14 +65,14 @@
}
/**
- * Set the area tree.
+ * Set the area tree model
* This should only be called for the top level element.
- * The area tree is used once resolving is complete.
+ * The area tree model is used once resolving is complete.
*
- * @param at the area tree handler for the current document
+ * @param atm the area tree model for the current document
*/
- public void setAreaTreeHandler(AreaTreeHandler ath) {
- areaTreeHandler = ath;
+ public void setAreaTreeModel(AreaTreeModel atm) {
+ areaTreeModel = atm;
}
/**
@@ -229,8 +229,8 @@
private void checkFinish() {
if (idRefs.size() == 0) {
idRefs = null;
- if (areaTreeHandler != null) {
- areaTreeHandler.handleTreeExtension(this, TreeExt.AFTER_PAGE);
+ if (areaTreeModel != null) {
+ areaTreeModel.addExtension(this, TreeExt.AFTER_PAGE);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org