1. Valid node checking for LayoutMasterSet done.

2.  Additional error message provided for missing required child elements of a node.
3.  Removal of elementName from property list; redundant (retrievable via getFObj.getName()).  Adding getName() to FObj so the element so fObj.getName() works.
(Vielen Dank, Simon!)
4.  Moving locator information from FObj to FONode so non-XSL NS elements will also have this information.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java
index 076cb00ee..6de4dd77a 100644
--- a/src/java/org/apache/fop/fo/flow/Inline.java
+++ b/src/java/org/apache/fop/fo/flow/Inline.java
@@ -22,6 +22,7 @@ package org.apache.fop.fo.flow;
 import org.xml.sax.Attributes;
 
 // FOP
+import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.CharIterator;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
@@ -33,7 +34,6 @@ import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
 import org.apache.fop.fo.properties.CommonMarginInline;
 import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.apps.FOPException;
 
 /**
  * Class modelling the fo:inline object. See Sec. 6.6.7 of the XSL-FO Standard.
@@ -138,7 +138,7 @@ public class Inline extends FObjMixed {
     /**
      * @see org.apache.fop.fo.FONode#end
      */
-    public void end() {
+    protected void end() {
         getFOInputHandler().endInline(this);
     }