[FOray-commit] SF.net SVN: foray: [7864] trunk/foray/foray-fotree/src/java/org/foray/ fotree/fo/obj/BasicLink.java

[<vic...@us...>]

Revision: 7864
          http://svn.sourceforge.net/foray/?rev=7864&view=rev
Author:   victormote
Date:     2006-09-03 10:01:34 -0700 (Sun, 03 Sep 2006)

Log Message:
-----------
Make BasicLink extend FObjMixed instead of Inline.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java	2006-09-03 00:21:23 UTC (rev 7863)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java	2006-09-03 17:01:34 UTC (rev 7864)
@@ -25,16 +25,20 @@
 package org.foray.fotree.fo.obj;
 
 import org.foray.fotree.FObj;
+import org.foray.fotree.FObjMixed;
+import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
 import org.axsl.common.Constants;
 import org.axsl.foR.FOContext;
+import org.axsl.foR.FONodeProxy;
 import org.axsl.foR.FOTreeException;
+import org.axsl.foR.ProxyFactory;
 
 /**
  * A "basic-link" object in XSL-FO.
  */
-public class BasicLink extends Inline implements org.axsl.foR.fo.BasicLink {
+public class BasicLink extends FObjMixed implements org.axsl.foR.fo.BasicLink {
 
     public BasicLink(final FObj parent, final PropertyList propertyList,
             final String systemId, final int line, final int column) {
@@ -44,13 +48,34 @@
     /**
      * {@inheritDoc}
      */
-    public void setup() throws FOTreeException {
+    protected void validateAncestry() throws FOTreeException {
+        return;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected void validateProperties() throws FOTreeException {
         if (! isValid()) {
             throwException(getFullName() + " must specify internal-destination "
                     + "or external-destination.");
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public void setup() throws FOTreeException {
+        return;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected void validateDescendants() throws FOTreeException {
+        return;
+    }
+
     public boolean isValid() {
         switch (getLinkType()) {
         case Constants.BASIC_LINK_INTERNAL: {
@@ -128,4 +153,19 @@
         return traitInternalDestination();
     }
 
+    public Namespace getNamespace() {
+        return this.getFOTreeBuilder().getFONamespace();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean blockMustEnclosePCDATA() {
+        return true;
+    }
+
+    public FONodeProxy makeProxy(final ProxyFactory factory) {
+        return factory.makeProxy(this);
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.