[Babeldoc-devel] babeldoc/modules/conversion/src/com/babeldoc/conversion/pipeline/stage XlsToXmlPipelineStage.java,1.1,1.2

[<de...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/pipeline/stage
In directory sc8-pr-cvs1:/tmp/cvs-serv29766/modules/conversion/src/com/babeldoc/conversion/pipeline/stage

Modified Files:
	XlsToXmlPipelineStage.java 
Log Message:
Fixed some bugs. Removed some unnecessery stuff

Index: XlsToXmlPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/pipeline/stage/XlsToXmlPipelineStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XlsToXmlPipelineStage.java	17 Jul 2003 14:45:23 -0000	1.1
--- XlsToXmlPipelineStage.java	18 Jul 2003 11:54:49 -0000	1.2
***************
*** 1,11 ****
! /*
!  * Created on Jul 16, 2003
   *
-  * To change this generated comment go to 
-  * Window>Preferences>Java>Code Generation>Code and Comments
   */
  package com.babeldoc.conversion.pipeline.stage;
  
  import java.io.IOException;
  import java.util.Collection;
  import org.apache.poi.hssf.usermodel.HSSFCell;
--- 1,71 ----
! /* ====================================================================
!  * The Apache Software License, Version 1.1
!  *
!  * Copyright (c) 2000 The Apache Software Foundation.  All rights
!  * reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
!  *
!  * 1. Redistributions of source code must retain the above copyright
!  *    notice, this list of conditions and the following disclaimer.
!  *
!  * 2. Redistributions in binary form must reproduce the above copyright
!  *    notice, this list of conditions and the following disclaimer in
!  *    the documentation and/or other materials provided with the
!  *    distribution.
!  *
!  * 3. The end-user documentation included with the redistribution,
!  *    if any, must include the following acknowledgment:
!  *       "This product includes software developed by the
!  *        Apache Software Foundation (http://www.apache.org/)."
!  *    Alternately, this acknowledgment may appear in the software itself,
!  *    if and wherever such third-party acknowledgments normally appear.
!  *
!  * 4. The names "Apache" and "Apache Software Foundation" must
!  *    not be used to endorse or promote products derived from this
!  *    software without prior written permission. For written
!  *    permission, please contact ap...@ap....
!  *
!  * 5. Products derived from this software may not be called "Apache",
!  *    nor may "Apache" appear in their name, without prior written
!  *    permission of the Apache Software Foundation.
!  *
!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
!  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
!  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
!  * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
!  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
!  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
!  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
!  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
!  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
!  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
!  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
!  * SUCH DAMAGE.
!  * ====================================================================
!  *
!  * This software consists of voluntary contributions made by many
!  * individuals on behalf of the Apache Software Foundation.  For more
!  * information on the Apache Software Foundation, please see
!  * <http://www.apache.org/>.
!  *
!  * Portions of this software are based upon public domain software
!  * originally written at the National Center for Supercomputing Applications,
!  * University of Illinois, Urbana-Champaign.
!  * ====================================================================
!  *
!  * Babeldoc:  The Universal Document Processor
!  *
!  * $Header$
!  * $DateTime$
!  * $Author$
   *
   */
  package com.babeldoc.conversion.pipeline.stage;
  
  import java.io.IOException;
+ import java.util.ArrayList;
  import java.util.Collection;
  import org.apache.poi.hssf.usermodel.HSSFCell;
***************
*** 18,22 ****
  import org.dom4j.Element;
  
- import com.babeldoc.core.option.IConfigInfo;
  import com.babeldoc.core.pipeline.PipelineDocument;
  import com.babeldoc.core.pipeline.PipelineException;
--- 78,81 ----
***************
*** 33,39 ****
  public class XlsToXmlPipelineStage extends PipelineStage {
  
! 	public static String DATE_FORMAT = "dd.mm.yyyy";
! 
! 	public XlsToXmlPipelineStage(IConfigInfo info) {
  		super(new PipelineStageInfo() {
  			public String getName() {
--- 92,96 ----
  public class XlsToXmlPipelineStage extends PipelineStage {
  
! 	public XlsToXmlPipelineStage() {
  		super(new PipelineStageInfo() {
  			public String getName() {
***************
*** 46,51 ****
  
  			public Collection getTypeSpecificOptions() {
! 
! 				return null;
  			}
  		});
--- 103,107 ----
  
  			public Collection getTypeSpecificOptions() {
! 				return new ArrayList();
  			}
  		});
***************
*** 92,96 ****
  					if (row == null)
  						continue;
! 					Element rowElement = document.addElement("row");
  					rowElement.addAttribute(
  						"rowNum",
--- 148,152 ----
  					if (row == null)
  						continue;
! 					Element rowElement = sheetElement.addElement("row");
  					rowElement.addAttribute(
  						"rowNum",
***************
*** 107,114 ****
  						cellCount++;
  						Element cellElement = rowElement.addElement("cell");
! 						cellElement.addAttribute("colNum", String.valueOf(p));
! 						cellElement.addAttribute(
! 							"col",
! 							String.valueOf(cell.getCellNum()));
  
  						int cellType = cell.getCellType();
--- 163,167 ----
  						cellCount++;
  						Element cellElement = rowElement.addElement("cell");
! 						cellElement.addAttribute("colNum", String.valueOf(p));						
  
  						int cellType = cell.getCellType();
***************
*** 143,151 ****
  					String.valueOf(rowCount));
  			}
! 
  			PipelineDocument doc =
  				new PipelineDocument(
  					this.getDocument(),
! 					document.toString().getBytes());
  			return processHelper(doc);
  		} catch (IOException e) {
--- 196,204 ----
  					String.valueOf(rowCount));
  			}
! 			
  			PipelineDocument doc =
  				new PipelineDocument(
  					this.getDocument(),
! 						document.asXML().getBytes());
  			return processHelper(doc);
  		} catch (IOException e) {