[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/io/xml XMLFileReader.java, 1.9, 1.10 XMLFileWriter.java, 1.8, 1.9

[Suresh <sur...@us...>]

Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/xml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28614

Modified Files:
	XMLFileReader.java XMLFileWriter.java 
Log Message:
no message

Index: XMLFileReader.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/xml/XMLFileReader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** XMLFileReader.java	12 Jun 2006 20:59:02 -0000	1.9
--- XMLFileReader.java	13 Jun 2006 22:10:19 -0000	1.10
***************
*** 10,17 ****
  
  package org.jmonks.batchserver.io.xml;
- 
- import java.io.FileNotFoundException;
  import java.io.InputStream;
  import java.io.InputStreamReader;
  import java.util.ArrayList;
  import java.util.HashMap;
--- 10,16 ----
  
  package org.jmonks.batchserver.io.xml;
  import java.io.InputStream;
  import java.io.InputStreamReader;
+ import java.io.Reader;
  import java.util.ArrayList;
  import java.util.HashMap;
***************
*** 74,78 ****
       *                  with the element specified in file spec and problems to initializes the reader.
       */
!     public XMLFileReader(InputStream filInputStream,FileSpec fileSpec)
      {
          logger.trace("Entering XMLFileReader constructor");
--- 73,91 ----
       *                  with the element specified in file spec and problems to initializes the reader.
       */
!     public XMLFileReader(InputStream fileInputStream,FileSpec fileSpec)
!     {
!         this(new InputStreamReader(fileInputStream),fileSpec);
!     }
! 
!     /**
!      *  Constructs and initializes the XML File reader.
!      *
!      *  @param  reader    Reader to the file.
!      *  @param  fileSpec    File spec to be used to read the file.
!      *
!      *  @throws org.jmonks.batchserver.io.FileParseException    If root element doesnt match
!      *                  with the element specified in file spec and problems to initializes the reader.
!      */
!     public XMLFileReader(Reader reader,FileSpec fileSpec)
      {
          logger.trace("Entering XMLFileReader constructor");
***************
*** 81,85 ****
          {
              XMLInputFactory inputFactory=XMLInputFactory.newInstance();
!             reader=inputFactory.createXMLEventReader(new InputStreamReader(filInputStream));
              logger.debug("Created the XML Event reader");
               if(this.validateRootElement())
--- 94,98 ----
          {
              XMLInputFactory inputFactory=XMLInputFactory.newInstance();
!             this.reader=inputFactory.createXMLEventReader(reader);
              logger.debug("Created the XML Event reader");
               if(this.validateRootElement())
***************
*** 87,91 ****
               else
              {
!                 reader.close();            
                  throw new FileParseException("Unexpected root element found. Expecting the root element " + this.fileSpec.getRootElement());            
              }
--- 100,104 ----
               else
              {
!                 this.reader.close();            
                  throw new FileParseException("Unexpected root element found. Expecting the root element " + this.fileSpec.getRootElement());            
              }
***************
*** 101,105 ****
          logger.trace("Exiting XMLFileReader constructor");
      }
! 
      /**
       *  Gets the next available record from the file. If file doesnt have any more
--- 114,118 ----
          logger.trace("Exiting XMLFileReader constructor");
      }
!     
      /**
       *  Gets the next available record from the file. If file doesnt have any more

Index: XMLFileWriter.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/xml/XMLFileWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** XMLFileWriter.java	13 Jun 2006 04:02:33 -0000	1.8
--- XMLFileWriter.java	13 Jun 2006 22:10:19 -0000	1.9
***************
*** 11,14 ****
--- 11,16 ----
  package org.jmonks.batchserver.io.xml;
  import java.io.OutputStream;
+ import java.io.OutputStreamWriter;
+ import java.io.Writer;
  import java.util.ArrayList;
  import java.util.HashMap;
***************
*** 64,67 ****
--- 66,80 ----
      public XMLFileWriter(OutputStream outputStream,FileSpec fileSpec)
      {
+         this(new OutputStreamWriter(outputStream), fileSpec);
+     }
+ 
+     /**
+      *  Constructs and initializes the writer with the given values.
+      *
+      *  @param  writer    Writer to write the records.
+      *  @param  fileSpec    File spec to be used to generate the file.
+      */
+     public XMLFileWriter(Writer writer,FileSpec fileSpec)
+     {
          logger.trace("Entering XMLFileWriter constructor");
          try
***************
*** 69,77 ****
              this.fileSpec=(XMLFileSpec)fileSpec;
              XMLOutputFactory outputFactory=XMLOutputFactory.newInstance();
!             writer=outputFactory.createXMLStreamWriter(outputStream);
              logger.debug("Writer has been created.");
!             writer.writeStartDocument("ISO-8859-1", "1.0");
!             writer.writeCharacters(indentationEngine.startElement());
!             writer.writeStartElement(this.fileSpec.rootElement);
          }
          catch(XMLStreamException exception)
--- 82,90 ----
              this.fileSpec=(XMLFileSpec)fileSpec;
              XMLOutputFactory outputFactory=XMLOutputFactory.newInstance();
!             this.writer=outputFactory.createXMLStreamWriter(writer);
              logger.debug("Writer has been created.");
!             this.writer.writeStartDocument("ISO-8859-1", "1.0");
!             this.writer.writeCharacters(indentationEngine.startElement());
!             this.writer.writeStartElement(this.fileSpec.rootElement);
          }
          catch(XMLStreamException exception)
***************
*** 83,87 ****
          logger.trace("Exiting XMLFileWriter constructor");
      }
! 
      /**
       *  Writes the record into the file. This record should be obtained from
--- 96,100 ----
          logger.trace("Exiting XMLFileWriter constructor");
      }
!     
      /**
       *  Writes the record into the file. This record should be obtained from
***************
*** 326,330 ****
           *  @return Returns the list.
           */
!         public List writeRepeatElement(String fieldName)
          {
              if(fieldName==null)
--- 339,343 ----
           *  @return Returns the list.
           */
!         public List createRepeatElement(String fieldName)
          {
              if(fieldName==null)