Menu
▾
▴
[Babeldoc-devel] babeldoc/modules/conversion/src/com/babeldoc/conversion ConversionClient.java,1.6,1.7 ConversionException.java,1.2,1.3 ConversionUnmarshaller.java,1.2,1.3 FieldData.java,1.2,1.3 LineSegmentData.java,1.2,1.3
Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion
In directory sc8-pr-cvs1:/tmp/cvs-serv29412/src/com/babeldoc/conversion
Modified Files:
ConversionClient.java ConversionException.java
ConversionUnmarshaller.java FieldData.java
LineSegmentData.java
Log Message:
Reformatted and changed the license header - also added javadoc comments.
Index: ConversionClient.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/ConversionClient.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ConversionClient.java 22 May 2003 03:02:49 -0000 1.6
--- ConversionClient.java 27 Jun 2003 01:44:06 -0000 1.7
***************
*** 1,30 ****
! /*
! * $Header$
! * $DateTime: 2002/07/24 01:14:28 $
*
*
! * babeldoc: universal document processor
*
! * This program is free software; you can redistribute it and/or
! * modify it under the terms of the GNU General Public License
! * as published by the Free Software Foundation; either version 2
[...1066 lines suppressed...]
- * @param options the options to access
- */
- public void setupCommandLine(Options options) {
- super.setupCommandLine(options);
- LogService.getInstance();
- options.addOption(OptionBuilder.isRequired().hasArg(true).withDescription(I18n.get("conversion.010")).withLongOpt("file").create('f'));
- options.addOption(OptionBuilder.isRequired().hasArg(true).withDescription(I18n.get("conversion.011")).withLongOpt("config").create('c'));
- }
-
- /**
- * Main
- *
- * @param args the arguments
- */
- public static void main(String[] args) {
- new ConversionClient(args);
- }
}
-
--- 676,678 ----
Index: ConversionException.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/ConversionException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConversionException.java 15 Mar 2003 23:45:31 -0000 1.2
--- ConversionException.java 27 Jun 2003 01:44:06 -0000 1.3
***************
*** 1,26 ****
! /*
! * $Header$
! * $DateTime: 2002/07/24 18:15:55 $
*
*
! * babeldoc: universal document processor
*
! * This program is free software; you can redistribute it and/or
! * modify it under the terms of the GNU General Public License
! * as published by the Free Software Foundation; either version 2
! * of the License, or (at your option) any later version.
*
! * This program is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package com.babeldoc.conversion;
-
/**
* Conversion exception. Simplistic overload of GeneralException.
--- 1,69 ----
! /* ====================================================================
! * 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;
/**
* Conversion exception. Simplistic overload of GeneralException.
***************
*** 29,35 ****
* @version 1.0
*/
! public class ConversionException
! extends com.babeldoc.core.GeneralException {
!
/**
* Conversion exception
--- 72,76 ----
* @version 1.0
*/
! public class ConversionException extends com.babeldoc.core.GeneralException {
/**
* Conversion exception
***************
*** 53,57 ****
/**
* Conversion exception
- *
*/
public ConversionException() {
--- 94,97 ----
Index: ConversionUnmarshaller.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/ConversionUnmarshaller.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConversionUnmarshaller.java 15 Mar 2003 23:45:31 -0000 1.2
--- ConversionUnmarshaller.java 27 Jun 2003 01:44:06 -0000 1.3
***************
*** 1,22 ****
! /*
! * $Header$
! * $DateTime$
*
*
! * babeldoc: universal document processor
*
! * This program is free software; you can redistribute it and/or
! * modify it under the terms of the GNU General Public License
! * as published by the Free Software Foundation; either version 2
! * of the License, or (at your option) any later version.
*
! * This program is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package com.babeldoc.conversion;
--- 1,66 ----
! /* ====================================================================
! * 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;
***************
*** 24,31 ****
/**
* Interface that conversion unmarshallers must implement. The definitive
! * implementation of this class is DigesterConversionUnmarshaller. No
! * further implementations are necessary and certainly not planned. The reason
! * for this class stems from when the old SAX based conversion unmarshaller
! * was replaced with the new digester and I needed to swap the two interchangeably.
*
* @author bmcdonald
--- 68,76 ----
/**
* Interface that conversion unmarshallers must implement. The definitive
! * implementation of this class is DigesterConversionUnmarshaller. No further
! * implementations are necessary and certainly not planned. The reason for
! * this class stems from when the old SAX based conversion unmarshaller was
! * replaced with the new digester and I needed to swap the two
! * interchangeably.
*
* @author bmcdonald
***************
*** 33,39 ****
*/
public interface ConversionUnmarshaller {
! /**
! * What kind of file is this?
! */
public static final int CSV_CONVERSION = 0;
public static final int LINE_CONVERSION = 1;
--- 78,82 ----
*/
public interface ConversionUnmarshaller {
! /** What kind of file is this? */
public static final int CSV_CONVERSION = 0;
public static final int LINE_CONVERSION = 1;
***************
*** 49,119 ****
/**
! * Get the lines to skip
*
* @return
*/
! public int getTopSkip();
/**
! * get the characters to skip from the left
*
* @return
*/
! public int getLeftMargin();
/**
! * Get the field separator for csv fields.
*
* @return
*/
! public String getFieldSeparator();
/**
! * get the line separator
*
* @return
*/
! public String getLineSeparator();
/**
! * get the row element
*
* @return
*/
! public String getRowElement();
/**
! * Get the root element
*
* @return
*/
! public String getRootElement();
/**
! * get the interparagraph skip
*
* @return
*/
! public int getInterParagraphSkip();
/**
! * Get the lines per para
*
* @return
*/
! public int getLinesPerPara();
/**
! * Get the field data
*
* @return
*/
! public FieldData[] getFields();
/**
! * Get the line segments.
*
* @return
*/
! public LineSegmentData[] getLineSegments();
}
--- 92,162 ----
/**
! * Get the field separator for csv fields.
*
* @return
*/
! public String getFieldSeparator();
/**
! * Get the field data
*
* @return
*/
! public FieldData[] getFields();
/**
! * get the interparagraph skip
*
* @return
*/
! public int getInterParagraphSkip();
/**
! * get the characters to skip from the left
*
* @return
*/
! public int getLeftMargin();
/**
! * Get the line segments.
*
* @return
*/
! public LineSegmentData[] getLineSegments();
/**
! * get the line separator
*
* @return
*/
! public String getLineSeparator();
/**
! * Get the lines per para
*
* @return
*/
! public int getLinesPerPara();
/**
! * Get the root element
*
* @return
*/
! public String getRootElement();
/**
! * get the row element
*
* @return
*/
! public String getRowElement();
/**
! * Get the lines to skip
*
* @return
*/
! public int getTopSkip();
}
Index: FieldData.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/FieldData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FieldData.java 15 Mar 2003 23:45:31 -0000 1.2
--- FieldData.java 27 Jun 2003 01:44:06 -0000 1.3
***************
*** 1,22 ****
! /*
! * $Header$
! * $DateTime: 2002/07/24 01:14:28 $
*
*
! * babeldoc: universal document processor
*
! * This program is free software; you can redistribute it and/or
! * modify it under the terms of the GNU General Public License
! * as published by the Free Software Foundation; either version 2
! * of the License, or (at your option) any later version.
*
! * This program is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package com.babeldoc.conversion;
--- 1,66 ----
! /* ====================================================================
! * 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;
***************
*** 24,30 ****
import org.apache.commons.lang.builder.ToStringBuilder;
/**
! * Simple utility class to hold all the field data. This is one of the
! * two main data objects in the conversion process.
*
* @author Bmcdonald
--- 68,75 ----
import org.apache.commons.lang.builder.ToStringBuilder;
+
/**
! * Simple utility class to hold all the field data. This is one of the two
! * main data objects in the conversion process.
*
* @author Bmcdonald
***************
*** 33,40 ****
public class FieldData {
public String name;
- public int row;
public int column;
- public int width;
public int number;
/**
--- 78,85 ----
public class FieldData {
public String name;
public int column;
public int number;
+ public int row;
+ public int width;
/**
***************
*** 44,53 ****
*/
public String toString() {
! return new ToStringBuilder(this).
! append("name", name).
! append("row", row).
! append("column", column).
! append("width", width).
! append("number", number).toString();
}
}
--- 89,96 ----
*/
public String toString() {
! return new ToStringBuilder(this).append("name", name).append("row", row)
! .append("column", column)
! .append("width", width)
! .append("number", number).toString();
}
}
Index: LineSegmentData.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/LineSegmentData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LineSegmentData.java 15 Mar 2003 23:45:31 -0000 1.2
--- LineSegmentData.java 27 Jun 2003 01:44:06 -0000 1.3
***************
*** 1,22 ****
! /*
! * $Header$
! * $DateTime: 2002/07/24 01:14:28 $
*
*
! * babeldoc: universal document processor
*
! * This program is free software; you can redistribute it and/or
! * modify it under the terms of the GNU General Public License
! * as published by the Free Software Foundation; either version 2
! * of the License, or (at your option) any later version.
*
! * This program is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package com.babeldoc.conversion;
--- 1,66 ----
! /* ====================================================================
! * 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;
***************
*** 24,30 ****
import org.apache.commons.lang.builder.ToStringBuilder;
/**
! * Hold the configuration for each of the line segments. This one of the
! * two main data objects in the conversion process.
*
* @author Bmcdonald
--- 68,75 ----
import org.apache.commons.lang.builder.ToStringBuilder;
+
/**
! * Hold the configuration for each of the line segments. This one of the two
! * main data objects in the conversion process.
*
* @author Bmcdonald
***************
*** 32,43 ****
*/
public class LineSegmentData {
public String name;
- public int column;
- public int width;
- public int conversionType;
- public String value;
public String startGroup;
! public String endGroup;
public FieldData[] fields;
/**
--- 77,88 ----
*/
public class LineSegmentData {
+ public String endGroup;
public String name;
public String startGroup;
! public String value;
public FieldData[] fields;
+ public int column;
+ public int conversionType;
+ public int width;
/**
***************
*** 47,59 ****
*/
public String toString() {
! return new ToStringBuilder(this).
! append("name", name).
! append("column", column).
! append("width", width).
! append("conversionType", conversionType).
! append("value", value).
! append("startGroup", startGroup).
! append("endGroup", endGroup).
! append("fields", fields).toString();
}
}
--- 92,103 ----
*/
public String toString() {
! return new ToStringBuilder(this).append("name", name)
! .append("column", column)
! .append("width", width)
! .append("conversionType", conversionType)
! .append("value", value)
! .append("startGroup", startGroup)
! .append("endGroup", endGroup)
! .append("fields", fields).toString();
}
}
|
