Index: .classpath =================================================================== RCS file: /home/cvspublic/jakarta-poi/.classpath,v retrieving revision 1.3 diff -u -r1.3 .classpath --- .classpath 1 Jan 2003 09:24:39 -0000 1.3 +++ .classpath 3 Mar 2003 14:06:50 -0000 @@ -3,8 +3,37 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/java/org/apache/poi/hssf/model/Workbook.java =================================================================== RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/model/Workbook.java,v retrieving revision 1.26 diff -u -r1.26 Workbook.java --- src/java/org/apache/poi/hssf/model/Workbook.java 1 Mar 2003 17:32:26 -0000 1.26 +++ src/java/org/apache/poi/hssf/model/Workbook.java 3 Mar 2003 14:06:50 -0000 @@ -428,6 +428,8 @@ // for compatibility public void setSheetName(int sheetnum, String sheetname ) { setSheetName( sheetnum, sheetname, (byte)0 ); + + } public void setSheetName(int sheetnum, String sheetname, short encoding ) { @@ -450,6 +452,14 @@ //remove the sheet that needs to be reordered and place it in the spot we want boundsheets.add(pos, boundsheets.remove(sheetNumber)); } + + /** + * sets the order of appearance for a given sheet. + * + * @param sheetname the name of the sheet to reorder + * @param pos the position that we want to insert the sheet into (0 based) + */ + /** * gets the name for a given sheet. Index: src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java =================================================================== RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java,v retrieving revision 1.20 diff -u -r1.20 HSSFWorkbook.java --- src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java 6 Feb 2003 10:29:45 -0000 1.20 +++ src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java 3 Mar 2003 14:06:51 -0000 @@ -251,6 +251,21 @@ public final static byte ENCODING_COMPRESSED_UNICODE = 0; public final static byte ENCODING_UTF_16 = 1; + + + /** + * sets the order of appearance for a given sheet. + * + * @param sheetname the name of the sheet to reorder + * @param pos the position that we want to insert the sheet into (0 based) + */ + + public void setSheetOrder(String sheetname, int pos ) { + + //remove the sheet that needs to be reordered and place it in the spot we want + workbook.setSheetOrder(sheetname, 0); + } + /** * set the sheet name. Index: src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetSetOrder.java =================================================================== RCS file: src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetSetOrder.java diff -N src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetSetOrder.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetSetOrder.java 3 Mar 2003 14:06:51 -0000 @@ -0,0 +1,99 @@ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * 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: + * + * 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" 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. + * + * 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 + * . + */ + +package org.apache.poi.hssf.usermodel; + +import junit.framework.TestCase; + +import org.apache.poi.hssf.model.Sheet; + +/** + * Tests HSSFWorkbook method setSheetOrder() + * + * + * @author Ruel Loehr (loehr1 at us.ibm.com) + */ + +public class TestHSSFSheetSetOrder + extends TestCase +{ + public TestHSSFSheetSetOrder(String s) + { + super(s); + } + + /** + * Test the sheet set order method + */ + + public void testBackupRecord() + throws Exception + { + HSSFWorkbook wb = new HSSFWorkbook(); + + for (int i=0; i < 10; i++) + { + HSSFSheet s = wb.createSheet("Sheet " + i); + Sheet sheet = s.getSheet(); + } + + wb.getWorkbook().setSheetOrder("Sheet 6", 0); + wb.getWorkbook().setSheetOrder("Sheet 3", 7); + wb.getWorkbook().setSheetOrder("Sheet 1", 9); + + + } + + +} Index: tools/cents/checkstyle.cent.jar =================================================================== RCS file: tools/cents/checkstyle.cent.jar diff -N tools/cents/checkstyle.cent.jar Binary files /dev/null and checkstyle.cent.jar differ Index: tools/cents/forrest.cent/tasks.properties =================================================================== RCS file: tools/cents/forrest.cent/tasks.properties diff -N tools/cents/forrest.cent/tasks.properties --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tools/cents/forrest.cent/tasks.properties 3 Mar 2003 14:06:52 -0000 @@ -0,0 +1,2 @@ + +#forrest tasks Index: tools/cents/forrest.cent/xbuild.xml =================================================================== RCS file: tools/cents/forrest.cent/xbuild.xml diff -N tools/cents/forrest.cent/xbuild.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tools/cents/forrest.cent/xbuild.xml 3 Mar 2003 14:06:52 -0000 @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: tools/cents/junit.cent/tasks.properties =================================================================== RCS file: tools/cents/junit.cent/tasks.properties diff -N tools/cents/junit.cent/tasks.properties --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tools/cents/junit.cent/tasks.properties 3 Mar 2003 14:06:52 -0000 @@ -0,0 +1,4 @@ +#junit tasks +junit2=org.apache.tools.ant.taskdefs.optional.junit.JUnitTask +junitreport=org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator + Index: tools/cents/junit.cent/xbuild.xml =================================================================== RCS file: tools/cents/junit.cent/xbuild.xml diff -N tools/cents/junit.cent/xbuild.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tools/cents/junit.cent/xbuild.xml 3 Mar 2003 14:06:53 -0000 @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +