1. validation for fo:basic-link added

2.  "name" data element removed from FONode, added to its XMLObj subclass (FObj subclasses'  getName() uses a string constant instead.)

3.  isBlockOrInlineItem() convenience method added to FObj

4.  setup() methods within FO's switched to private access.


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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
index 579fcf649..d1c66374d 100644
--- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -84,7 +84,7 @@ public class ExternalGraphic extends FObj {
      * Setup this image.
      * This gets the sizes for the image and the dimensions and clipping.
      */
-    public void setup() {
+    private void setup() {
         url = this.propertyList.get(PR_SRC).getString();
         if (url == null) {
             return;
@@ -230,15 +230,6 @@ public class ExternalGraphic extends FObj {
         return viewHeight;
     }
 
-    /**
-     * This is a hook for the AddLMVisitor class to be able to access
-     * this object.
-     * @param aLMV the AddLMVisitor object that can access this object.
-     */
-    public void acceptVisitor(AddLMVisitor aLMV) {
-        aLMV.serveExternalGraphic(this);
-    }
-
     public String getURL() {
         return url;
     }
@@ -259,4 +250,13 @@ public class ExternalGraphic extends FObj {
         return "fo:external-graphic";
     }
 
+    /**
+     * This is a hook for the AddLMVisitor class to be able to access
+     * this object.
+     * @param aLMV the AddLMVisitor object that can access this object.
+     */
+    public void acceptVisitor(AddLMVisitor aLMV) {
+       setup();
+       aLMV.serveExternalGraphic(this);
+    }
 }