xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ce...@apache.org
Subject cvs commit: xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/richParser XMLStreamReaderExt.java XMLStreamReaderExtImpl.java
Date Thu, 11 Dec 2003 20:04:35 GMT
cezar       2003/12/11 12:04:35

  Modified:    v2/src/marshal/org/apache/xmlbeans/impl/richParser
                        XMLStreamReaderExt.java XMLStreamReaderExtImpl.java
  Log:
  - added white space style methods for StringValue in the XMLStreamReaderExt interface.
  - added Location info in the InvalidLexicalValueException
  - catch limit cases in numerals parsing
  
  CR: David Bau + info from Scott
  DRT: passing
  
  Revision  Changes    Path
  1.2       +97 -28    xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExt.java
  
  Index: XMLStreamReaderExt.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExt.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLStreamReaderExt.java	2 Dec 2003 22:48:21 -0000	1.1
  +++ XMLStreamReaderExt.java	11 Dec 2003 20:04:35 -0000	1.2
  @@ -1,15 +1,71 @@
  +/*
  +* The Apache Software License, Version 1.1
  +*
  +*
  +* Copyright (c) 2003 The Apache Software Foundation.  All rights
  +* reserved.
  +*
  +* Redistribution and use in source and binary forms, with or without
  +* modification, are permitted provided that the following conditions
  +* are met:
  +*
  +* 1. Redistributions of source code must retain the above copyright
  +*    notice, this list of conditions and the following disclaimer.
  +*
  +* 2. Redistributions in binary form must reproduce the above copyright
  +*    notice, this list of conditions and the following disclaimer in
  +*    the documentation and/or other materials provided with the
  +*    distribution.
  +*
  +* 3. The end-user documentation included with the redistribution,
  +*    if any, must include the following acknowledgment:
  +*       "This product includes software developed by the
  +*        Apache Software Foundation (http://www.apache.org/)."
  +*    Alternately, this acknowledgment may appear in the software itself,
  +*    if and wherever such third-party acknowledgments normally appear.
  +*
  +* 4. The names "Apache" and "Apache Software Foundation" must
  +*    not be used to endorse or promote products derived from this
  +*    software without prior written permission. For written
  +*    permission, please contact apache@apache.org.
  +*
  +* 5. Products derived from this software may not be called "Apache
  +*    XMLBeans", nor may "Apache" appear in their name, without prior
  +*    written permission of the Apache Software Foundation.
  +*
  +* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  +* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  +* DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  +* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  +* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  +* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  +* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  +* SUCH DAMAGE.
  +* ====================================================================
  +*
  +* This software consists of voluntary contributions made by many
  +* individuals on behalf of the Apache Software Foundation and was
  +* originally based on software copyright (c) 2000-2003 BEA Systems
  +* Inc., <http://www.bea.com/>. For more information on the Apache Software
  +* Foundation, please see <http://www.apache.org/>.
  +*/
  +
   package org.apache.xmlbeans.impl.richParser;
   
   import org.apache.xmlbeans.GDate;
   import org.apache.xmlbeans.GDuration;
   import org.apache.xmlbeans.XmlCalendar;
  +import org.apache.xmlbeans.impl.common.XmlWhitespace;
   
   import javax.xml.stream.XMLStreamReader;
   import javax.xml.stream.XMLStreamException;
   import javax.xml.namespace.QName;
   import java.math.BigInteger;
   import java.math.BigDecimal;
  -import java.util.Calendar;
   import java.util.Date;
   import java.io.InputStream;
   
  @@ -31,11 +87,18 @@
   public interface XMLStreamReaderExt
       extends XMLStreamReader
   {
  +     public static final int WS_PRESERVE = XmlWhitespace.WS_PRESERVE;
  +     public static final int WS_REPLACE = XmlWhitespace.WS_REPLACE;
  +     public static final int WS_COLLAPSE = XmlWhitespace.WS_COLLAPSE;
  +
       /** Returns the value as a {@link String}. */
  -    String getStringValue() throws XMLStreamException;
  +    public String getStringValue() throws XMLStreamException;
  +
  +    /** Returns the value as a {@link String}, with wsStyle applied. */
  +    public String getStringValue(int wsStyle) throws XMLStreamException;
   
       /** Returns the value as a boolean. */
  -    boolean getBooleanValue() throws XMLStreamException;
  +    public boolean getBooleanValue() throws XMLStreamException;
   
       /** Returns the value as a byte. */
       public byte getByteValue() throws XMLStreamException;
  @@ -62,31 +125,34 @@
       public double getDoubleValue() throws XMLStreamException;
   
       /** Returns the decoded hexbinary value as an InputStream. */
  -    InputStream getHexBinaryValue() throws XMLStreamException;
  +    public InputStream getHexBinaryValue() throws XMLStreamException;
   
       /** Returns the decoded base64 value as anInputStream. */
  -    InputStream getBase64Value() throws XMLStreamException;
  +    public InputStream getBase64Value() throws XMLStreamException;
   
       /** Returns the value as an XmlCalendar which extends {@link java.util.Calendar}. */
  -    XmlCalendar getCalendarValue() throws XMLStreamException;
  +    public XmlCalendar getCalendarValue() throws XMLStreamException;
   
       /** Returns the value as a {@link java.util.Date}. */
  -    Date getDateValue() throws XMLStreamException;
  +    public Date getDateValue() throws XMLStreamException;
   
       /** Returns the value as a {@link org.apache.xmlbeans.GDate}. */
  -    GDate getGDateValue() throws XMLStreamException;
  +    public GDate getGDateValue() throws XMLStreamException;
   
       /** Returns the value as a {@link org.apache.xmlbeans.GDuration}. */
  -    GDuration getGDurationValue() throws XMLStreamException;
  +    public GDuration getGDurationValue() throws XMLStreamException;
   
       /** Returns the value as a {@link javax.xml.namespace.QName}. */
  -    QName getQNameValue() throws XMLStreamException;
  +    public QName getQNameValue() throws XMLStreamException;
   
       /** Returns the value as a {@link String}. */
  -    String getAttributeStringValue(int index) throws XMLStreamException;
  +    public String getAttributeStringValue(int index) throws XMLStreamException;
  +
  +    /** Returns the value as a {@link String}, with wsStyle applied. */
  +    public String getAttributeStringValue(int index, int wsStyle) throws XMLStreamException;
   
       /** Returns the value as a boolean. */
  -    boolean getAttributeBooleanValue(int index) throws XMLStreamException;
  +    public boolean getAttributeBooleanValue(int index) throws XMLStreamException;
   
       /** Returns the value as a byte. */
       public byte getAttributeByteValue(int index) throws XMLStreamException;
  @@ -113,31 +179,34 @@
       public double getAttributeDoubleValue(int index) throws XMLStreamException;
   
       /** Returns the decoded hexbinary value as an InputStream. */
  -    InputStream getAttributeHexBinaryValue(int index) throws XMLStreamException;
  +    public InputStream getAttributeHexBinaryValue(int index) throws XMLStreamException;
   
       /** Returns the decoded base64 value as anInputStream. */
  -    InputStream getAttributeBase64Value(int index) throws XMLStreamException;
  +    public InputStream getAttributeBase64Value(int index) throws XMLStreamException;
   
       /** Returns the value as an XmlCalendar which extends {@link java.util.Calendar}. */
  -    XmlCalendar getAttributeCalendarValue(int index) throws XMLStreamException;
  +    public XmlCalendar getAttributeCalendarValue(int index) throws XMLStreamException;
   
       /** Returns the value as a {@link java.util.Date}. */
  -    Date getAttributeDateValue(int index) throws XMLStreamException;
  +    public Date getAttributeDateValue(int index) throws XMLStreamException;
   
       /** Returns the value as a {@link org.apache.xmlbeans.GDate}. */
  -    GDate getAttributeGDateValue(int index) throws XMLStreamException;
  +    public GDate getAttributeGDateValue(int index) throws XMLStreamException;
   
       /** Returns the value as a {@link org.apache.xmlbeans.GDuration}. */
  -    GDuration getAttributeGDurationValue(int index) throws XMLStreamException;
  +    public GDuration getAttributeGDurationValue(int index) throws XMLStreamException;
   
       /** Returns the value as a {@link javax.xml.namespace.QName}. */
  -    QName getAttributeQNameValue(int index) throws XMLStreamException;
  +    public QName getAttributeQNameValue(int index) throws XMLStreamException;
   
       /** Returns the value as a {@link String}. */
  -    String getAttributeStringValue(String uri, String local) throws XMLStreamException;
  +    public String getAttributeStringValue(String uri, String local) throws XMLStreamException;
  +
  +    /** Returns the value as a {@link String}, with wsStyle applied. */
  +    public String getAttributeStringValue(String uri, String local, int wsStyle) throws
XMLStreamException;
   
       /** Returns the value as a boolean. */
  -    boolean getAttributeBooleanValue(String uri, String local) throws XMLStreamException;
  +    public boolean getAttributeBooleanValue(String uri, String local) throws XMLStreamException;
   
       /** Returns the value as a byte. */
       public byte getAttributeByteValue(String uri, String local) throws XMLStreamException;
  @@ -164,23 +233,23 @@
       public double getAttributeDoubleValue(String uri, String local) throws XMLStreamException;
   
       /** Returns the decoded hexbinary value as an InputStream. */
  -    InputStream getAttributeHexBinaryValue(String uri, String local) throws XMLStreamException;
  +    public InputStream getAttributeHexBinaryValue(String uri, String local) throws XMLStreamException;
   
       /** Returns the decoded base64 value as anInputStream. */
  -    InputStream getAttributeBase64Value(String uri, String local) throws XMLStreamException;
  +    public InputStream getAttributeBase64Value(String uri, String local) throws XMLStreamException;
   
       /** Returns the value as an XmlCalendar which extends {@link java.util.Calendar}. */
  -    XmlCalendar getAttributeCalendarValue(String uri, String local) throws XMLStreamException;
  +    public XmlCalendar getAttributeCalendarValue(String uri, String local) throws XMLStreamException;
   
       /** Returns the value as a {@link java.util.Date}. */
  -    Date getAttributeDateValue(String uri, String local) throws XMLStreamException;
  +    public Date getAttributeDateValue(String uri, String local) throws XMLStreamException;
   
       /** Returns the value as a {@link org.apache.xmlbeans.GDate}. */
  -    GDate getAttributeGDateValue(String uri, String local) throws XMLStreamException;
  +    public GDate getAttributeGDateValue(String uri, String local) throws XMLStreamException;
   
       /** Returns the value as a {@link org.apache.xmlbeans.GDuration}. */
  -    GDuration getAttributeGDurationValue(String uri, String local) throws XMLStreamException;
  +    public GDuration getAttributeGDurationValue(String uri, String local) throws XMLStreamException;
   
       /** Returns the value as a {@link javax.xml.namespace.QName}. */
  -    QName getAttributeQNameValue(String uri, String local) throws XMLStreamException;
  +    public QName getAttributeQNameValue(String uri, String local) throws XMLStreamException;
   }
  
  
  
  1.2       +242 -55   xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java
  
  Index: XMLStreamReaderExtImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLStreamReaderExtImpl.java	2 Dec 2003 22:48:21 -0000	1.1
  +++ XMLStreamReaderExtImpl.java	11 Dec 2003 20:04:35 -0000	1.2
  @@ -1,3 +1,59 @@
  +/*
  +* The Apache Software License, Version 1.1
  +*
  +*
  +* Copyright (c) 2003 The Apache Software Foundation.  All rights
  +* reserved.
  +*
  +* Redistribution and use in source and binary forms, with or without
  +* modification, are permitted provided that the following conditions
  +* are met:
  +*
  +* 1. Redistributions of source code must retain the above copyright
  +*    notice, this list of conditions and the following disclaimer.
  +*
  +* 2. Redistributions in binary form must reproduce the above copyright
  +*    notice, this list of conditions and the following disclaimer in
  +*    the documentation and/or other materials provided with the
  +*    distribution.
  +*
  +* 3. The end-user documentation included with the redistribution,
  +*    if any, must include the following acknowledgment:
  +*       "This product includes software developed by the
  +*        Apache Software Foundation (http://www.apache.org/)."
  +*    Alternately, this acknowledgment may appear in the software itself,
  +*    if and wherever such third-party acknowledgments normally appear.
  +*
  +* 4. The names "Apache" and "Apache Software Foundation" must
  +*    not be used to endorse or promote products derived from this
  +*    software without prior written permission. For written
  +*    permission, please contact apache@apache.org.
  +*
  +* 5. Products derived from this software may not be called "Apache
  +*    XMLBeans", nor may "Apache" appear in their name, without prior
  +*    written permission of the Apache Software Foundation.
  +*
  +* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  +* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  +* DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  +* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  +* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  +* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  +* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  +* SUCH DAMAGE.
  +* ====================================================================
  +*
  +* This software consists of voluntary contributions made by many
  +* individuals on behalf of the Apache Software Foundation and was
  +* originally based on software copyright (c) 2000-2003 BEA Systems
  +* Inc., <http://www.bea.com/>. For more information on the Apache Software
  +* Foundation, please see <http://www.apache.org/>.
  +*/
  +
   package org.apache.xmlbeans.impl.richParser;
   
   import org.apache.xmlbeans.GDate;
  @@ -9,6 +65,7 @@
   import org.apache.xmlbeans.impl.util.Base64;
   import org.apache.xmlbeans.impl.util.HexBin;
   import org.apache.xmlbeans.impl.common.InvalidLexicalValueException;
  +import org.apache.xmlbeans.impl.common.XmlWhitespace;
   
   import javax.xml.namespace.NamespaceContext;
   import javax.xml.namespace.QName;
  @@ -48,6 +105,13 @@
           return _charSeq.toString();
       }
   
  +    public String getStringValue(int wsStyle)
  +        throws XMLStreamException
  +    {
  +        _charSeq.reload(CharSeqTrimWS.XMLWHITESPACE_PRESERVE);
  +        return XmlWhitespace.collapse(_charSeq.toString(), wsStyle);
  +    }
  +
       public boolean getBooleanValue()
           throws XMLStreamException, InvalidLexicalValueException
       {
  @@ -58,7 +122,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -72,7 +136,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -86,7 +150,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -100,7 +164,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -114,7 +178,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -128,7 +192,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -142,7 +206,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -156,7 +220,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -170,7 +234,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -183,7 +247,7 @@
           if (buf!=null)
               return new ByteArrayInputStream(buf);
           else
  -            throw new InvalidLexicalValueException("invalid hexBinary value");
  +            throw new InvalidLexicalValueException("invalid hexBinary value", _charSeq.getLocation());
       }
   
       public InputStream getBase64Value()
  @@ -195,7 +259,7 @@
           if (buf!=null)
               return new ByteArrayInputStream(buf);
           else
  -            throw new InvalidLexicalValueException("invalid base64Binary value");
  +            throw new InvalidLexicalValueException("invalid base64Binary value", _charSeq.getLocation());
       }
   
       public XmlCalendar getCalendarValue()
  @@ -208,7 +272,7 @@
           }
           catch( IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -222,7 +286,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -236,7 +300,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -250,7 +314,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -258,7 +322,14 @@
           throws XMLStreamException, InvalidLexicalValueException
       {
           _charSeq.reload(CharSeqTrimWS.XMLWHITESPACE_TRIM);
  -        return XsTypeConverter.lexQName(_charSeq, _xmlStream.getNamespaceContext());
  +        try
  +        {
  +            return XsTypeConverter.lexQName(_charSeq, _xmlStream.getNamespaceContext());
  +        }
  +        catch(InvalidLexicalValueException e)
  +        {
  +            throw new InvalidLexicalValueException(e.getMessage(), _charSeq.getLocation());
  +        }
       }
   
       public String getAttributeStringValue(int index) throws XMLStreamException
  @@ -266,6 +337,11 @@
           return _xmlStream.getAttributeValue(index);
       }
   
  +    public String getAttributeStringValue(int index, int wsStyle) throws XMLStreamException
  +    {
  +        return XmlWhitespace.collapse(_xmlStream.getAttributeValue(index), wsStyle);
  +    }
  +
       public boolean getAttributeBooleanValue(int index) throws XMLStreamException
       {
           try
  @@ -274,7 +350,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -286,7 +362,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -298,7 +374,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -310,7 +386,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -322,7 +398,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -334,7 +410,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -346,7 +422,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -358,7 +434,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -370,7 +446,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -381,7 +457,7 @@
           if (buf!=null)
               return new ByteArrayInputStream(buf);
           else
  -            throw new InvalidLexicalValueException("invalid hexBinary value");
  +            throw new InvalidLexicalValueException("invalid hexBinary value", _charSeq.getLocation());
       }
   
       public InputStream getAttributeBase64Value(int index) throws XMLStreamException
  @@ -391,7 +467,7 @@
           if (buf!=null)
               return new ByteArrayInputStream(buf);
           else
  -            throw new InvalidLexicalValueException("invalid base64Binary value");
  +            throw new InvalidLexicalValueException("invalid base64Binary value", _charSeq.getLocation());
       }
   
       public XmlCalendar getAttributeCalendarValue(int index) throws XMLStreamException
  @@ -403,7 +479,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -416,7 +492,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -428,7 +504,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -440,14 +516,21 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
       public QName getAttributeQNameValue(int index) throws XMLStreamException
       {
  -        return XsTypeConverter.lexQName(_charSeq.reloadAtt(index, CharSeqTrimWS.XMLWHITESPACE_TRIM),
  -            _xmlStream.getNamespaceContext());
  +        try
  +        {
  +            return XsTypeConverter.lexQName(_charSeq.reloadAtt(index, CharSeqTrimWS.XMLWHITESPACE_TRIM),
  +                _xmlStream.getNamespaceContext());
  +        }
  +        catch(InvalidLexicalValueException e)
  +        {
  +            throw new InvalidLexicalValueException(e.getMessage(), _charSeq.getLocation());
  +        }
       }
   
       public String getAttributeStringValue(String uri, String local) throws XMLStreamException
  @@ -455,6 +538,11 @@
           return _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_PRESERVE).toString();
       }
   
  +    public String getAttributeStringValue(String uri, String local, int wsStyle) throws
XMLStreamException
  +    {
  +        return XmlWhitespace.collapse(_xmlStream.getAttributeValue(uri, local), wsStyle);
  +    }
  +
       public boolean getAttributeBooleanValue(String uri, String local) throws XMLStreamException
       {
           CharSequence cs = _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM);
  @@ -464,7 +552,7 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -477,7 +565,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -490,7 +578,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -503,7 +591,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -516,7 +604,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -529,7 +617,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -542,7 +630,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -555,7 +643,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -568,7 +656,7 @@
           }
           catch(NumberFormatException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
  @@ -580,7 +668,7 @@
           if (buf!=null)
               return new ByteArrayInputStream(buf);
           else
  -            throw new InvalidLexicalValueException("invalid hexBinary value");
  +            throw new InvalidLexicalValueException("invalid hexBinary value", _charSeq.getLocation());
       }
   
       public InputStream getAttributeBase64Value(String uri, String local) throws XMLStreamException
  @@ -591,7 +679,7 @@
           if (buf!=null)
               return new ByteArrayInputStream(buf);
           else
  -            throw new InvalidLexicalValueException("invalid base64Binary value");
  +            throw new InvalidLexicalValueException("invalid base64Binary value", _charSeq.getLocation());
       }
   
       public XmlCalendar getAttributeCalendarValue(String uri, String local) throws XMLStreamException
  @@ -603,32 +691,59 @@
           }
           catch(IllegalArgumentException e)
           {
  -            throw new InvalidLexicalValueException(e);
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
           }
       }
   
       public Date getAttributeDateValue(String uri, String local) throws XMLStreamException
       {
  -        CharSequence cs = _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM);
  -        return new GDateBuilder(cs).getDate();
  +        try
  +        {
  +            CharSequence cs = _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM);
  +            return new GDateBuilder(cs).getDate();
  +        }
  +        catch(IllegalArgumentException e)
  +        {
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
  +        }
       }
   
       public GDate getAttributeGDateValue(String uri, String local) throws XMLStreamException
       {
  -        CharSequence cs = _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM);
  -        return new GDate(cs);
  +        try
  +        {
  +            CharSequence cs = _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM);
  +            return new GDate(cs);
  +        }
  +        catch(IllegalArgumentException e)
  +        {
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
  +        }
       }
   
       public GDuration getAttributeGDurationValue(String uri, String local) throws XMLStreamException
       {
  -        CharSequence cs = _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM);
  -        return new GDuration(cs);
  +        try
  +        {
  +            return new GDuration(_charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM));
  +        }
  +        catch(IllegalArgumentException e)
  +        {
  +            throw new InvalidLexicalValueException(e, _charSeq.getLocation());
  +        }
       }
   
       public QName getAttributeQNameValue(String uri, String local) throws XMLStreamException
       {
           CharSequence cs = _charSeq.reloadAtt(uri, local, CharSeqTrimWS.XMLWHITESPACE_TRIM);
  -        return XsTypeConverter.lexQName(cs, _xmlStream.getNamespaceContext());
  +        try
  +        {
  +            return XsTypeConverter.lexQName(cs, _xmlStream.getNamespaceContext());
  +        }
  +        catch (InvalidLexicalValueException e)
  +        {
  +            throw new InvalidLexicalValueException(e.getMessage(), _charSeq.getLocation());
  +        }
       }
   
       /**
  @@ -649,6 +764,7 @@
           private String _toStringValue;
           private XMLStreamReader _xmlSteam;
           private boolean _supportForGetTextCharacters = true;
  +        private Location _location;
   
           CharSeqTrimWS(XMLStreamReader xmlSteam)
           {
  @@ -659,6 +775,7 @@
               throws XMLStreamException
           {
               _toStringValue = null;
  +            _location = null;
   
               fillBuffer();
   
  @@ -700,8 +817,12 @@
                   case XMLStreamReader.CDATA:
                   case XMLStreamReader.CHARACTERS:
                   case XMLStreamReader.SPACE:
  +                    if (_location==null)
  +                        _location = copyLocation(_xmlSteam.getLocation());
  +
                       if (depth==0)
                           addTextToBuffer();
  +
                       break;
   
                   case XMLStreamReader.ATTRIBUTE:
  @@ -716,6 +837,9 @@
                       break;
   
                   case XMLStreamReader.END_DOCUMENT:
  +                    if (_location==null)
  +                        _location = copyLocation(_xmlSteam.getLocation());
  +
                       break loop;
   
                   case XMLStreamReader.END_ELEMENT:
  @@ -725,12 +849,18 @@
                       break;
   
                   case XMLStreamReader.ENTITY_REFERENCE:
  +                    if (_location==null)
  +                        _location = copyLocation(_xmlSteam.getLocation());
  +
                       addEntityToBuffer();
                       break;
   
                   case XMLStreamReader.START_ELEMENT:
                       depth++;
                       error = "Unexpected element '" + _xmlSteam.getName() + "' in text content.";
  +                    if (_location==null)
  +                        _location = copyLocation(_xmlSteam.getLocation());
  +
                       break;
                   }
                   eventType = _xmlSteam.next();
  @@ -789,6 +919,7 @@
           CharSequence reloadAtt(int index, int style)
               throws XMLStreamException
           {
  +            _location = copyLocation(_xmlSteam.getLocation());
               String value = _xmlSteam.getAttributeValue(index);
               int length = value.length();
   
  @@ -810,12 +941,14 @@
                   else
                       return value.subSequence(nonWSStart, nonWSEnd);
               }
  +
               throw new IllegalStateException("unknown style");
           }
   
           CharSequence reloadAtt(String uri, String local, int style)
               throws XMLStreamException
           {
  +            _location = copyLocation(_xmlSteam.getLocation());
               String value = _xmlSteam.getAttributeValue(uri, local);
               int length = value.length();
   
  @@ -825,13 +958,13 @@
               }
               else if (style==XMLWHITESPACE_TRIM)
               {
  -                for (_nonWSStart=0; _nonWSStart<_length; _nonWSStart++)
  +                for (_nonWSStart=0; _nonWSStart<length; _nonWSStart++)
                       if (!XMLChar.isSpace(value.charAt(_nonWSStart)))
                           break;
  -                for (_nonWSEnd=_length; _nonWSEnd>_nonWSStart; _nonWSEnd--)
  +                for (_nonWSEnd=length; _nonWSEnd>_nonWSStart; _nonWSEnd--)
                       if (!XMLChar.isSpace(value.charAt(_nonWSEnd-1)))
                           break;
  -                if (_nonWSStart==0 && _nonWSEnd==_length)
  +                if (_nonWSStart==0 && _nonWSEnd==length)
                       return value;
                   else
                       return value.subSequence(_nonWSStart, _nonWSEnd);
  @@ -839,6 +972,11 @@
               throw new IllegalStateException("unknown style");
           }
   
  +        Location getLocation()
  +        {
  +            return _location;
  +        }
  +
           public int length()
           {
               return _nonWSEnd - _nonWSStart;
  @@ -865,6 +1003,55 @@
   
               _toStringValue = new String(_buf, _nonWSStart, _nonWSEnd - _nonWSStart);
               return _toStringValue;
  +        }
  +
  +        private static class ExtLocation implements Location
  +        {
  +            private int _line;
  +            private int _col;
  +            private int _off;
  +            private String _pid;
  +            private String _sid;
  +
  +            ExtLocation(int ln, int cn, int co, String pid, String sid)
  +            {
  +                _line = ln;
  +                _col = cn;
  +                _off = co;
  +                _pid = pid;
  +                _sid = sid;
  +            }
  +
  +            public int getLineNumber()
  +            {
  +                return _line;
  +            }
  +
  +            public int getColumnNumber()
  +            {
  +                return _col;
  +            }
  +
  +            public int getCharacterOffset()
  +            {
  +                return _off;
  +            }
  +
  +            public String getPublicId()
  +            {
  +                return _pid;
  +            }
  +
  +            public String getSystemId()
  +            {
  +                return _sid;
  +            }
  +        }
  +
  +        private static Location copyLocation(Location loc)
  +        {
  +            return new ExtLocation(loc.getLineNumber(), loc.getColumnNumber(), loc.getCharacterOffset(),
  +                loc.getPublicId(), loc.getSystemId());
           }
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org


Mime
View raw message