gmazza 2004/12/03 22:51:13
Modified: src/java/org/apache/fop/area BookmarkData.java
LinkResolver.java PageViewport.java Resolvable.java
src/java/org/apache/fop/area/inline
UnresolvedPageNumber.java
Log:
More code commenting.
Revision Changes Path
1.4 +1 -2 xml-fop/src/java/org/apache/fop/area/BookmarkData.java
Index: BookmarkData.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/BookmarkData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BookmarkData.java 2 Dec 2004 01:36:09 -0000 1.3
+++ BookmarkData.java 4 Dec 2004 06:51:13 -0000 1.4
@@ -179,7 +179,6 @@
pageRef = (PageViewport)pages.get(0);
}
// TODO get rect area of id on page
-
idRefs.remove(idRef);
checkFinish();
}
1.6 +3 -1 xml-fop/src/java/org/apache/fop/area/LinkResolver.java
Index: LinkResolver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/LinkResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LinkResolver.java 2 Dec 2004 01:59:40 -0000 1.5
+++ LinkResolver.java 4 Dec 2004 06:51:13 -0000 1.6
@@ -60,6 +60,8 @@
/**
* Resolve by adding an internal link.
+ *
+ * @see org.apache.fop.area.Resolveable#resolveIDRef(String, List)
*/
public void resolveIDRef(String id, List pages) {
if (idRef.equals(id) && pages != null) {
1.8 +15 -13 xml-fop/src/java/org/apache/fop/area/PageViewport.java
Index: PageViewport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PageViewport.java 2 Dec 2004 01:36:09 -0000 1.7
+++ PageViewport.java 4 Dec 2004 06:51:13 -0000 1.8
@@ -48,8 +48,10 @@
private Map idReferences = null;
// this keeps a list of currently unresolved areas or extensions
- // once the thing is resolved it is removed
+ // once an idref is resolved it is removed
// when this is empty the page can be rendered
+ private Map unresolvedIDRefs = new HashMap();
+
private Map unresolved = null;
private Map pendingResolved = null;
@@ -131,14 +133,14 @@
* @param id the id of the reference
* @param res the resolver of the reference
*/
- public void addUnresolvedIDRef(String id, Resolvable res) {
- if (unresolved == null) {
- unresolved = new HashMap();
+ public void addUnresolvedIDRef(String idref, Resolvable res) {
+ if (unresolvedIDRefs == null) {
+ unresolvedIDRefs = new HashMap();
}
- List list = (List)unresolved.get(id);
+ List list = (List)unresolvedIDRefs.get(idref);
if (list == null) {
list = new ArrayList();
- unresolved.put(id, list);
+ unresolvedIDRefs.put(idref, list);
}
list.add(res);
}
@@ -148,7 +150,7 @@
* @return true if the page is resolved and can be rendered
*/
public boolean isResolved() {
- return unresolved == null;
+ return unresolvedIDRefs == null;
}
/**
@@ -169,8 +171,8 @@
}
pendingResolved.put(id, pages);
} else {
- if (unresolved != null) {
- List todo = (List)unresolved.get(id);
+ if (unresolvedIDRefs != null) {
+ List todo = (List)unresolvedIDRefs.get(id);
if (todo != null) {
for (int count = 0; count < todo.size(); count++) {
Resolvable res = (Resolvable)todo.get(count);
@@ -179,10 +181,10 @@
}
}
}
- if (unresolved != null) {
- unresolved.remove(id);
- if (unresolved.isEmpty()) {
- unresolved = null;
+ if (unresolvedIDRefs != null) {
+ unresolvedIDRefs.remove(id);
+ if (unresolvedIDRefs.isEmpty()) {
+ unresolvedIDRefs = null;
}
}
}
1.5 +3 -3 xml-fop/src/java/org/apache/fop/area/Resolvable.java
Index: Resolvable.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Resolvable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Resolvable.java 2 Dec 2004 01:59:40 -0000 1.4
+++ Resolvable.java 4 Dec 2004 06:51:13 -0000 1.5
@@ -51,12 +51,12 @@
* identifies to the AreaTreeHandler which idrefs it needs
* resolved. After the idrefs are resolved, the ATH calls this
* method to allow the Resolvable object to update itself with
- * the PageViewport information.
+ * the PageViewport information.
*
* @param id an ID matching one of the Resolvable object's
* unresolved idref's.
* @param pages the list of PageViewports with the given ID
- * may be null if ID is not tied to any
+ *
*/
void resolveIDRef(String id, List pages);
}
1.7 +3 -4
xml-fop/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
Index: UnresolvedPageNumber.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UnresolvedPageNumber.java 2 Dec 2004 01:59:40 -0000 1.6
+++ UnresolvedPageNumber.java 4 Dec 2004 06:51:13 -0000 1.7
@@ -58,15 +58,14 @@
* for this ID. The page number text is then set to the String value
* of the page number.
*
- * @param id the id associated with the pages parameter
+ * @param id an id whose PageViewports have been determined
* @param pages the list of PageViewports associated with this ID
*/
public void resolveIDRef(String id, List pages) {
- if (pages != null) {
+ if (pageIDRef.equals(id) && pages != null) {
resolved = true;
PageViewport page = (PageViewport)pages.get(0);
- String str = page.getPageNumber();
- text = str;
+ text = page.getPageNumber();
/[EMAIL PROTECTED] Update IPD ??? */
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
