pbwest 2002/10/18 20:05:42 Modified: src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design SyncedXmlEventsBuffer.java XMLEvent.java Added: src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design UriLocalName.java Log: UriLocalName separated from XMLEvent. Revision Changes Path No revision No revision 1.1.2.4 +13 -13 xml-fop/src/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java Index: SyncedXmlEventsBuffer.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- SyncedXmlEventsBuffer.java 9 Oct 2002 06:07:03 -0000 1.1.2.3 +++ SyncedXmlEventsBuffer.java 19 Oct 2002 03:05:42 -0000 1.1.2.4 @@ -69,7 +69,7 @@ XMLEvent ev; try { ev = (XMLEvent)get(); - System.out.println("getEvent: " + ev); + //System.out.println("getEvent: " + ev); return ev; } catch (InterruptedException e) { throw new FOPException(e); @@ -450,11 +450,11 @@ } catch (NoSuchElementException e) { // Keep trying } - } else if (o instanceof XMLEvent.UriLocalName) { + } else if (o instanceof UriLocalName) { try { ev = expectStartElement - (((XMLEvent.UriLocalName) o).getUriIndex(), - ((XMLEvent.UriLocalName) o).getLocalName(), + (((UriLocalName) o).uriIndex, + ((UriLocalName) o).localName, discardWhiteSpace); // Found it! return ev; @@ -473,7 +473,7 @@ * Get one of a array of possible STARTELEMENT events. Scan and discard * events until a STARTELEMENT event is found whose URI index and * local name matches one of those in the argument - * <tt>XMLEvent.UriLocalName[]</tt> array. + * <tt>UriLocalName[]</tt> array. * @param list an array containing <tt>UriLocalName</tt> * objects with the URI index and local name of * @param discardWhiteSpace - if true, discard any <tt>characters</tt> @@ -484,7 +484,7 @@ * @exception NoSuchElementException if the event is not found */ public XMLEvent getStartElement - (XMLEvent.UriLocalName[] list, boolean discardWhiteSpace) + (UriLocalName[] list, boolean discardWhiteSpace) throws FOPException { XMLEvent ev; @@ -509,8 +509,8 @@ /** * Expect one of an array of possible STARTELEMENT events. The next * STARTELEMENT must have a URI index and local name which match - * an element of the argument <tt>XMLEvent.UriLocalName[]</tt> list. - * @param list an <tt>XMLEvent.UriLocalName[]</tt> array containing the + * an element of the argument <tt>UriLocalName[]</tt> list. + * @param list an <tt>UriLocalName[]</tt> array containing the * namespace Uri index and LocalName * of possible events, one of which must be the next returned. * @param discardWhiteSpace - if true, discard any <tt>characters</tt> @@ -520,14 +520,14 @@ * @exception NoSuchElementException if the event is not found */ public XMLEvent expectStartElement - (XMLEvent.UriLocalName[] list, boolean discardWhiteSpace) + (UriLocalName[] list, boolean discardWhiteSpace) throws FOPException { XMLEvent ev; for (int i = 0; i < list.length; i++) { try { - ev = expectStartElement(list[i].getUriIndex(), - list[i].getLocalName(), + ev = expectStartElement(list[i].uriIndex, + list[i].localName, discardWhiteSpace); // Found it! return ev; 1.1.2.5 +3 -39 xml-fop/src/org/apache/fop/xml/Attic/XMLEvent.java Index: XMLEvent.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/XMLEvent.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- XMLEvent.java 10 Oct 2002 17:10:44 -0000 1.1.2.4 +++ XMLEvent.java 19 Oct 2002 03:05:42 -0000 1.1.2.5 @@ -216,40 +216,4 @@ return tstr; } - /** - * A nested class for holding an passing a URI index and local name - * pair, as used in the containing <tt>XMLEvent</tt> class. - */ - public static class UriLocalName { - public int uriIndex; - public String localName; - - /** - * @param uriIndex - the index of the namespace URI maintained in - * the associated <tt>XMLNamespaces</tt> object. - * @param localName - the local name of the event. - */ - public UriLocalName(int uriIndex, String localName) { - this.uriIndex = uriIndex; - this.localName = localName; - } - - /** - * Get the index of the namespace URI associated with this event. - * @return the index of the URI in the associated - * <tt>XMLNamespaces</tt> object. - */ - public int getUriIndex() { - return uriIndex; - } - - /** - * Get the local name associated with this event. - * @return the local name. - */ - public String getLocalName() { - return localName; - } - } - } No revision No revision 1.1.2.1 +20 -0 xml-fop/src/org/apache/fop/xml/Attic/UriLocalName.java
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]