cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination Root.java

[adelmelle]

adelmelle    2004/11/14 12:08:44

  Modified:    src/java/org/apache/fop/fo/pagination Root.java
  Log:
  reverting previous change: 'outline' -> 'bookmark'
  
  Revision  Changes    Path
  1.35      +5 -5      xml-fop/src/java/org/apache/fop/fo/pagination/Root.java
  
  Index: Root.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Root.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Root.java 14 Nov 2004 19:28:28 -0000      1.34
  +++ Root.java 14 Nov 2004 20:08:44 -0000      1.35
  @@ -104,7 +104,7 @@
                   } else if (declarations != null) {
                       tooManyNodesError(loc, "fo:declarations");
                   } else if (bookmarks != null) {
  -                    nodesOutOfOrderError(loc, "fo:declarations", 
"fox:outline");
  +                    nodesOutOfOrderError(loc, "fo:declarations", 
"fox:bookmark");
                   } else if (pageSequenceFound) {
                       nodesOutOfOrderError(loc, "fo:declarations", 
"fo:page-sequence");
                   }
  @@ -118,14 +118,14 @@
                   invalidChildError(loc, nsURI, localName);
               }
           } else if (nsURI.equals(ExtensionElementMapping.URI)) {
  -            if (!localName.equals("outline")) {
  +            if (!localName.equals("bookmark")) {
                   invalidChildError(loc, nsURI, localName);
               } else if (layoutMasterSet == null) {
  -                nodesOutOfOrderError(loc, "fo:layout-master-set", 
"fox:outline");
  +                nodesOutOfOrderError(loc, "fo:layout-master-set", 
"fox:bookmark");
               } else if (bookmarks != null) {
  -                tooManyNodesError(loc, "fox:outline");
  +                tooManyNodesError(loc, "fox:bookmark");
               } else if (pageSequenceFound) {
  -                nodesOutOfOrderError(loc, "fox:outline", "fo:page-sequence");
  +                nodesOutOfOrderError(loc, "fox:bookmark", 
"fo:page-sequence");
               }
           } else {
               invalidChildError(loc, nsURI, localName);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]