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

donaldp     03/10/31 17:21:04

  Modified:    sandbox/metaclass/src/java/org/realityforge/metaclass/io
                        MetaClassIO.java MetaClassIOXml.java
  Log:
  Rework so IO classes can throw any exception
  
  Revision  Changes    Path
  1.6       +5 -6      spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/MetaClassIO.java
  
  Index: MetaClassIO.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/MetaClassIO.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MetaClassIO.java	28 Sep 2003 03:53:00 -0000	1.5
  +++ MetaClassIO.java	1 Nov 2003 01:21:04 -0000	1.6
  @@ -7,7 +7,6 @@
    */
   package org.realityforge.metaclass.io;
   
  -import java.io.IOException;
   import java.io.InputStream;
   import java.io.OutputStream;
   import org.realityforge.metaclass.model.ClassDescriptor;
  @@ -17,7 +16,7 @@
    * descriptors into Input and Output streams.
    *
    * @author <a href="mailto:doug at [email protected]">Doug Hagan</a>
  - * @version $Revision: 1.5 $ $Date: 2003/09/28 03:53:00 $
  + * @version $Revision: 1.6 $ $Date: 2003/11/01 01:21:04 $
    */
   public interface MetaClassIO
   {
  @@ -26,18 +25,18 @@
        *
        * @param input the input stream
        * @return the ClassDescriptor
  -     * @throws IOException if unable ot read class descriptor
  +     * @throws Exception if unable ot read class descriptor
        */
       ClassDescriptor deserializeClass( InputStream input )
  -        throws IOException;
  +        throws Exception;
   
       /**
        * Write a ClassDescriptor to an output stream.
        *
        * @param output the stream to write class descriptor out to
        * @param info the ClassDescriptor to write out
  -     * @throws IOException if unable ot write class descriptor
  +     * @throws Exception if unable ot write class descriptor
        */
       void serializeClass( OutputStream output, ClassDescriptor info )
  -        throws IOException;
  +        throws Exception;
   }
  
  
  
  1.9       +4 -25     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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MetaClassIOXml.java	1 Nov 2003 00:04:53 -0000	1.8
  +++ MetaClassIOXml.java	1 Nov 2003 01:21:04 -0000	1.9
  @@ -7,7 +7,6 @@
    */
   package org.realityforge.metaclass.io;
   
  -import java.io.IOException;
   import java.io.InputStream;
   import java.io.OutputStream;
   import java.util.Properties;
  @@ -20,14 +19,13 @@
   import javax.xml.transform.stream.StreamResult;
   import org.realityforge.metaclass.model.ClassDescriptor;
   import org.w3c.dom.Document;
  -import org.xml.sax.SAXException;
   
   /**
    * This is a utility class that writes out the ClassDescriptor
    * to a stream using the xml format outlined in documentation.
    *
    * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
  - * @version $Revision: 1.8 $ $Date: 2003/11/01 00:04:53 $
  + * @version $Revision: 1.9 $ $Date: 2003/11/01 01:21:04 $
    */
   public class MetaClassIOXml
       implements MetaClassIO
  @@ -111,20 +109,13 @@
        * @see MetaClassIO#deserializeClass
        */
       public ClassDescriptor deserializeClass( final InputStream input )
  -        throws IOException
  +        throws Exception
       {
           final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
  -        try
  -        {
               final DocumentBuilder builder = factory.newDocumentBuilder();
               final Document document = builder.parse( input );
               final DOMMetaClassDeserializer deserializer = new DOMMetaClassDeserializer();
               return deserializer.buildClassDescriptor( document );
  -        }
  -        catch( final Exception e )
  -        {
  -            throw new IOException( e.getMessage() );
  -        }
       }
   
       /**
  @@ -132,20 +123,12 @@
        */
       public void serializeClass( final OutputStream output,
                                   final ClassDescriptor descriptor )
  -        throws IOException
  +        throws Exception
       {
           final StreamResult result = new StreamResult( output );
           final SAXTransformerFactory factory =
               (SAXTransformerFactory)TransformerFactory.newInstance();
  -        final TransformerHandler handler;
  -        try
  -        {
  -            handler = factory.newTransformerHandler();
  -        }
  -        catch( final Exception e )
  -        {
  -            throw new IOException( e.toString() );
  -        }
  +        final TransformerHandler handler = factory.newTransformerHandler();
   
           final Properties format = new Properties();
           format.put( OutputKeys.METHOD, "xml" );
  @@ -157,10 +140,6 @@
           try
           {
               serializer.serialize( handler, descriptor );
  -        }
  -        catch( final SAXException se )
  -        {
  -            throw new IOException( se.getMessage() );
           }
           finally
           {
  
  
  


-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/