xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z...@apache.org
Subject cvs commit: xml-xmlbeans/v2/test/src/drt/drtcases MarshalTests.java
Date Wed, 17 Dec 2003 15:54:27 GMT
zieg        2003/12/17 07:54:27

  Modified:    v2/src/marshal/org/apache/xmlbeans/impl/marshal
                        MarshallerImpl.java TypeMarshaller.java
               v2/src/xmlpublic/org/apache/xmlbeans Marshaller.java
               v2/test/src/drt/drtcases MarshalTests.java
  Log:
  fix spelling of marshal method
  
  Revision  Changes    Path
  1.10      +10 -11    xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/MarshallerImpl.java
  
  Index: MarshallerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/MarshallerImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MarshallerImpl.java	16 Dec 2003 05:59:47 -0000	1.9
  +++ MarshallerImpl.java	17 Dec 2003 15:54:27 -0000	1.10
  @@ -106,8 +106,8 @@
           namespaceContext.openScope();
       }
   
  -    public XMLStreamReader marshall(Object obj,
  -                                    NamespaceContext nscontext)
  +    public XMLStreamReader marshal(Object obj,
  +                                   NamespaceContext nscontext)
           throws XmlException
       {
   
  @@ -139,10 +139,10 @@
           return new MarshalResult(prop, obj, this);
       }
   
  -    public void marshall(XMLStreamWriter writer, Object obj)
  +    public void marshal(XMLStreamWriter writer, Object obj)
           throws XmlException
       {
  -        XMLStreamReader rdr = marshall(obj, writer.getNamespaceContext());
  +        XMLStreamReader rdr = marshal(obj, writer.getNamespaceContext());
           try {
               XmlReaderToWriter.writeAll(rdr, writer);
           }
  @@ -151,17 +151,17 @@
           }
       }
   
  -    public void marshall(OutputStream out, Object obj)
  +    public void marshal(OutputStream out, Object obj)
           throws XmlException
       {
           String encoding = (String)options.get(XmlOptions.CHARACTER_ENCODING);
           if (encoding != null) {
  -            marshall(out, obj, encoding);
  +            marshal(out, obj, encoding);
           } else {
               try {
                   final XMLOutputFactory xof = XMLOutputFactory.newInstance();
                   final XMLStreamWriter writer = xof.createXMLStreamWriter(out);
  -                marshall(writer, obj);
  +                marshal(writer, obj);
               }
               catch (XMLStreamException e) {
                   throw new XmlException(e);
  @@ -169,7 +169,7 @@
           }
       }
   
  -    public void marshall(OutputStream out, Object obj, String encoding)
  +    public void marshal(OutputStream out, Object obj, String encoding)
           throws XmlException
       {
           if (encoding == null) {
  @@ -181,7 +181,7 @@
               XMLStreamWriter writer =
                   output_factory.createXMLStreamWriter(out, encoding);
               writer.writeStartDocument(encoding, XML_VERSION);
  -            marshall(writer, obj);
  +            marshal(writer, obj);
               writer.writeEndDocument();
               writer.close();
           }
  @@ -315,8 +315,7 @@
           do {
               prefix = NSPREFIX + (++prefixCnt);
               testuri = namespaceContext.getNamespaceURI(prefix);
  -        }
  -        while (testuri != null);
  +        } while (testuri != null);
           assert prefix != null;
           namespaceContext.bindNamespace(prefix, uri);
           return prefix;
  
  
  
  1.5       +1 -1      xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/TypeMarshaller.java
  
  Index: TypeMarshaller.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/TypeMarshaller.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TypeMarshaller.java	15 Dec 2003 05:03:30 -0000	1.4
  +++ TypeMarshaller.java	17 Dec 2003 15:54:27 -0000	1.5
  @@ -58,7 +58,7 @@
   
   
   /**
  - * A TypeMarshaller knows how to marshall a java object into xml.
  + * A TypeMarshaller knows how to marshal a java object into xml.
    */
   interface TypeMarshaller
   {
  
  
  
  1.6       +5 -5      xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/Marshaller.java
  
  Index: Marshaller.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/Marshaller.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Marshaller.java	16 Dec 2003 05:59:47 -0000	1.5
  +++ Marshaller.java	17 Dec 2003 15:54:27 -0000	1.6
  @@ -88,8 +88,8 @@
        * @return  XMLStreamReader representing the XML content
        * @throws XmlException
        */
  -    XMLStreamReader marshall(Object obj,
  -                             NamespaceContext nscontext)
  +    XMLStreamReader marshal(Object obj,
  +                            NamespaceContext nscontext)
           throws XmlException;
   
       /**
  @@ -106,7 +106,7 @@
        * @param writer
        * @throws XmlException
        */
  -    void marshall(XMLStreamWriter writer, Object obj)
  +    void marshal(XMLStreamWriter writer, Object obj)
           throws XmlException;
   
   
  @@ -124,7 +124,7 @@
        * @param obj
        * @throws XmlException
        */
  -    void marshall(OutputStream out, Object obj)
  +    void marshal(OutputStream out, Object obj)
           throws XmlException;
   
   
  @@ -142,7 +142,7 @@
        * @param encoding      encoding used when writing the document
        * @throws XmlException
        */
  -    void marshall(OutputStream out, Object obj, String encoding)
  +    void marshal(OutputStream out, Object obj, String encoding)
           throws XmlException;
   
   
  
  
  
  1.22      +2 -2      xml-xmlbeans/v2/test/src/drt/drtcases/MarshalTests.java
  
  Index: MarshalTests.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/test/src/drt/drtcases/MarshalTests.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- MarshalTests.java	16 Dec 2003 05:59:47 -0000	1.21
  +++ MarshalTests.java	17 Dec 2003 15:54:27 -0000	1.22
  @@ -297,7 +297,7 @@
           Marshaller ctx =
               bindingContext.createMarshaller(options);
   
  -        ctx.marshall(w, mc);
  +        ctx.marshal(w, mc);
   
           //now unmarshall from String and compare objects...
           StringReader sr = new StringReader(sw.getBuffer().toString());
  @@ -339,7 +339,7 @@
               bindingContext.createMarshaller(options);
   
           final String encoding = "UTF-16";
  -        ctx.marshall(baos, mc, encoding);
  +        ctx.marshal(baos, mc, encoding);
           baos.close();
           final byte[] buf = baos.toByteArray();
           System.out.println("Doc="+new String(buf, encoding));
  
  
  

---------------------------------------------------------------------
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