[Babeldoc-devel] babeldoc/modules/conversion/src/com/babeldoc/conversion/digester DigesterConversionUnmarshaller.java,1.5,1.6

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/digester
In directory sc8-pr-cvs1:/tmp/cvs-serv23796

Modified Files:
	DigesterConversionUnmarshaller.java 
Log Message:
Bad imports, etc fixed.

Index: DigesterConversionUnmarshaller.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/digester/DigesterConversionUnmarshaller.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DigesterConversionUnmarshaller.java	27 Jun 2003 01:44:07 -0000	1.5
--- DigesterConversionUnmarshaller.java	30 Jul 2003 23:14:05 -0000	1.6
***************
*** 66,74 ****
  package com.babeldoc.conversion.digester;
  
- import com.babeldoc.conversion.ConversionUnmarshaller;
- import com.babeldoc.conversion.FieldData;
- import com.babeldoc.conversion.LineSegmentData;
- 
  import com.babeldoc.core.I18n;
  
  import org.apache.commons.digester.Digester;
--- 66,73 ----
  package com.babeldoc.conversion.digester;
  
  import com.babeldoc.core.I18n;
+ import com.babeldoc.conversion.flatfile.FieldData;
+ import com.babeldoc.conversion.flatfile.LineSegmentData;
+ import com.babeldoc.conversion.flatfile.ConversionUnmarshaller;
  
  import org.apache.commons.digester.Digester;
***************
*** 94,101 ****
   * @version 1.0
   */
! public class DigesterConversionUnmarshaller implements ConversionUnmarshaller {
    private Conversion conversion;
!   private FieldData[] fields = null;
!   private LineSegmentData[] lineSegments = null;
    public static final String DEFAULT_CSV_SEPARATOR = ",";
    public static final String DEFAULT_LINE_SEPARATOR = "\n";
--- 93,100 ----
   * @version 1.0
   */
! public class DigesterConversionUnmarshaller implements com.babeldoc.conversion.flatfile.ConversionUnmarshaller {
    private Conversion conversion;
!   private com.babeldoc.conversion.flatfile.FieldData[] fields = null;
!   private com.babeldoc.conversion.flatfile.LineSegmentData[] lineSegments = null;
    public static final String DEFAULT_CSV_SEPARATOR = ",";
    public static final String DEFAULT_LINE_SEPARATOR = "\n";
***************
*** 225,236 ****
          lineSegments[i] = new LineSegmentData();
  
!         LineSegment inLineSegment = ((LineSegment) (conversion.getLineSegments()
!                                                               .get(i)));
          lineSegments[i].name = inLineSegment.getSegmentName();
          lineSegments[i].value = inLineSegment.getSegmentValue();
!         lineSegments[i].column = NumberUtils.stringToInt(inLineSegment.getSegmentColumn(),
!             0);
!         lineSegments[i].width = NumberUtils.stringToInt(inLineSegment.getSegmentWidth(),
!             0);
          lineSegments[i].endGroup = inLineSegment.getEndGroupName();
          lineSegments[i].startGroup = inLineSegment.getBeginGroupName();
--- 224,232 ----
          lineSegments[i] = new LineSegmentData();
  
!         LineSegment inLineSegment = ((LineSegment) (conversion.getLineSegments().get(i)));
          lineSegments[i].name = inLineSegment.getSegmentName();
          lineSegments[i].value = inLineSegment.getSegmentValue();
!         lineSegments[i].column = NumberUtils.stringToInt(inLineSegment.getSegmentColumn(), 0);
!         lineSegments[i].width = NumberUtils.stringToInt(inLineSegment.getSegmentWidth(), 0);
          lineSegments[i].endGroup = inLineSegment.getEndGroupName();
          lineSegments[i].startGroup = inLineSegment.getBeginGroupName();