[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/io/xml XMLFileReader.java, 1.7, 1.8 XMLFileSpec.java, 1.3, 1.4 XMLFileWriter.java, 1.5, 1.6 XMLRecordSpec.java, 1.3, 1.4

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

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

Modified Files:
	XMLFileReader.java XMLFileSpec.java XMLFileWriter.java 
	XMLRecordSpec.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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XMLFileReader.java	9 Jun 2006 21:36:34 -0000	1.7
--- XMLFileReader.java	10 Jun 2006 17:51:54 -0000	1.8
***************
*** 284,289 ****
                      EndElement endElement=(EndElement)reader.nextEvent();
                      isPreviousElementStart=false;
!                     if(recordElement.equalsIgnoreCase(endElement.getName().getLocalPart()))
                          break;
                      else
                      {
--- 284,294 ----
                      EndElement endElement=(EndElement)reader.nextEvent();
                      isPreviousElementStart=false;
!                     if(recordElement.equalsIgnoreCase(endElement.getName().getLocalPart()) && elementStack.capacity()==0)
!                     {
!                         /**
!                          *  End element name matches the starting element name of this record and no elements in stack.
!                          */
                          break;
+                     }
                      else
                      {
***************
*** 393,397 ****
           *  @return Returns the value associated with this element.
           */        
!         public ReaderRecord readCompositeElement(String elementName)
          {
              return (ReaderRecord)fieldMap.get(elementName);
--- 398,402 ----
           *  @return Returns the value associated with this element.
           */        
!         public ReaderRecord readComplexElement(String elementName)
          {
              return (ReaderRecord)fieldMap.get(elementName);
***************
*** 405,409 ****
           *  @return Returns the value associated with this element.
           */        
!         public List readMutlipleElements(String elementName)
          {
              Object fieldValue=this.fieldMap.get(elementName);
--- 410,414 ----
           *  @return Returns the value associated with this element.
           */        
!         public List readRepeatElement(String elementName)
          {
              Object fieldValue=this.fieldMap.get(elementName);

Index: XMLFileWriter.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/xml/XMLFileWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** XMLFileWriter.java	9 Jun 2006 21:36:34 -0000	1.5
--- XMLFileWriter.java	10 Jun 2006 17:51:54 -0000	1.6
***************
*** 105,109 ****
                  int index=recordXpath.lastIndexOf('/');
                  String recordElement=recordXpath.substring(((index!=-1)?(index+1):0));
!                 writeCompositeElement(recordElement, record);
                  writer.flush();
              }
--- 105,109 ----
                  int index=recordXpath.lastIndexOf('/');
                  String recordElement=recordXpath.substring(((index!=-1)?(index+1):0));
!                 writeComplexElement(recordElement, record);
                  writer.flush();
              }
***************
*** 141,145 ****
       *  @param  fieldValueAsRecord  Value of the nested element.
       */    
!     protected void writeCompositeElement(String recordElementName,XMLWriterRecord fieldValueAsRecord) throws XMLStreamException
      {
          indentationEngine.startElement();
--- 141,145 ----
       *  @param  fieldValueAsRecord  Value of the nested element.
       */    
!     protected void writeComplexElement(String recordElementName,XMLWriterRecord fieldValueAsRecord) throws XMLStreamException
      {
          indentationEngine.startElement();
***************
*** 151,159 ****
              if(fieldValue instanceof XMLWriterRecord)
              {
!                 writeCompositeElement(fieldName, (XMLWriterRecord)fieldValue);
              }
              else if(fieldValue instanceof List)
              {
!                 writeMlutipleElements(fieldName, (List)fieldValue);
              }
              else
--- 151,159 ----
              if(fieldValue instanceof XMLWriterRecord)
              {
!                 writeComplexElement(fieldName, (XMLWriterRecord)fieldValue);
              }
              else if(fieldValue instanceof List)
              {
!                 writeRepeatElement(fieldName, (List)fieldValue);
              }
              else
***************
*** 172,176 ****
       *  @param  fieldValueAsList  Value of the repeated element.
       */        
!     protected void writeMlutipleElements(String multiElementName,List fieldValueAsList) throws XMLStreamException
      {
          List multiElementList=(List)fieldValueAsList;
--- 172,176 ----
       *  @param  fieldValueAsList  Value of the repeated element.
       */        
!     protected void writeRepeatElement(String multiElementName,List fieldValueAsList) throws XMLStreamException
      {
          List multiElementList=(List)fieldValueAsList;
***************
*** 180,188 ****
              if(fieldValue instanceof XMLWriterRecord)
              {
!                 writeCompositeElement(multiElementName, (XMLWriterRecord)fieldValue);
              }
              else if(fieldValue instanceof List)
              {
!                 writeMlutipleElements(multiElementName, (List)fieldValue);
              }
              else
--- 180,188 ----
              if(fieldValue instanceof XMLWriterRecord)
              {
!                 writeComplexElement(multiElementName, (XMLWriterRecord)fieldValue);
              }
              else if(fieldValue instanceof List)
              {
!                 writeRepeatElement(multiElementName, (List)fieldValue);
              }
              else
***************
*** 288,292 ****
           *  Write nested/composite element into the record.
           */        
!         public void writeCompositeElement(String fieldName, WriterRecord fieldValue)
          {
              this.fieldMap.put(fieldName, fieldValue);
--- 288,292 ----
           *  Write nested/composite element into the record.
           */        
!         public void writeComplexElement(String fieldName, WriterRecord fieldValue)
          {
              this.fieldMap.put(fieldName, fieldValue);
***************
*** 299,303 ****
           *  @param  fieldValue   Value of the field repated more than once.
           */
!         public void writeMultiElement(String fieldName, List fieldValue)
          {
              this.fieldMap.put(fieldName, fieldValue);
--- 299,303 ----
           *  @param  fieldValue   Value of the field repated more than once.
           */
!         public void writeRepeatElement(String fieldName, List fieldValue)
          {
              this.fieldMap.put(fieldName, fieldValue);

Index: XMLFileSpec.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/xml/XMLFileSpec.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLFileSpec.java	9 Jun 2006 21:36:34 -0000	1.3
--- XMLFileSpec.java	10 Jun 2006 17:51:54 -0000	1.4
***************
*** 26,32 ****
--- 26,34 ----
   *  </p>
   *  <p>
+  *  <pre>
   *      &lt;file-spec file-type="xml" root-element="consumer-request"&gt;
   *          &lt;!-- record specs will follow here --&gt;
   *      &lt;/file-spec&gt;
+  *  </pre>
   *  </p>
   *

Index: XMLRecordSpec.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/io/xml/XMLRecordSpec.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLRecordSpec.java	8 Jun 2006 22:21:15 -0000	1.3
--- XMLRecordSpec.java	10 Jun 2006 17:51:54 -0000	1.4
***************
*** 26,32 ****
--- 26,34 ----
   *  </p>
   *  <p>
+  *  <pre>
   *      &lt;file-spec file-type="xml" root-element="consumer-request"&gt;
   *          &lt;record-spec record-type="detail" record-xpath="/consumer-request/consumer-add"/&gt;
   *      &lt;/file-spec&gt;
+  *  </pre>
   *  </p>
   *