pbwest 2002/10/08 22:56:31 Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java Log: Modified signatures for xmlevents.get?Element() methods. Revision Changes Path No revision No revision 1.1.2.8 +9 -8 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java Index: FoRoot.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- FoRoot.java 6 Oct 2002 14:28:02 -0000 1.1.2.7 +++ FoRoot.java 9 Oct 2002 05:56:31 -0000 1.1.2.8 @@ -85,7 +85,8 @@ // Look for layout-master-set try { ev = xmlevents.expectStartElement - (XMLNamespaces.XSLNSpaceIndex, "layout-master-set"); + (XMLNamespaces.XSLNSpaceIndex, "layout-master-set", + XMLEvent.DISCARD_W_SPACE); } catch (NoSuchElementException e) { throw new FOPException(e); } @@ -99,15 +100,15 @@ } layoutMasters.setupPageMasters(); // Stub - flush the layout masters - ev = xmlevents.getEndElement - (XMLNamespaces.XSLNSpaceIndex, "layout-master-set"); + ev = xmlevents.getEndElement(ev); // Look for optional declarations try { xmlevents.expectStartElement - (XMLNamespaces.XSLNSpaceIndex, "declarations"); + (XMLNamespaces.XSLNSpaceIndex, "declarations", + XMLEvent.DISCARD_W_SPACE); // process the declarations xmlevents.getEndElement - (XMLNamespaces.XSLNSpaceIndex, "declarations"); + (XMLNamespaces.XSLNSpaceIndex, "declarations"); } catch (NoSuchElementException e) { // Take no notice - declarations is optional }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]