From: Andreas L. Delmelle Date: Sun, 14 Nov 2004 20:20:43 +0000 (+0000) Subject: changed 'bookmark' to 'bookmarks' X-Git-Tag: Root_Temp_KnuthStylePageBreaking~362 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=00d0f42f70e55629bef58be2e209237c00668f1c;p=xmlgraphics-fop.git changed 'bookmark' to 'bookmarks' git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198145 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java index de8aa6310..efb01220d 100644 --- a/src/java/org/apache/fop/fo/pagination/Root.java +++ b/src/java/org/apache/fop/fo/pagination/Root.java @@ -104,7 +104,7 @@ public class Root extends FObj { } else if (declarations != null) { tooManyNodesError(loc, "fo:declarations"); } else if (bookmarks != null) { - nodesOutOfOrderError(loc, "fo:declarations", "fox:bookmark"); + nodesOutOfOrderError(loc, "fo:declarations", "fox:bookmarks"); } else if (pageSequenceFound) { nodesOutOfOrderError(loc, "fo:declarations", "fo:page-sequence"); } @@ -118,14 +118,14 @@ public class Root extends FObj { invalidChildError(loc, nsURI, localName); } } else if (nsURI.equals(ExtensionElementMapping.URI)) { - if (!localName.equals("bookmark")) { + if (!localName.equals("bookmarks")) { invalidChildError(loc, nsURI, localName); } else if (layoutMasterSet == null) { - nodesOutOfOrderError(loc, "fo:layout-master-set", "fox:bookmark"); + nodesOutOfOrderError(loc, "fo:layout-master-set", "fox:bookmarks"); } else if (bookmarks != null) { - tooManyNodesError(loc, "fox:bookmark"); + tooManyNodesError(loc, "fox:bookmarks"); } else if (pageSequenceFound) { - nodesOutOfOrderError(loc, "fox:bookmark", "fo:page-sequence"); + nodesOutOfOrderError(loc, "fox:bookmarks", "fo:page-sequence"); } } else { invalidChildError(loc, nsURI, localName);