diff options
| author | Glenn Adams <gadams@apache.org> | 2012-04-11 18:52:19 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-04-11 18:52:19 +0000 |
| commit | 480aca5871304b1e690f13bafdfe0bb857b0b940 (patch) | |
| tree | af5126f09cc52e4f50f3773047fb82d0e71cf6b4 /src | |
| parent | 9ed2391ac82b8fc118a20f18a1d365c50c187669 (diff) | |
| download | xmlgraphics-fop-480aca5871304b1e690f13bafdfe0bb857b0b940.tar.gz xmlgraphics-fop-480aca5871304b1e690f13bafdfe0bb857b0b940.zip | |
Must use unqualified (local name) when reporting invalid child error.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1324916 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Marker.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/RetrieveMarker.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java index bff5fac0c..de806e986 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/src/java/org/apache/fop/fo/flow/Marker.java @@ -59,7 +59,7 @@ public class Marker extends FObjMixed { /** {@inheritDoc} */ public void bind(PropertyList pList) throws FOPException { if (findAncestor(FO_FLOW) < 0) { - invalidChildError(locator, getParent().getName(), FO_URI, getName(), + invalidChildError(locator, getParent().getName(), FO_URI, getLocalName(), "rule.markerDescendantOfFlow"); } diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java index 5ddc1f304..5fc70c7f2 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java @@ -60,7 +60,7 @@ public class RetrieveMarker extends AbstractRetrieveMarker { PropertyList pList) throws FOPException { if (findAncestor(FO_STATIC_CONTENT) < 0) { - invalidChildError(locator, getParent().getName(), FO_URI, getName(), + invalidChildError(locator, getParent().getName(), FO_URI, getLocalName(), "rule.retrieveMarkerDescendantOfStaticContent"); } else { super.processNode(elementName, locator, attlist, pList); |