cvs commit: spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io MetaClassIOXml.java SAXMetaClassSerializer.java

donaldp     03/10/27 21:20:53

  Modified:    sandbox/metaclass/src/java/org/realityforge/metaclass/io
                        MetaClassIOXml.java SAXMetaClassSerializer.java
  Log:
  Add support for writing XML descriptors and fully unit test the serializer
  
  Revision  Changes    Path
  1.3       +2 -2      spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/MetaClassIOXml.java
  
  Index: MetaClassIOXml.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/MetaClassIOXml.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MetaClassIOXml.java	28 Oct 2003 02:20:59 -0000	1.2
  +++ MetaClassIOXml.java	28 Oct 2003 05:20:52 -0000	1.3
  @@ -25,7 +25,7 @@
    * to a stream using the xml format outlined in documentation.
    *
    * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
  - * @version $Revision: 1.2 $ $Date: 2003/10/28 02:20:59 $
  + * @version $Revision: 1.3 $ $Date: 2003/10/28 05:20:52 $
    */
   public class MetaClassIOXml
      implements MetaClassIO
  @@ -73,7 +73,7 @@
         final SAXMetaClassSerializer serializer = new SAXMetaClassSerializer();
         try
         {
  -         serializer.serialize( descriptor, handler );
  +         serializer.serialize( handler, descriptor );
         }
         catch( final SAXException se )
         {
  
  
  
  1.5       +8 -8      spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/SAXMetaClassSerializer.java
  
  Index: SAXMetaClassSerializer.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/SAXMetaClassSerializer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SAXMetaClassSerializer.java	28 Oct 2003 04:23:14 -0000	1.4
  +++ SAXMetaClassSerializer.java	28 Oct 2003 05:20:52 -0000	1.5
  @@ -21,7 +21,7 @@
    * to a SAX2 compliant ContentHandler.
    *
    * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
  - * @version $Revision: 1.4 $ $Date: 2003/10/28 04:23:14 $
  + * @version $Revision: 1.5 $ $Date: 2003/10/28 05:20:52 $
    */
   public class SAXMetaClassSerializer
   {
  @@ -108,12 +108,12 @@
       * @param descriptor the ClassDescriptor
       * @throws SAXException if error during serilization
       */
  -   public void serialize( final ClassDescriptor descriptor,
  -                          final ContentHandler handler )
  +   public void serialize( final ContentHandler handler,
  +                          final ClassDescriptor descriptor )
         throws SAXException
      {
         handler.startDocument();
  -      serializeClass( descriptor, handler );
  +      serializeClass( handler, descriptor );
         handler.endDocument();
      }
   
  @@ -124,8 +124,8 @@
       * @param descriptor the ClassDescriptor
       * @throws SAXException if error during serilization
       */
  -   void serializeClass( final ClassDescriptor descriptor,
  -                        final ContentHandler handler )
  +   void serializeClass( final ContentHandler handler,
  +                        final ClassDescriptor descriptor)
         throws SAXException
      {
         final AttributesImpl atts = new AttributesImpl();
  @@ -174,7 +174,7 @@
      {
         final AttributesImpl atts = new AttributesImpl();
         add( atts, NAME_ATTRIBUTE, descriptor.getName() );
  -      add( atts, TYPE_ATTRIBUTE, descriptor.getName() );
  +      add( atts, TYPE_ATTRIBUTE, descriptor.getType() );
         start( handler, FIELD_ELEMENT, atts );
         serializeAttributes( handler, descriptor.getAttributes() );
         end( handler, FIELD_ELEMENT );
  @@ -216,7 +216,7 @@
      {
         final AttributesImpl atts = new AttributesImpl();
         add( atts, NAME_ATTRIBUTE, descriptor.getName() );
  -      add( atts, TYPE_ATTRIBUTE, descriptor.getName() );
  +      add( atts, TYPE_ATTRIBUTE, descriptor.getReturnType() );
         start( handler, METHOD_ELEMENT, atts );
         serializeParameters( handler, descriptor.getParameters() );
         serializeAttributes( handler, descriptor.getAttributes() );
  
  
  


-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/