diff --git a/src/java/org/apache/poi/dev/RecordGenerator.java b/src/java/org/apache/poi/dev/RecordGenerator.java index f2eba6d3b3..d69d3e216f 100644 --- a/src/java/org/apache/poi/dev/RecordGenerator.java +++ b/src/java/org/apache/poi/dev/RecordGenerator.java @@ -1,57 +1,57 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 +/* + * ==================================================================== + * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights - * reserved. + * Copyright (c) 2002 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: + * 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. + * 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. + * 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. + * 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" and - * "Apache POI" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact apache@apache.org. + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache POI" must not be used to endorse or promote products + * derived from this software without prior written permission. For + * written permission, please contact apache@apache.org. * - * 5. Products derived from this software may not be called "Apache", - * "Apache POI", nor may "Apache" appear in their name, without - * prior written permission of the Apache Software Foundation. + * 5. Products derived from this software may not be called "Apache", + * "Apache POI", 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 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 - * . + * 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 + * . */ - package org.apache.poi.dev; import org.w3c.dom.Document; @@ -61,38 +61,53 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.io.File; -public class RecordGenerator -{ +/** + * Description of the Class + * + *@author andy + *@created May 10, 2002 + */ +public class RecordGenerator { + /** + * The main program for the RecordGenerator class + * + *@param args The command line arguments + *@exception Exception Description of the Exception + */ public static void main(String[] args) - throws Exception - { + throws Exception { // Force load so that we don't start generating records and realise this hasn't compiled yet. Class.forName("org.apache.poi.generator.FieldIterator"); - if (args.length != 4) - { + if (args.length != 4) { System.out.println("Usage:"); System.out.println(" java org.apache.poi.hssf.util.RecordGenerator RECORD_DEFINTIONS RECORD_STYLES DEST_SRC_PATH TEST_SRC_PATH"); - } else - { + } else { generateRecords(args[0], args[1], args[2], args[3]); } } + + /** + * Description of the Method + * + *@param defintionsDir Description of the Parameter + *@param recordStyleDir Description of the Parameter + *@param destSrcPathDir Description of the Parameter + *@param testSrcPathDir Description of the Parameter + *@exception Exception Description of the Exception + */ private static void generateRecords(String defintionsDir, String recordStyleDir, String destSrcPathDir, String testSrcPathDir) - throws Exception - { + throws Exception { File definitionsFile = new File(defintionsDir); - for (int i = 0; i < definitionsFile.listFiles().length; i++) - { + for (int i = 0; i < definitionsFile.listFiles().length; i++) { File file = definitionsFile.listFiles()[i]; if (file.isFile() && (file.getName().endsWith("_record.xml") || file.getName().endsWith("_type.xml") ) - ) - { + ) { // Get record name and package DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -111,8 +126,8 @@ public class RecordGenerator destinationPathFile.mkdirs(); String destinationFilepath = destinationPath + "/" + recordName + suffix + ".java"; String args[] = new String[]{"-in", file.getAbsolutePath(), "-xsl", recordStyleDir + "/" + extendstg.toLowerCase() + ".xsl", - "-out", destinationFilepath, - "-TEXT"}; + "-out", destinationFilepath, + "-TEXT"}; org.apache.xalan.xslt.Process.main(args); System.out.println("Generated " + suffix + ": " + destinationFilepath); @@ -122,17 +137,15 @@ public class RecordGenerator destinationPathFile = new File(destinationPath); destinationPathFile.mkdirs(); destinationFilepath = destinationPath + "/Test" + recordName + suffix + ".java"; - if (new File(destinationFilepath).exists() == false) - { + if (new File(destinationFilepath).exists() == false) { String temp = (recordStyleDir + "/" + extendstg.toLowerCase() + "_test.xsl"); args = new String[]{"-in", file.getAbsolutePath(), "-xsl", - temp, - "-out", destinationFilepath, - "-TEXT"}; + temp, + "-out", destinationFilepath, + "-TEXT"}; org.apache.xalan.xslt.Process.main(args); System.out.println("Generated test: " + destinationFilepath); - } else - { + } else { System.out.println("Skipped test generation: " + destinationFilepath); } } diff --git a/src/records/definitions/series_text_record.xml b/src/records/definitions/series_text_record.xml index ae5bd94a96..ed527768ef 100644 --- a/src/records/definitions/series_text_record.xml +++ b/src/records/definitions/series_text_record.xml @@ -10,10 +10,10 @@ - - + + - + diff --git a/src/records/styles/record.xsl b/src/records/styles/record.xsl index c29df3eb5d..1f62a6537e 100644 --- a/src/records/styles/record.xsl +++ b/src/records/styles/record.xsl @@ -266,7 +266,7 @@ public class Record - buffer.append(" . = ") + buffer.append(" . = ") .append("0x") .append(HexDump.toHex(()get())) .append(" (").append(get()).append(" )\n"); diff --git a/src/records/styles/record_test.xsl b/src/records/styles/record_test.xsl index 3fa969061c..1f53562ef8 100644 --- a/src/records/styles/record_test.xsl +++ b/src/records/styles/record_test.xsl @@ -90,7 +90,7 @@ public class TestRecord Record record = new Record((short), (short)data.length, data); - + assertEquals( "", record.get()); assertEquals( (byte), record.get()); @@ -115,7 +115,7 @@ public class TestRecord - + record.set( "" ); record.set( (byte) );