cleaned up bookmark extension a bit

make multi page sequences work properly


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

2 files changed, 19 insertions, 10 deletions

diff --git a/src/org/apache/fop/area/inline/Unresolved.java b/src/org/apache/fop/area/inline/Unresolved.java
index 2169c9410..8af0c9f0c 100644
--- a/src/org/apache/fop/area/inline/Unresolved.java
+++ b/src/org/apache/fop/area/inline/Unresolved.java
@@ -7,14 +7,13 @@
 
 package org.apache.fop.area.inline;
 
-public class Unresolved extends InlineArea {
-    boolean resolved = false;
-
-    // id ref
-    // resolve
-    // resolve without area
+import org.apache.fop.area.Resolveable;
 
-    public void resolve() {
+public abstract class Unresolved extends InlineArea implements Resolveable {
+    boolean resolved = false;
 
+    public boolean isResolved() {
+       return resolved;
     }
+
 }
diff --git a/src/org/apache/fop/area/inline/UnresolvedPageNumber.java b/src/org/apache/fop/area/inline/UnresolvedPageNumber.java
index c8ac17d3a..ddc85d327 100644
--- a/src/org/apache/fop/area/inline/UnresolvedPageNumber.java
+++ b/src/org/apache/fop/area/inline/UnresolvedPageNumber.java
@@ -7,10 +7,20 @@
 
 package org.apache.fop.area.inline;
 
+import java.util.ArrayList;
+
 public class UnresolvedPageNumber extends Unresolved {
+    String pageRefId;
+
+    public UnresolvedPageNumber(String id) {
+        pageRefId = id;
+    }
 
-    // id ref
-    // resolve
-    // resolve without area
+    public String[] getIDs() {
+        return new String[] {pageRefId};
+    }
 
+    public void resolve(String id, ArrayList pages) {
+        resolved = true;
+    }
 }