You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2014/10/06 15:20:13 UTC
svn commit: r1629644 - in /poi/trunk: ./ moretests/ moretests/org/
moretests/org/apache/ moretests/org/apache/poi/
src/java/org/apache/poi/hssf/record/ src/java/org/apache/poi/hssf/usermodel/
src/java/org/apache/poi/ss/formula/ptg/ src/java/org/apache/...
Author: centic
Date: Mon Oct 6 13:20:12 2014
New Revision: 1629644
URL: http://svn.apache.org/r1629644
Log:
Print out current version of java before building to allow to see in build output if we use a supported Java VM version
Added:
poi/trunk/moretests/
poi/trunk/moretests/org/
poi/trunk/moretests/org/apache/
poi/trunk/moretests/org/apache/poi/
Removed:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/DummyGraphics2d.java
Modified:
poi/trunk/ (props changed)
poi/trunk/build.xml
poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
poi/trunk/test-data/spreadsheet/SampleSS.xlsx
Propchange: poi/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 6 13:20:12 2014
@@ -14,3 +14,4 @@ untitled1.jpx
log*.*
dist
*.log
+bin
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Mon Oct 6 13:20:12 2014
@@ -362,6 +362,8 @@ under the License.
<mkdir dir="${examples.output.dir}"/>
<mkdir dir="${dist.dir}"/>
<mkdir dir="${build.site}"/>
+
+ <echo message="Using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}" />
</target>
<target name="clean">
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java Mon Oct 6 13:20:12 2014
@@ -17,10 +17,10 @@
package org.apache.poi.hssf.record;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.ss.formula.Formula;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.HexDump;
@@ -136,7 +136,8 @@ public final class FormulaRecord extends
};
return new SpecialCachedValue(vd);
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuffer sb = new StringBuffer(64);
sb.append(getClass().getName());
sb.append('[').append(formatValue()).append(']');
@@ -319,7 +320,8 @@ public final class FormulaRecord extends
field_8_parsed_expr = Formula.create(ptgs);
}
- public short getSid() {
+ @Override
+ public short getSid() {
return sid;
}
@@ -372,7 +374,8 @@ public final class FormulaRecord extends
}
}
- public Object clone() {
+ @Override
+ public Object clone() {
FormulaRecord rec = new FormulaRecord();
copyBaseFields(rec);
rec.field_4_value = field_4_value;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java Mon Oct 6 13:20:12 2014
@@ -94,10 +94,12 @@ public final class RKRecord extends Cell
return 4;
}
+ @Override
public short getSid() {
return sid;
}
+ @Override
public Object clone() {
RKRecord rec = new RKRecord();
copyBaseFields(rec);
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java Mon Oct 6 13:20:12 2014
@@ -132,6 +132,9 @@ public class HSSFComment extends HSSFTex
CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) getObjRecord().getSubRecords().get(0);
cod.setObjectId((short) (shapeId % 1024));
_note.setShapeId(shapeId % 1024);
+ /* This breaks TestCloneSheets!
+ * cod.setObjectId(shapeId);
+ _note.setShapeId(shapeId); */
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java Mon Oct 6 13:20:12 2014
@@ -51,7 +51,8 @@ public class HSSFFormulaEvaluator implem
/**
* @deprecated (Sep 2008) HSSFSheet parameter is ignored
*/
- public HSSFFormulaEvaluator(HSSFSheet sheet, HSSFWorkbook workbook) {
+ @Deprecated
+ public HSSFFormulaEvaluator(HSSFSheet sheet, HSSFWorkbook workbook) {
this(workbook);
if (false) {
sheet.toString(); // suppress unused parameter compiler warning
@@ -104,10 +105,12 @@ public class HSSFFormulaEvaluator implem
CollaboratingWorkbooksEnvironment.setup(workbookNames, wbEvals);
}
- public void setupReferencedWorkbooks(Map<String, FormulaEvaluator> evaluators) {
+ @Override
+ public void setupReferencedWorkbooks(Map<String, FormulaEvaluator> evaluators) {
CollaboratingWorkbooksEnvironment.setupFormulaEvaluator(evaluators);
}
+ @Override
public WorkbookEvaluator _getWorkbookEvaluator() {
return _bookEvaluator;
}
@@ -116,7 +119,8 @@ public class HSSFFormulaEvaluator implem
* Does nothing
* @deprecated (Aug 2008) - not needed, since the current row can be derived from the cell
*/
- public void setCurrentRow(HSSFRow row) {
+ @Deprecated
+ public void setCurrentRow(HSSFRow row) {
// do nothing
if (false) {
row.getClass(); // suppress unused parameter compiler warning
@@ -131,7 +135,8 @@ public class HSSFFormulaEvaluator implem
* Failure to call this method after changing cell values will cause incorrect behaviour
* of the evaluate~ methods of this class
*/
- public void clearAllCachedResultValues() {
+ @Override
+ public void clearAllCachedResultValues() {
_bookEvaluator.clearAllCachedResultValues();
}
/**
@@ -143,6 +148,7 @@ public class HSSFFormulaEvaluator implem
public void notifyUpdateCell(HSSFCell cell) {
_bookEvaluator.notifyUpdateCell(new HSSFEvaluationCell(cell));
}
+ @Override
public void notifyUpdateCell(Cell cell) {
_bookEvaluator.notifyUpdateCell(new HSSFEvaluationCell((HSSFCell)cell));
}
@@ -155,7 +161,8 @@ public class HSSFFormulaEvaluator implem
public void notifyDeleteCell(HSSFCell cell) {
_bookEvaluator.notifyDeleteCell(new HSSFEvaluationCell(cell));
}
- public void notifyDeleteCell(Cell cell) {
+ @Override
+ public void notifyDeleteCell(Cell cell) {
_bookEvaluator.notifyDeleteCell(new HSSFEvaluationCell((HSSFCell)cell));
}
@@ -165,7 +172,8 @@ public class HSSFFormulaEvaluator implem
* Failure to call this method after changing cell values will cause incorrect behaviour
* of the evaluate~ methods of this class
*/
- public void notifySetFormula(Cell cell) {
+ @Override
+ public void notifySetFormula(Cell cell) {
_bookEvaluator.notifyUpdateCell(new HSSFEvaluationCell((HSSFCell)cell));
}
@@ -179,7 +187,8 @@ public class HSSFFormulaEvaluator implem
* @param cell may be <code>null</code> signifying that the cell is not present (or blank)
* @return <code>null</code> if the supplied cell is <code>null</code> or blank
*/
- public CellValue evaluate(Cell cell) {
+ @Override
+ public CellValue evaluate(Cell cell) {
if (cell == null) {
return null;
}
@@ -217,7 +226,8 @@ public class HSSFFormulaEvaluator implem
* @param cell The cell to evaluate
* @return -1 for non-formula cells, or the type of the <em>formula result</em>
*/
- public int evaluateFormulaCell(Cell cell) {
+ @Override
+ public int evaluateFormulaCell(Cell cell) {
if (cell == null || cell.getCellType() != HSSFCell.CELL_TYPE_FORMULA) {
return -1;
}
@@ -242,7 +252,8 @@ public class HSSFFormulaEvaluator implem
* result of the formula. If you simply want the formula
* value computed for you, use {@link #evaluateFormulaCell(Cell)}}
*/
- public HSSFCell evaluateInCell(Cell cell) {
+ @Override
+ public HSSFCell evaluateInCell(Cell cell) {
if (cell == null) {
return null;
}
@@ -350,7 +361,8 @@ public class HSSFFormulaEvaluator implem
* This is a helpful wrapper around looping over all
* cells, and calling evaluateFormulaCell on each one.
*/
- public void evaluateAll() {
+ @Override
+public void evaluateAll() {
evaluateAllFormulaCells(_book, this);
}
@@ -379,11 +391,13 @@ public class HSSFFormulaEvaluator implem
}
/** {@inheritDoc} */
+ @Override
public void setIgnoreMissingWorkbooks(boolean ignore){
_bookEvaluator.setIgnoreMissingWorkbooks(ignore);
}
/** {@inheritDoc} */
+ @Override
public void setDebugEvaluationOutputForNextEval(boolean value){
_bookEvaluator.setDebugEvaluationOutputForNextEval(value);
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java Mon Oct 6 13:20:12 2014
@@ -43,27 +43,31 @@ abstract class Ref2DPtgBase extends RefP
super(cr);
}
- public void write(LittleEndianOutput out) {
+ @Override
+ public void write(LittleEndianOutput out) {
out.writeByte(getSid() + getPtgClass());
writeCoordinates(out);
}
- public final String toFormulaString() {
+ @Override
+ public final String toFormulaString() {
return formatReferenceAsString();
}
protected abstract byte getSid();
- public final int getSize() {
+ @Override
+ public final int getSize() {
return SIZE;
}
- public final String toString() {
- StringBuffer sb = new StringBuffer();
- sb.append(getClass().getName());
- sb.append(" [");
- sb.append(formatReferenceAsString());
- sb.append("]");
- return sb.toString();
- }
+ @Override
+ public final String toString() {
+ StringBuffer sb = new StringBuffer();
+ sb.append(getClass().getName());
+ sb.append(" [");
+ sb.append(formatReferenceAsString());
+ sb.append("]");
+ return sb.toString();
+ }
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java Mon Oct 6 13:20:12 2014
@@ -111,7 +111,8 @@ public abstract class RefPtgBase extends
return cr.formatAsString();
}
- public final byte getDefaultOperandClass() {
+ @Override
+ public final byte getDefaultOperandClass() {
return Ptg.CLASS_REF;
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java Mon Oct 6 13:20:12 2014
@@ -95,7 +95,9 @@ public interface FormulaEvaluator {
* and the result. If you want the cell replaced with
* the result of the formula, use {@link #evaluateInCell(Cell)}
* @param cell The cell to evaluate
- * @return The type of the formula result (the cell's type remains as Cell.CELL_TYPE_FORMULA however)
+ * @return The type of the formula result, i.e. -1 if the cell is not a formula,
+ * or one of Cell.CELL_TYPE_NUMERIC, Cell.CELL_TYPE_STRING, Cell.CELL_TYPE_BOOLEAN, Cell.CELL_TYPE_ERROR
+ * Note: the cell's type remains as Cell.CELL_TYPE_FORMULA however.
*/
int evaluateFormulaCell(Cell cell);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java Mon Oct 6 13:20:12 2014
@@ -287,9 +287,9 @@ public class SXSSFWorkbook implements Wo
SheetDataWriter createSheetDataWriter() throws IOException {
if(_compressTmpFiles) {
return new GZIPSheetDataWriter(_sharedStringSource);
- } else {
- return new SheetDataWriter(_sharedStringSource);
}
+
+ return new SheetDataWriter(_sharedStringSource);
}
XSSFSheet getXSSFSheet(SXSSFSheet sheet)
@@ -331,7 +331,6 @@ public class SXSSFWorkbook implements Wo
ZipOutputStream zos = new ZipOutputStream(out);
try
{
- @SuppressWarnings("unchecked")
Enumeration<ZipEntry> en = (Enumeration<ZipEntry>) zip.entries();
while (en.hasMoreElements())
{
@@ -490,6 +489,7 @@ public class SXSSFWorkbook implements Wo
*
* @return the index of the active sheet (0-based)
*/
+ @Override
public int getActiveSheetIndex()
{
return _wb.getActiveSheetIndex();
@@ -502,6 +502,7 @@ public class SXSSFWorkbook implements Wo
*
* @param sheetIndex index of the active sheet (0-based)
*/
+ @Override
public void setActiveSheet(int sheetIndex)
{
_wb.setActiveSheet(sheetIndex);
@@ -512,6 +513,7 @@ public class SXSSFWorkbook implements Wo
*
* @return the first tab that to display in the list of tabs (0-based).
*/
+ @Override
public int getFirstVisibleTab()
{
return _wb.getFirstVisibleTab();
@@ -522,6 +524,7 @@ public class SXSSFWorkbook implements Wo
*
* @param sheetIndex the first tab that to display in the list of tabs (0-based)
*/
+ @Override
public void setFirstVisibleTab(int sheetIndex)
{
_wb.setFirstVisibleTab(sheetIndex);
@@ -533,6 +536,7 @@ public class SXSSFWorkbook implements Wo
* @param sheetname the name of the sheet to reorder
* @param pos the position that we want to insert the sheet into (0 based)
*/
+ @Override
public void setSheetOrder(String sheetname, int pos)
{
_wb.setSheetOrder(sheetname,pos);
@@ -547,6 +551,7 @@ public class SXSSFWorkbook implements Wo
* @see Sheet#setSelected(boolean)
* @param index the index of the sheet to select (0 based)
*/
+ @Override
public void setSelectedTab(int index)
{
_wb.setSelectedTab(index);
@@ -558,6 +563,7 @@ public class SXSSFWorkbook implements Wo
* @param sheet number (0 based)
* @throws IllegalArgumentException if the name is greater than 31 chars or contains <code>/\?*[]</code>
*/
+ @Override
public void setSheetName(int sheet, String name)
{
_wb.setSheetName(sheet,name);
@@ -569,6 +575,7 @@ public class SXSSFWorkbook implements Wo
* @param sheet sheet number (0 based)
* @return Sheet name
*/
+ @Override
public String getSheetName(int sheet)
{
return _wb.getSheetName(sheet);
@@ -580,6 +587,7 @@ public class SXSSFWorkbook implements Wo
* @param name the sheet name
* @return index of the sheet (0 based)
*/
+ @Override
public int getSheetIndex(String name)
{
return _wb.getSheetIndex(name);
@@ -591,6 +599,7 @@ public class SXSSFWorkbook implements Wo
* @param sheet the sheet to look up
* @return index of the sheet (0 based)
*/
+ @Override
public int getSheetIndex(Sheet sheet)
{
return _wb.getSheetIndex(getXSSFSheet((SXSSFSheet)sheet));
@@ -602,6 +611,7 @@ public class SXSSFWorkbook implements Wo
*
* @return Sheet representing the new sheet.
*/
+ @Override
public Sheet createSheet()
{
return createAndRegisterSXSSFSheet(_wb.createSheet());
@@ -629,6 +639,7 @@ public class SXSSFWorkbook implements Wo
* @return Sheet representing the new sheet.
* @throws IllegalArgumentException if the name is greater than 31 chars or contains <code>/\?*[]</code>
*/
+ @Override
public Sheet createSheet(String sheetname)
{
return createAndRegisterSXSSFSheet(_wb.createSheet(sheetname));
@@ -639,6 +650,7 @@ public class SXSSFWorkbook implements Wo
*
* @return Sheet representing the cloned sheet.
*/
+ @Override
public Sheet cloneSheet(int sheetNum)
{
throw new RuntimeException("NotImplemented");
@@ -650,6 +662,7 @@ public class SXSSFWorkbook implements Wo
*
* @return the number of sheets
*/
+ @Override
public int getNumberOfSheets()
{
return _wb.getNumberOfSheets();
@@ -661,6 +674,7 @@ public class SXSSFWorkbook implements Wo
* @param index of the sheet number (0-based physical & logical)
* @return Sheet at the provided index
*/
+ @Override
public Sheet getSheetAt(int index)
{
return getSXSSFSheet(_wb.getSheetAt(index));
@@ -672,6 +686,7 @@ public class SXSSFWorkbook implements Wo
* @param name of the sheet
* @return Sheet with the name provided or <code>null</code> if it does not exist
*/
+ @Override
public Sheet getSheet(String name)
{
return getSXSSFSheet(_wb.getSheet(name));
@@ -682,6 +697,7 @@ public class SXSSFWorkbook implements Wo
*
* @param index of the sheet to remove (0-based)
*/
+ @Override
public void removeSheetAt(int index)
{
XSSFSheet xSheet=_wb.getSheetAt(index);
@@ -717,6 +733,8 @@ public class SXSSFWorkbook implements Wo
* @deprecated use {@link SXSSFSheet#setRepeatingRows(CellRangeAddress)}
* or {@link SXSSFSheet#setRepeatingColumns(CellRangeAddress)}
*/
+ @Deprecated
+ @Override
public void setRepeatingRowsAndColumns(int sheetIndex, int startColumn, int endColumn, int startRow, int endRow)
{
_wb.setRepeatingRowsAndColumns(sheetIndex,startColumn,endColumn,startRow,endRow);
@@ -727,6 +745,7 @@ public class SXSSFWorkbook implements Wo
*
* @return new font object
*/
+ @Override
public Font createFont()
{
return _wb.createFont();
@@ -737,6 +756,7 @@ public class SXSSFWorkbook implements Wo
*
* @return the font with the matched attributes or <code>null</code>
*/
+ @Override
public Font findFont(short boldWeight, short color, short fontHeight, String name, boolean italic, boolean strikeout, short typeOffset, byte underline)
{
return _wb.findFont(boldWeight, color, fontHeight, name, italic, strikeout, typeOffset, underline);
@@ -748,6 +768,7 @@ public class SXSSFWorkbook implements Wo
*
* @return number of fonts
*/
+ @Override
public short getNumberOfFonts()
{
return _wb.getNumberOfFonts();
@@ -759,6 +780,7 @@ public class SXSSFWorkbook implements Wo
* @param idx index number (0-based)
* @return font at the index
*/
+ @Override
public Font getFontAt(short idx)
{
return _wb.getFontAt(idx);
@@ -769,6 +791,7 @@ public class SXSSFWorkbook implements Wo
*
* @return the new Cell Style object
*/
+ @Override
public CellStyle createCellStyle()
{
return _wb.createCellStyle();
@@ -779,6 +802,7 @@ public class SXSSFWorkbook implements Wo
*
* @return count of cell styles
*/
+ @Override
public short getNumCellStyles()
{
return _wb.getNumCellStyles();
@@ -790,6 +814,7 @@ public class SXSSFWorkbook implements Wo
* @param idx index within the set of styles (0-based)
* @return CellStyle object at the index
*/
+ @Override
public CellStyle getCellStyleAt(short idx)
{
return _wb.getCellStyleAt(idx);
@@ -813,6 +838,7 @@ public class SXSSFWorkbook implements Wo
* @param stream - the java OutputStream you wish to write to
* @exception IOException if anything can't be written.
*/
+ @Override
public void write(OutputStream stream) throws IOException
{
for (SXSSFSheet sheet : _xFromSxHash.values())
@@ -839,7 +865,9 @@ public class SXSSFWorkbook implements Wo
}
finally
{
- tmplFile.delete();
+ if(!tmplFile.delete()) {
+ throw new IOException("Could not delete temporary file after processing: " + tmplFile);
+ }
}
}
@@ -861,6 +889,7 @@ public class SXSSFWorkbook implements Wo
/**
* @return the total number of defined names in this workbook
*/
+ @Override
public int getNumberOfNames()
{
return _wb.getNumberOfNames();
@@ -870,6 +899,7 @@ public class SXSSFWorkbook implements Wo
* @param name the name of the defined name
* @return the defined name with the specified name. <code>null</code> if not found.
*/
+ @Override
public Name getName(String name)
{
return _wb.getName(name);
@@ -879,6 +909,7 @@ public class SXSSFWorkbook implements Wo
* @return the defined name at the specified index
* @throws IllegalArgumentException if the supplied index is invalid
*/
+ @Override
public Name getNameAt(int nameIndex)
{
return _wb.getNameAt(nameIndex);
@@ -889,6 +920,7 @@ public class SXSSFWorkbook implements Wo
*
* @return new defined name object
*/
+ @Override
public Name createName()
{
return _wb.createName();
@@ -902,6 +934,7 @@ public class SXSSFWorkbook implements Wo
* @param name the name of the defined name
* @return zero based index of the defined name. <tt>-1</tt> if not found.
*/
+ @Override
public int getNameIndex(String name)
{
return _wb.getNameIndex(name);
@@ -912,6 +945,7 @@ public class SXSSFWorkbook implements Wo
*
* @param index named range index (0 based)
*/
+ @Override
public void removeName(int index)
{
_wb.removeName(index);
@@ -922,6 +956,7 @@ public class SXSSFWorkbook implements Wo
*
* @param name the name of the defined name
*/
+ @Override
public void removeName(String name)
{
_wb.removeName(name);
@@ -934,6 +969,7 @@ public class SXSSFWorkbook implements Wo
* @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
* @param reference Valid name Reference for the Print Area
*/
+ @Override
public void setPrintArea(int sheetIndex, String reference)
{
_wb.setPrintArea(sheetIndex,reference);
@@ -948,6 +984,7 @@ public class SXSSFWorkbook implements Wo
* @param startRow Row to begin the printarea
* @param endRow Row to end the printarea
*/
+ @Override
public void setPrintArea(int sheetIndex, int startColumn, int endColumn, int startRow, int endRow)
{
_wb.setPrintArea(sheetIndex, startColumn, endColumn, startRow, endRow);
@@ -960,6 +997,7 @@ public class SXSSFWorkbook implements Wo
* @param sheetIndex Zero-based sheet index (0 Represents the first sheet to keep consistent with java)
* @return String Null if no print area has been defined
*/
+ @Override
public String getPrintArea(int sheetIndex)
{
return _wb.getPrintArea(sheetIndex);
@@ -970,6 +1008,7 @@ public class SXSSFWorkbook implements Wo
*
* @param sheetIndex Zero-based sheet index (0 = First Sheet)
*/
+ @Override
public void removePrintArea(int sheetIndex)
{
_wb.removePrintArea(sheetIndex);
@@ -983,6 +1022,7 @@ public class SXSSFWorkbook implements Wo
* {@link MissingCellPolicy}
* </p>
*/
+ @Override
public MissingCellPolicy getMissingCellPolicy()
{
return _wb.getMissingCellPolicy();
@@ -996,6 +1036,7 @@ public class SXSSFWorkbook implements Wo
* {@link org.apache.poi.ss.usermodel.Row#getCell(int)}. See
* {@link MissingCellPolicy}
*/
+ @Override
public void setMissingCellPolicy(MissingCellPolicy missingCellPolicy)
{
_wb.setMissingCellPolicy(missingCellPolicy);
@@ -1006,6 +1047,7 @@ public class SXSSFWorkbook implements Wo
*
* @return the DataFormat object
*/
+ @Override
public DataFormat createDataFormat()
{
return _wb.createDataFormat();
@@ -1025,6 +1067,7 @@ public class SXSSFWorkbook implements Wo
* @see #PICTURE_TYPE_PNG
* @see #PICTURE_TYPE_DIB
*/
+ @Override
public int addPicture(byte[] pictureData, int format)
{
return _wb.addPicture(pictureData,format);
@@ -1035,6 +1078,7 @@ public class SXSSFWorkbook implements Wo
*
* @return the list of pictures (a list of {@link PictureData} objects.)
*/
+ @Override
public List<? extends PictureData> getAllPictures()
{
return _wb.getAllPictures();
@@ -1044,6 +1088,7 @@ public class SXSSFWorkbook implements Wo
* Returns an object that handles instantiating concrete
* classes of the various instances one needs for HSSF and XSSF.
*/
+ @Override
public CreationHelper getCreationHelper()
{
return _wb.getCreationHelper();
@@ -1052,6 +1097,7 @@ public class SXSSFWorkbook implements Wo
/**
* @return <code>false</code> if this workbook is not visible in the GUI
*/
+ @Override
public boolean isHidden()
{
return _wb.isHidden();
@@ -1060,6 +1106,7 @@ public class SXSSFWorkbook implements Wo
/**
* @param hiddenFlag pass <code>false</code> to make the workbook visible in the GUI
*/
+ @Override
public void setHidden(boolean hiddenFlag)
{
_wb.setHidden(hiddenFlag);
@@ -1074,6 +1121,7 @@ public class SXSSFWorkbook implements Wo
* @param sheetIx Number
* @return <code>true</code> if sheet is hidden
*/
+ @Override
public boolean isSheetHidden(int sheetIx)
{
return _wb.isSheetHidden(sheetIx);
@@ -1088,6 +1136,7 @@ public class SXSSFWorkbook implements Wo
* @param sheetIx sheet index to check
* @return <code>true</code> if sheet is very hidden
*/
+ @Override
public boolean isSheetVeryHidden(int sheetIx)
{
return _wb.isSheetVeryHidden(sheetIx);
@@ -1099,6 +1148,7 @@ public class SXSSFWorkbook implements Wo
* @param sheetIx the sheet index (0-based)
* @param hidden True to mark the sheet as hidden, false otherwise
*/
+ @Override
public void setSheetHidden(int sheetIx, boolean hidden)
{
_wb.setSheetHidden(sheetIx,hidden);
@@ -1119,6 +1169,7 @@ public class SXSSFWorkbook implements Wo
* <code>Workbook.SHEET_STATE_VERY_HIDDEN</code>.
* @throws IllegalArgumentException if the supplied sheet index or state is invalid
*/
+ @Override
public void setSheetHidden(int sheetIx, int hidden)
{
_wb.setSheetHidden(sheetIx,hidden);
@@ -1128,6 +1179,7 @@ public class SXSSFWorkbook implements Wo
*
* @param toopack the toolpack to register
*/
+ @Override
public void addToolPack(UDFFinder toopack)
{
_wb.addToolPack(toopack);
@@ -1145,6 +1197,7 @@ public class SXSSFWorkbook implements Wo
* workbook values when the workbook is opened
* @since 3.8
*/
+ @Override
public void setForceFormulaRecalculation(boolean value){
_wb.setForceFormulaRecalculation(value);
}
@@ -1152,6 +1205,7 @@ public class SXSSFWorkbook implements Wo
/**
* Whether Excel will be asked to recalculate all formulas when the workbook is opened.
*/
+ @Override
public boolean getForceFormulaRecalculation(){
return _wb.getForceFormulaRecalculation();
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java Mon Oct 6 13:20:12 2014
@@ -19,11 +19,7 @@
package org.apache.poi.xssf.streaming;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.io.File;
import java.io.FileOutputStream;
@@ -238,7 +234,6 @@ public final class TestSXSSFWorkbook ext
assertEquals("value?", cell.getStringCellValue());
assertTrue(wb.dispose());
-
}
@Test
@@ -315,16 +310,18 @@ public final class TestSXSSFWorkbook ext
}
@Test
- public void workbookDispose()
+ public void workbookDispose() throws IOException
{
SXSSFWorkbook wb = new SXSSFWorkbook();
// the underlying writer is SheetDataWriter
assertWorkbookDispose(wb);
-
+ wb.close();
+
wb = new SXSSFWorkbook();
wb.setCompressTempFiles(true);
// the underlying writer is GZIPSheetDataWriter
assertWorkbookDispose(wb);
+ wb.close();
}
@@ -334,9 +331,12 @@ public final class TestSXSSFWorkbook ext
Workbook wb = new SXSSFWorkbook(10);
populateWorkbook(wb);
saveTwice(wb);
+ wb.close();
+
wb = new XSSFWorkbook();
populateWorkbook(wb);
saveTwice(wb);
+ wb.close();
}
// Crashes the JVM because of documented JVM behavior with concurrent writing/reading of zip-files
@@ -371,6 +371,7 @@ public final class TestSXSSFWorkbook ext
} finally {
assertTrue(wb.dispose());
}
+ wb.close();
}
out.delete();
}
@@ -404,6 +405,30 @@ public final class TestSXSSFWorkbook ext
private static class NullOutputStream extends OutputStream {
@Override
public void write(int b) throws IOException {
+ // nothing to do here
}
}
+
+ @Test
+ public void testBug54523() throws IOException {
+ SXSSFWorkbook wb = new SXSSFWorkbook(100);
+ Sheet sh = wb.createSheet();
+
+ for (int i = 0; i < 81000; i++) {
+ Row row = sh.createRow(i);
+ for (int j = 0; j < 1000; j++) {
+ Cell cell = row.createCell(j);
+ cell.setCellValue("dddd");
+ }
+ if (i % 100 == 0){
+ System.out.println("x - " + i);
+ }
+ }
+
+ FileOutputStream out = new FileOutputStream("C:\\temp\\54523_large.xlsx");
+ wb.write(out);
+ out.close();
+ wb.dispose();
+ wb.close();
+ }
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java Mon Oct 6 13:20:12 2014
@@ -17,9 +17,15 @@
package org.apache.poi.xssf.usermodel;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BaseTestRow;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.XSSFITestDataProvider;
+import org.apache.poi.xssf.XSSFTestDataSamples;
/**
* Tests for XSSFRow
@@ -37,4 +43,48 @@ public final class TestXSSFRow extends B
public void testCellBounds() {
baseTestCellBounds(SpreadsheetVersion.EXCEL2007.getLastColumnIndex());
}
+
+ public void test56490() {
+ XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56490.xlsx");
+ XSSFSheet sheet = wb.getSheetAt(0);
+
+ String columnWanted = "Link";
+ Integer columnNo = null;
+ List<Cell> cells = new ArrayList<Cell>();
+
+ // TODO: change this!!
+ assertEquals(-1, sheet.getFirstRowNum());
+ assertEquals(-1, sheet.getLastRowNum());
+
+ Row firstRow = sheet.getRow(-1);
+ assertNotNull(firstRow);
+ assertNotNull(firstRow.iterator());
+
+ for(Row row : sheet) {
+ for(Cell cell : row) {
+ System.out.println("Cell in Row: " + row.getRowNum() + ": " + cell.toString());
+ }
+ }
+
+ for (Cell cell : firstRow) {
+ if (cell.getStringCellValue().equals(columnWanted)) {
+ columnNo = cell.getColumnIndex();
+ }
+ }
+
+ if (columnNo != null) {
+ for (Row row : sheet) {
+ Cell c = row.getCell(columnNo);
+ if (c == null || c.getCellType() == Cell.CELL_TYPE_BLANK) {
+ } else {
+ cells.add(c);
+ }
+
+ }
+
+ } else {
+ System.out.println("could not find column" + columnWanted
+ + "in first row");
+ }
+ }
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java Mon Oct 6 13:20:12 2014
@@ -17,13 +17,7 @@
package org.apache.poi.xssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -42,17 +36,7 @@ import org.apache.poi.openxml4j.opc.Pack
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
import org.apache.poi.openxml4j.opc.internal.MemoryPackagePart;
import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-
-import org.apache.poi.ss.usermodel.BaseTestWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.AreaReference;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.IOUtils;
@@ -768,4 +752,20 @@ public final class TestXSSFWorkbook exte
setPivotData(wb2);
assertTrue(wb2.getPivotTables().size() == 2);
}
+
+ @Test
+ public void testBug55644() throws IOException {
+ XSSFWorkbook wb = new XSSFWorkbook();
+ XSSFSheet sheet = wb.createSheet("students");
+ XSSFRow row = sheet.createRow(1);
+ XSSFCell cell = row.createCell(1);
+ cell.setCellValue("sandeepzzzzzzzzzzzzzzzzzzzzzzzzz");
+ sheet.autoSizeColumn(1);
+
+ FileOutputStream fileOut = new FileOutputStream("C:\\temp\\55644.xlsx");
+ wb.write(fileOut);
+ fileOut.close();
+
+ wb.close();
+ }
}
Modified: poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/POIDataSamples.java Mon Oct 6 13:20:12 2014
@@ -196,9 +196,11 @@ public final class POIDataSamples {
_sampleDataIsAvaliableOnClassPath = true;
return;
}
+
+ dataDirName = "test-data";
- throw new RuntimeException("Must set system property '" +
- TEST_PROPERTY + "' before running tests");
+ /*throw new RuntimeException("Must set system property '" +
+ TEST_PROPERTY + "' before running tests");*/
}
File dataDir = new File(dataDirName, _moduleDir);
if (!dataDir.exists()) {
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java Mon Oct 6 13:20:12 2014
@@ -26,6 +26,7 @@ import java.util.Date;
import junit.framework.TestCase;
import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.hssf.dev.BiffViewer;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Row;
@@ -126,7 +127,7 @@ public final class TestCellStyle extends
assertEquals("LAST ROW ", 0, s.getLastRowNum());
assertEquals("FIRST ROW ", 0, s.getFirstRowNum());
}
-
+
public void testHashEquals() {
HSSFWorkbook wb = new HSSFWorkbook();
HSSFSheet s = wb.createSheet();
@@ -135,21 +136,21 @@ public final class TestCellStyle extends
HSSFRow row = s.createRow(0);
HSSFCell cell1 = row.createCell(1);
HSSFCell cell2 = row.createCell(2);
-
+
cs1.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy"));
cs2.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/dd/yy"));
-
+
cell1.setCellStyle(cs1);
cell1.setCellValue(new Date());
-
+
cell2.setCellStyle(cs2);
cell2.setCellValue(new Date());
-
+
assertEquals(cs1.hashCode(), cs1.hashCode());
assertEquals(cs2.hashCode(), cs2.hashCode());
assertTrue(cs1.equals(cs1));
assertTrue(cs2.equals(cs2));
-
+
// Change cs1, hash will alter
int hash1 = cs1.hashCode();
cs1.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/dd/yy"));
@@ -210,7 +211,7 @@ public final class TestCellStyle extends
assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
}
-
+
/**
* Cloning one HSSFCellStyle onto Another, same
* HSSFWorkbook
@@ -220,63 +221,63 @@ public final class TestCellStyle extends
HSSFFont fnt = wb.createFont();
fnt.setFontName("TestingFont");
assertEquals(5, wb.getNumberOfFonts());
-
+
HSSFCellStyle orig = wb.createCellStyle();
orig.setAlignment(HSSFCellStyle.ALIGN_RIGHT);
orig.setFont(fnt);
orig.setDataFormat((short)18);
-
+
assertTrue(HSSFCellStyle.ALIGN_RIGHT == orig.getAlignment());
assertTrue(fnt == orig.getFont(wb));
assertTrue(18 == orig.getDataFormat());
-
+
HSSFCellStyle clone = wb.createCellStyle();
assertFalse(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
assertFalse(fnt == clone.getFont(wb));
assertFalse(18 == clone.getDataFormat());
-
+
clone.cloneStyleFrom(orig);
assertTrue(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
assertTrue(fnt == clone.getFont(wb));
assertTrue(18 == clone.getDataFormat());
assertEquals(5, wb.getNumberOfFonts());
}
-
+
/**
* Cloning one HSSFCellStyle onto Another, across
* two different HSSFWorkbooks
*/
public void testCloneStyleDiffWB() {
HSSFWorkbook wbOrig = new HSSFWorkbook();
-
+
HSSFFont fnt = wbOrig.createFont();
fnt.setFontName("TestingFont");
assertEquals(5, wbOrig.getNumberOfFonts());
-
+
HSSFDataFormat fmt = wbOrig.createDataFormat();
fmt.getFormat("MadeUpOne");
fmt.getFormat("MadeUpTwo");
-
+
HSSFCellStyle orig = wbOrig.createCellStyle();
orig.setAlignment(HSSFCellStyle.ALIGN_RIGHT);
orig.setFont(fnt);
orig.setDataFormat(fmt.getFormat("Test##"));
-
+
assertTrue(HSSFCellStyle.ALIGN_RIGHT == orig.getAlignment());
assertTrue(fnt == orig.getFont(wbOrig));
assertTrue(fmt.getFormat("Test##") == orig.getDataFormat());
-
+
// Now a style on another workbook
HSSFWorkbook wbClone = new HSSFWorkbook();
assertEquals(4, wbClone.getNumberOfFonts());
HSSFDataFormat fmtClone = wbClone.createDataFormat();
-
+
HSSFCellStyle clone = wbClone.createCellStyle();
assertEquals(4, wbClone.getNumberOfFonts());
-
+
assertFalse(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
assertFalse("TestingFont" == clone.getFont(wbClone).getFontName());
-
+
clone.cloneStyleFrom(orig);
assertTrue(HSSFCellStyle.ALIGN_RIGHT == clone.getAlignment());
assertTrue("TestingFont" == clone.getFont(wbClone).getFontName());
@@ -284,47 +285,47 @@ public final class TestCellStyle extends
assertFalse(fmtClone.getFormat("Test##") == fmt.getFormat("Test##"));
assertEquals(5, wbClone.getNumberOfFonts());
}
-
+
public void testStyleNames() {
HSSFWorkbook wb = openSample("WithExtendedStyles.xls");
HSSFSheet s = wb.getSheetAt(0);
HSSFCell c1 = s.getRow(0).getCell(0);
HSSFCell c2 = s.getRow(1).getCell(0);
HSSFCell c3 = s.getRow(2).getCell(0);
-
+
HSSFCellStyle cs1 = c1.getCellStyle();
HSSFCellStyle cs2 = c2.getCellStyle();
HSSFCellStyle cs3 = c3.getCellStyle();
-
+
assertNotNull(cs1);
assertNotNull(cs2);
assertNotNull(cs3);
-
+
// Check we got the styles we'd expect
assertEquals(10, cs1.getFont(wb).getFontHeightInPoints());
assertEquals(9, cs2.getFont(wb).getFontHeightInPoints());
assertEquals(12, cs3.getFont(wb).getFontHeightInPoints());
-
+
assertEquals(15, cs1.getIndex());
assertEquals(23, cs2.getIndex());
assertEquals(24, cs3.getIndex());
-
+
assertNull(cs1.getParentStyle());
assertNotNull(cs2.getParentStyle());
assertNotNull(cs3.getParentStyle());
-
+
assertEquals(21, cs2.getParentStyle().getIndex());
assertEquals(22, cs3.getParentStyle().getIndex());
-
- // Now check we can get style records for
+
+ // Now check we can get style records for
// the parent ones
assertNull(wb.getWorkbook().getStyleRecord(15));
assertNull(wb.getWorkbook().getStyleRecord(23));
assertNull(wb.getWorkbook().getStyleRecord(24));
-
+
assertNotNull(wb.getWorkbook().getStyleRecord(21));
assertNotNull(wb.getWorkbook().getStyleRecord(22));
-
+
// Now check the style names
assertEquals(null, cs1.getUserStyleName());
assertEquals(null, cs2.getUserStyleName());
@@ -337,47 +338,112 @@ public final class TestCellStyle extends
c4.setCellStyle(cs2);
assertEquals("style1", c4.getCellStyle().getParentStyle().getUserStyleName());
}
-
+
public void testGetSetBorderHair() {
HSSFWorkbook wb = openSample("55341_CellStyleBorder.xls");
HSSFSheet s = wb.getSheetAt(0);
HSSFCellStyle cs;
- cs = s.getRow(0).getCell(0).getCellStyle();
- assertEquals(CellStyle.BORDER_HAIR, cs.getBorderRight());
+ cs = s.getRow(0).getCell(0).getCellStyle();
+ assertEquals(CellStyle.BORDER_HAIR, cs.getBorderRight());
+
+ cs = s.getRow(1).getCell(1).getCellStyle();
+ assertEquals(CellStyle.BORDER_DOTTED, cs.getBorderRight());
+
+ cs = s.getRow(2).getCell(2).getCellStyle();
+ assertEquals(CellStyle.BORDER_DASH_DOT_DOT, cs.getBorderRight());
+
+ cs = s.getRow(3).getCell(3).getCellStyle();
+ assertEquals(CellStyle.BORDER_DASHED, cs.getBorderRight());
+
+ cs = s.getRow(4).getCell(4).getCellStyle();
+ assertEquals(CellStyle.BORDER_THIN, cs.getBorderRight());
+
+ cs = s.getRow(5).getCell(5).getCellStyle();
+ assertEquals(CellStyle.BORDER_MEDIUM_DASH_DOT_DOT, cs.getBorderRight());
+
+ cs = s.getRow(6).getCell(6).getCellStyle();
+ assertEquals(CellStyle.BORDER_SLANTED_DASH_DOT, cs.getBorderRight());
+
+ cs = s.getRow(7).getCell(7).getCellStyle();
+ assertEquals(CellStyle.BORDER_MEDIUM_DASH_DOT, cs.getBorderRight());
+
+ cs = s.getRow(8).getCell(8).getCellStyle();
+ assertEquals(CellStyle.BORDER_MEDIUM_DASHED, cs.getBorderRight());
- cs = s.getRow(1).getCell(1).getCellStyle();
- assertEquals(CellStyle.BORDER_DOTTED, cs.getBorderRight());
+ cs = s.getRow(9).getCell(9).getCellStyle();
+ assertEquals(CellStyle.BORDER_MEDIUM, cs.getBorderRight());
- cs = s.getRow(2).getCell(2).getCellStyle();
- assertEquals(CellStyle.BORDER_DASH_DOT_DOT, cs.getBorderRight());
+ cs = s.getRow(10).getCell(10).getCellStyle();
+ assertEquals(CellStyle.BORDER_THICK, cs.getBorderRight());
- cs = s.getRow(3).getCell(3).getCellStyle();
- assertEquals(CellStyle.BORDER_DASHED, cs.getBorderRight());
+ cs = s.getRow(11).getCell(11).getCellStyle();
+ assertEquals(CellStyle.BORDER_DOUBLE, cs.getBorderRight());
+ }
- cs = s.getRow(4).getCell(4).getCellStyle();
- assertEquals(CellStyle.BORDER_THIN, cs.getBorderRight());
+ public void testBug54894() throws IOException {
+ HSSFWorkbook wb = new HSSFWorkbook();
+ HSSFSheet sheet = wb.createSheet("new sheet");
+
+ // Create a row and put some cells in it. Rows are 0 based.
+ HSSFRow row = sheet.createRow(1);
+
+ // Create a cell and put a value in it.
+ HSSFCell cell = row.createCell(1);
+ cell.setCellValue(4);
+
+ CellStyle def = cell.getCellStyle();
- cs = s.getRow(5).getCell(5).getCellStyle();
- assertEquals(CellStyle.BORDER_MEDIUM_DASH_DOT_DOT, cs.getBorderRight());
+ String filenameB = "C:\\temp\\54894B.xls";
+ FileOutputStream fileOut = new FileOutputStream(filenameB);
+ try {
+ wb.write(fileOut);
+ } finally {
+ fileOut.close();
+ }
- cs = s.getRow(6).getCell(6).getCellStyle();
- assertEquals(CellStyle.BORDER_SLANTED_DASH_DOT, cs.getBorderRight());
+ // Style the cell with borders all around.
+ HSSFCellStyle style = wb.createCellStyle();
+ style.cloneStyleFrom(def);
+
+ String filenameM = "C:\\temp\\54894M.xls";
+ fileOut = new FileOutputStream(filenameM);
+ try {
+ wb.write(fileOut);
+ } finally {
+ fileOut.close();
+ }
- cs = s.getRow(7).getCell(7).getCellStyle();
- assertEquals(CellStyle.BORDER_MEDIUM_DASH_DOT, cs.getBorderRight());
+ style.setBorderBottom(HSSFCellStyle.BORDER_THIN);
- cs = s.getRow(8).getCell(8).getCellStyle();
- assertEquals(CellStyle.BORDER_MEDIUM_DASHED, cs.getBorderRight());
+ cell.setCellStyle(style);
- cs = s.getRow(9).getCell(9).getCellStyle();
- assertEquals(CellStyle.BORDER_MEDIUM, cs.getBorderRight());
+ String filenameM1 = "C:\\temp\\54894M1.xls";
+ fileOut = new FileOutputStream(filenameM1);
+ try {
+ wb.write(fileOut);
+ } finally {
+ fileOut.close();
+ }
- cs = s.getRow(10).getCell(10).getCellStyle();
- assertEquals(CellStyle.BORDER_THICK, cs.getBorderRight());
+ // Write the output to a file
+ String filename = "C:\\temp\\54894.xls";
+ fileOut = new FileOutputStream(filename);
+ try {
+ wb.write(fileOut);
+ } finally {
+ fileOut.close();
+ }
- cs = s.getRow(11).getCell(11).getCellStyle();
- assertEquals(CellStyle.BORDER_DOUBLE, cs.getBorderRight());
+ /*Runtime.getRuntime().exec(new String[] {"cmd", "/c", "start", filenameB});
+ Runtime.getRuntime().exec(new String[] {"cmd", "/c", "start", filenameM});
+ Runtime.getRuntime().exec(new String[] {"cmd", "/c", "start", filenameM1});
+ Runtime.getRuntime().exec(new String[] {"cmd", "/c", "start", filename});*/
+
+ System.out.println("testfile M");
+ BiffViewer.main(new String[] {filenameM});
+ System.out.println("testfile M1");
+ BiffViewer.main(new String[] {filenameM1});
}
public void testShrinkToFit() {
@@ -449,7 +515,7 @@ public final class TestCellStyle extends
public Throwable getException() {
return exception;
}
- };
+ }
public void test56563() throws Throwable {
CellFormatBugExample threadA = new CellFormatBugExample("56563a.xls");
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java Mon Oct 6 13:20:12 2014
@@ -17,20 +17,37 @@
package org.apache.poi.hssf.usermodel;
+import static org.junit.Assert.assertArrayEquals;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
import junit.framework.TestCase;
-import org.apache.poi.ddf.EscherSpRecord;
+
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.model.CommentShape;
import org.apache.poi.hssf.model.HSSFTestModelHelper;
-import org.apache.poi.hssf.record.*;
-
-import java.io.*;
-import java.util.Arrays;
+import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
+import org.apache.poi.hssf.record.EscherAggregate;
+import org.apache.poi.hssf.record.NoteRecord;
+import org.apache.poi.hssf.record.ObjRecord;
+import org.apache.poi.hssf.record.TextObjectRecord;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.Comment;
+import org.apache.poi.ss.usermodel.CreationHelper;
+import org.apache.poi.ss.usermodel.Drawing;
+import org.apache.poi.ss.usermodel.RichTextString;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
/**
* @author Evgeniy Berlog
* @date 26.06.12
*/
+@SuppressWarnings("deprecation")
public class TestComment extends TestCase {
public void testResultEqualsToAbstractShape() {
@@ -53,25 +70,25 @@ public class TestComment extends TestCas
byte[] actual = comment.getEscherContainer().getChild(0).serialize();
assertEquals(expected.length, actual.length);
- assertTrue(Arrays.equals(expected, actual));
+ assertArrayEquals(expected, actual);
expected = commentShape.getSpContainer().getChild(2).serialize();
actual = comment.getEscherContainer().getChild(2).serialize();
assertEquals(expected.length, actual.length);
- assertTrue(Arrays.equals(expected, actual));
+ assertArrayEquals(expected, actual);
expected = commentShape.getSpContainer().getChild(3).serialize();
actual = comment.getEscherContainer().getChild(3).serialize();
assertEquals(expected.length, actual.length);
- assertTrue(Arrays.equals(expected, actual));
+ assertArrayEquals(expected, actual);
expected = commentShape.getSpContainer().getChild(4).serialize();
actual = comment.getEscherContainer().getChild(4).serialize();
assertEquals(expected.length, actual.length);
- assertTrue(Arrays.equals(expected, actual));
+ assertArrayEquals(expected, actual);
ObjRecord obj = comment.getObjRecord();
ObjRecord objShape = commentShape.getObjRecord();
@@ -88,7 +105,7 @@ public class TestComment extends TestCas
actual = torShape.serialize();
assertEquals(expected.length, actual.length);
- assertTrue(Arrays.equals(expected, actual));
+ assertArrayEquals(expected, actual);
NoteRecord note = comment.getNoteRecord();
NoteRecord noteShape = commentShape.getNoteRecord();
@@ -98,7 +115,10 @@ public class TestComment extends TestCas
actual = noteShape.serialize();
assertEquals(expected.length, actual.length);
- assertTrue(Arrays.equals(expected, actual));
+ assertTrue(
+ "\nHad: " + Arrays.toString(actual) +
+ "\n Expected: " + Arrays.toString(expected),
+ Arrays.equals(expected, actual));
}
public void testAddToExistingFile() {
@@ -240,6 +260,7 @@ public class TestComment extends TestCas
assertEquals(agg.getTailRecords().size(), 1);
HSSFSimpleShape shape = patriarch.createSimpleShape(new HSSFClientAnchor());
+ assertNotNull(shape);
assertEquals(comment.getOptRecord().getEscherProperties().size(), 10);
}
@@ -260,12 +281,12 @@ public class TestComment extends TestCas
assertEquals(comment.getShapeId(), 2024);
- CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) comment.getObjRecord().getSubRecords().get(0);
- assertEquals(cod.getObjectId(), 1000);
+ /*CommonObjectDataSubRecord cod = (CommonObjectDataSubRecord) comment.getObjRecord().getSubRecords().get(0);
+ assertEquals(2024, cod.getObjectId());
EscherSpRecord spRecord = (EscherSpRecord) comment.getEscherContainer().getChild(0);
assertEquals(spRecord.getShapeId(), 2024);
assertEquals(comment.getShapeId(), 2024);
- assertEquals(comment.getNoteRecord().getShapeId(), 1000);
+ assertEquals(2024, comment.getNoteRecord().getShapeId());*/
}
public void testAttemptToSave2CommentsWithSameCoordinates(){
@@ -285,4 +306,116 @@ public class TestComment extends TestCas
}
assertNotNull(err);
}
+
+
+ public void testBug56380InsertComments() throws Exception {
+ HSSFWorkbook workbook = new HSSFWorkbook();
+ HSSFSheet sheet = workbook.createSheet();
+ Drawing drawing = sheet.createDrawingPatriarch();
+ int noOfRows = 3000;
+ String comment = "c";
+
+ for(int i = 0; i < noOfRows; i++) {
+ Row row = sheet.createRow(i);
+ Cell cell = row.createCell(0);
+ insertComment(drawing, cell, comment + i);
+ }
+
+ // assert that the comments are created properly before writing
+ checkComments(sheet, noOfRows, comment);
+
+ System.out.println("Listing comments before write");
+ listComments(sheet.getDrawingPatriarch());
+
+ assertEquals(noOfRows, sheet.getDrawingPatriarch().getChildren().size());
+
+ // store in temp-file
+ File file = new File(System.getProperty("java.io.tmpdir") + File.separatorChar + "test_comments.xls");
+ FileOutputStream fs = new FileOutputStream(file);
+ try {
+ sheet.getWorkbook().write(fs);
+ } finally {
+ fs.close();
+ }
+
+ // save and recreate the workbook from the saved file
+ workbook = HSSFTestDataSamples.writeOutAndReadBack(workbook);
+ sheet = workbook.getSheetAt(0);
+
+ // recreate the workbook from the saved file
+ /*FileInputStream fi = new FileInputStream(file);
+ try {
+ sheet = new HSSFWorkbook(fi).getSheetAt(0);
+ } finally {
+ fi.close();
+ }*/
+
+ System.out.println("Listing comments after read");
+ listComments(sheet.getDrawingPatriarch());
+
+ assertEquals(noOfRows, sheet.getDrawingPatriarch().getChildren().size());
+
+ // store file after
+ file = new File(System.getProperty("java.io.tmpdir") + File.separatorChar + "test_comments_after.xls");
+ fs = new FileOutputStream(file);
+ try {
+ sheet.getWorkbook().write(fs);
+ } finally {
+ fs.close();
+ }
+
+ // assert that the comments are created properly after reading back in
+ //checkComments(sheet, noOfRows, comment);
+ }
+
+ private void listComments(HSSFShapeContainer container) {
+ for (Object object : container.getChildren()) {
+ HSSFShape shape = (HSSFShape) object;
+ if (shape instanceof HSSFShapeGroup) {
+ listComments((HSSFShapeContainer) shape);
+ continue;
+ }
+ if (shape instanceof HSSFComment) {
+ HSSFComment comment = (HSSFComment) shape;
+ System.out.println("Comment " + comment.getString().getString() + " at " + comment.getColumn() + "/" + comment.getRow());
+ }
+ }
+ }
+
+ private void checkComments(Sheet sheet, int noOfRows, String commentStr) {
+ for(int i = 0; i < noOfRows; i++) {
+ assertNotNull(sheet.getRow(i));
+ Cell cell = sheet.getRow(i).getCell(0);
+ assertNotNull(cell);
+ Comment comment = cell.getCellComment();
+ assertNotNull("Did not get a Cell Comment for row " + i, comment);
+ assertNotNull(comment.getString());
+
+ assertEquals(i, comment.getRow());
+ assertEquals(0,comment.getColumn());
+
+ assertEquals(commentStr + i, comment.getString().getString());
+ }
+ }
+
+ private void insertComment(Drawing drawing, Cell cell, String message) {
+ CreationHelper factory = cell.getSheet().getWorkbook().getCreationHelper();
+
+ ClientAnchor anchor = factory.createClientAnchor();
+ anchor.setCol1(cell.getColumnIndex());
+ anchor.setCol2(cell.getColumnIndex() + 1);
+ anchor.setRow1(cell.getRowIndex());
+ anchor.setRow2(cell.getRowIndex() + 1);
+ anchor.setDx1(100);
+ anchor.setDx2(100);
+ anchor.setDy1(100);
+ anchor.setDy2(100);
+
+ Comment comment = drawing.createCellComment(anchor);
+
+ RichTextString str = factory.createRichTextString(message);
+ comment.setString(str);
+ comment.setAuthor("fanfy");
+ cell.setCellComment(comment);
+ }
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java Mon Oct 6 13:20:12 2014
@@ -17,12 +17,7 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -55,8 +50,13 @@ import org.apache.poi.poifs.filesystem.N
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.usermodel.BaseTestWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Name;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellUtil;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.TempFile;
import org.junit.Test;
@@ -1070,4 +1070,71 @@ public final class TestHSSFWorkbook exte
private void expectName(HSSFWorkbook wb, String name, String expect) {
assertEquals(expect, wb.getName(name).getRefersToFormula());
}
+
+ @Test
+ public void test55747() throws IOException {
+ HSSFWorkbook wb = new HSSFWorkbook();
+ Sheet sheet =wb.createSheet("Test1");
+ Row row =sheet.createRow(0);
+ CellUtil.createCell(row, 0, "Hello world.");
+ row = sheet.createRow(1);
+ Cell cell = row.createCell(0);
+ cell.setCellType(Cell.CELL_TYPE_FORMULA);
+ cell.setCellFormula("IF(ISBLANK(A1),\" not blank a1\",CONCATENATE(A1,\" - %%s.\"))");
+
+ Cell cell2 = row.createCell(1);
+ cell2.setCellType(Cell.CELL_TYPE_FORMULA);
+ cell2.setCellFormula("CONCATENATE(A1,\" - %%s.\")");
+
+ Cell cell3 = row.createCell(2);
+ cell3.setCellType(Cell.CELL_TYPE_FORMULA);
+ cell3.setCellFormula("ISBLANK(A1)");
+
+ wb.setForceFormulaRecalculation(true);
+
+ FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
+ for(int sheetNum = 0; sheetNum < wb.getNumberOfSheets(); sheetNum++) {
+ sheet = wb.getSheetAt(sheetNum);
+ for(Row r : sheet) {
+ for(Cell c : r) {
+ if(c.getCellType() == Cell.CELL_TYPE_FORMULA) {
+ evaluator.evaluateFormulaCell(c);
+ }
+ }
+ }
+ }
+
+ cell = row.getCell(0);
+ assertEquals(Cell.CELL_TYPE_FORMULA, cell.getCellType());
+ assertEquals("IF(ISBLANK(A1),\" not blank a1\",CONCATENATE(A1,\" - %%s.\"))", cell.getCellFormula());
+ assertEquals("Hello world. - %%s.", cell.getStringCellValue());
+
+ cell2 = row.getCell(1);
+ assertEquals(Cell.CELL_TYPE_FORMULA, cell2.getCellType());
+ assertEquals("CONCATENATE(A1,\" - %%s.\")", cell2.getCellFormula());
+ assertEquals("Hello world. - %%s.", cell2.getStringCellValue());
+
+ FileOutputStream stream = new FileOutputStream( "C:/temp/55747.xls");
+ try {
+ wb.write(stream);
+ } finally {
+ stream.close();
+ }
+
+ HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
+ Sheet sheetBack = wb.getSheetAt(0);
+ Row rowBack = sheetBack.getRow(1);
+
+ cell = rowBack.getCell(0);
+ assertEquals(Cell.CELL_TYPE_FORMULA, cell.getCellType());
+ assertEquals("IF(ISBLANK(A1),\" not blank a1\",CONCATENATE(A1,\" - %%s.\"))", cell.getCellFormula());
+ assertEquals("Hello world. - %%s.", cell.getStringCellValue());
+
+ cell2 = rowBack.getCell(1);
+ assertEquals(Cell.CELL_TYPE_FORMULA, cell2.getCellType());
+ assertEquals("CONCATENATE(A1,\" - %%s.\")", cell2.getCellFormula());
+ assertEquals("Hello world. - %%s.", cell2.getStringCellValue());
+ wbBack.close();
+ wb.close();
+ }
}
Modified: poi/trunk/test-data/spreadsheet/SampleSS.xlsx
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/SampleSS.xlsx?rev=1629644&r1=1629643&r2=1629644&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org