Author: gallon
Date: Sat Jan 26 19:41:10 2019
New Revision: 1852245
URL: http://svn.apache.org/viewvc?rev=1852245&view=rev
Log:
purged calls to cell.setCellType(CellType.BLANK) from the project, replaced
with setBlank()
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/RangeCopier.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java Sat Jan 26
19:41:10 2019
@@ -42,14 +42,12 @@ import org.apache.poi.ss.formula.Formula
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.ptg.ExpPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellBase;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
import org.apache.poi.ss.usermodel.Comment;
import org.apache.poi.ss.usermodel.FormulaError;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Hyperlink;
import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.ss.util.CellAddress;
@@ -492,7 +490,7 @@ public class HSSFCell extends CellBase {
public void setCellValue(Date value)
{
if(value == null) {
- setCellType(CellType.BLANK);
+ setBlank();
return;
}
@@ -517,7 +515,7 @@ public class HSSFCell extends CellBase {
public void setCellValue(Calendar value)
{
if(value == null) {
- setCellType(CellType.BLANK);
+ setBlank();
return;
}
@@ -1302,3 +1300,4 @@ public class HSSFCell extends CellBase {
return styleIndex;
}
}
+
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Sat Jan 26
19:41:10 2019
@@ -2389,7 +2389,7 @@ public final class HSSFSheet implements
CellRange<HSSFCell> result = getCellRange(range);
// clear all cells in the range
for (Cell c : result) {
- c.setCellType(CellType.BLANK);
+ c.setBlank();
}
return result;
}
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
(original)
+++
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
Sat Jan 26 19:41:10 2019
@@ -91,7 +91,7 @@ final class ForkedEvaluationCell impleme
}
public void copyValue(Cell destCell) {
switch (_cellType) {
- case BLANK: destCell.setCellType(CellType.BLANK);
return;
+ case BLANK: destCell.setBlank();
return;
case NUMERIC: destCell.setCellValue(_numberValue);
return;
case BOOLEAN: destCell.setCellValue(_booleanValue);
return;
case STRING: destCell.setCellValue(_stringValue);
return;
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/RangeCopier.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/RangeCopier.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/RangeCopier.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/RangeCopier.java Sat Jan 26
19:41:10 2019
@@ -140,7 +140,7 @@ public abstract class RangeCopier {
destCell.setCellValue(srcCell.getNumericCellValue());
break;
case BLANK:
- destCell.setCellType(CellType.BLANK);
+ destCell.setBlank();
break;
case BOOLEAN:
destCell.setCellValue(srcCell.getBooleanCellValue());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java Sat
Jan 26 19:41:10 2019
@@ -224,7 +224,7 @@ public class SXSSFCell extends CellBase
@Override
public void setCellValue(Date value) {
if(value == null) {
- setCellType(CellType.BLANK);
+ setBlank();
return;
}
@@ -251,7 +251,7 @@ public class SXSSFCell extends CellBase
@Override
public void setCellValue(Calendar value) {
if(value == null) {
- setCellType(CellType.BLANK);
+ setBlank();
return;
}
@@ -283,7 +283,7 @@ public class SXSSFCell extends CellBase
((RichTextValue) _value).setValue(value);
}
} else {
- setCellType(CellType.BLANK);
+ setBlank();
}
}
@@ -311,7 +311,7 @@ public class SXSSFCell extends CellBase
((PlainStringValue) _value).setValue(value);
}
} else {
- setCellType(CellType.BLANK);
+ setBlank();
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java Sat
Jan 26 19:41:10 2019
@@ -431,7 +431,7 @@ public final class XSSFCell extends Cell
@Override
public void setCellValue(RichTextString str) {
if(str == null || str.getString() == null){
- setCellType(CellType.BLANK);
+ setBlank();
return;
}
@@ -830,7 +830,7 @@ public final class XSSFCell extends Cell
@Override
public void setCellValue(Date value) {
if(value == null) {
- setCellType(CellType.BLANK);
+ setBlank();
return;
}
@@ -857,7 +857,7 @@ public final class XSSFCell extends Cell
@Override
public void setCellValue(Calendar value) {
if(value == null) {
- setCellType(CellType.BLANK);
+ setBlank();
return;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Sat
Jan 26 19:41:10 2019
@@ -3993,7 +3993,7 @@ public class XSSFSheet extends POIXMLDoc
arrayFormulas.remove(range);
CellRange<XSSFCell> cr = getCellRange(range);
for (XSSFCell c : cr) {
- c.setCellType(CellType.BLANK);
+ c.setBlank();
}
return cr;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java Sat
Jan 26 19:41:10 2019
@@ -766,7 +766,7 @@ public class XSSFTable extends POIXMLDoc
if (row != null) {
XSSFCell cell = row.getCell(cellRef.getCol());
if (cell != null) {
- cell.setCellType(CellType.BLANK);
+ cell.setBlank();
cell.setCellStyle(null);
}
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
Sat Jan 26 19:41:10 2019
@@ -154,7 +154,7 @@ public class TestSXSSFCell extends BaseT
*/
@Override
@Ignore
- public void
setCellType_BLANK_removesArrayFormula_ifCellIsPartOfAnArrayFormulaGroupContainingOnlyThisCell()
{
+ public void
setBlank_removesArrayFormula_ifCellIsPartOfAnArrayFormulaGroupContainingOnlyThisCell()
{
}
/**
@@ -164,7 +164,7 @@ public class TestSXSSFCell extends BaseT
@Override
@Ignore
@Test // <- annotation is necessary to override expected exception
- public void
setCellType_BLANK_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells()
{
+ public void
setBlank_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() {
}
@Override
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Sat Jan 26 19:41:10 2019
@@ -637,7 +637,7 @@ public final class TestXSSFBugs extends
validateCells(sheet);
XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
- sheet.getRow(6).getCell(0).setCellType(CellType.BLANK); // go
+ sheet.getRow(6).getCell(0).setBlank(); // go
XSSFTestDataSamples.writeOutAndReadBack(wb1).close();
sheet.getRow(7).getCell(0).setCellValue((String) null); // go
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
Sat Jan 26 19:41:10 2019
@@ -204,7 +204,7 @@ public final class TestSharedFormulaReco
assertEquals("A$1*2",
sheet.getRow(ROW_IX).getCell(1).getCellFormula());
cell = sheet.getRow(ROW_IX).getCell(1);
- cell.setCellType(CellType.BLANK);
+ cell.setBlank();
assertEquals(3, countSharedFormulas(sheet));
wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java Sat
Jan 26 19:41:10 2019
@@ -436,7 +436,7 @@ public final class TestHSSFCell extends
Row row = sheet.createRow(0);
Cell cell = row.createCell(0);
- cell.setCellType(CellType.BLANK);
+ cell.setBlank();
assertNull(null, cell.getDateCellValue());
assertFalse(cell.getBooleanCellValue());
assertEquals("", cell.toString());
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
Sat Jan 26 19:41:10 2019
@@ -232,14 +232,14 @@ public class TestEvaluationCache extends
public void setCellValue(String cellRefText, double value) {
HSSFCell cell = getOrCreateCell(cellRefText);
// be sure to blank cell, in case it is currently a
formula
- cell.setCellType(CellType.BLANK);
+ cell.setBlank();
// otherwise this line will only set the formula cached
result;
cell.setCellValue(value);
_evaluator.notifyUpdateCell(wrapCell(cell));
}
public void clearCell(String cellRefText) {
HSSFCell cell = getOrCreateCell(cellRefText);
- cell.setCellType(CellType.BLANK);
+ cell.setBlank();
_evaluator.notifyUpdateCell(wrapCell(cell));
}
@@ -606,7 +606,7 @@ public class TestEvaluationCache extends
cv = fe.evaluate(cellA1);
assertEquals(3.7, cv.getNumberValue(), 0.0);
- cellB1.setCellType(CellType.BLANK);
+ cellB1.setBlank();
fe.notifyUpdateCell(cellB1);
cv = fe.evaluate(cellA1); // B1 was used to evaluate A1
assertEquals(2.2, cv.getNumberValue(), 0.0);
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
Sat Jan 26 19:41:10 2019
@@ -119,7 +119,7 @@ public class TestRandBetween extends Tes
public void testRandBetweenTopBlank() {
bottomValueCell.setCellValue(-1);
- topValueCell.setCellType(CellType.BLANK);
+ topValueCell.setBlank();
formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
evaluator.clearAllCachedResultValues();
evaluator.evaluateFormulaCell(formulaCell);
@@ -174,7 +174,7 @@ public class TestRandBetween extends Tes
assertEquals(CellType.ERROR,
formulaCell.getCachedFormulaResultType());
assertEquals(ErrorEval.NUM_ERROR.getErrorCode(),
formulaCell.getErrorCellValue());
bottomValueCell.setCellValue(1);
- topValueCell.setCellType(CellType.BLANK);
+ topValueCell.setBlank();
formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
evaluator.clearAllCachedResultValues();
evaluator.evaluateFormulaCell(formulaCell);
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java?rev=1852245&r1=1852244&r2=1852245&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java Sat
Jan 26 19:41:10 2019
@@ -642,7 +642,7 @@ public abstract class BaseTestCell {
}
/**
- * Make sure that cell.setCellType(CellType.BLANK) preserves the cell
style
+ * Make sure that cell.setBlank() preserves the cell style
*/
@Test
public void testSetBlank_bug47028() throws Exception {
@@ -651,7 +651,7 @@ public abstract class BaseTestCell {
Cell cell = wb.createSheet("Sheet1").createRow(0).createCell(0);
cell.setCellStyle(style);
int i1 = cell.getCellStyle().getIndex();
- cell.setCellType(CellType.BLANK);
+ cell.setBlank();
int i2 = cell.getCellStyle().getIndex();
assertEquals(i1, i2);
wb.close();
@@ -1219,7 +1219,7 @@ public abstract class BaseTestCell {
@Test
- public void
setCellType_BLANK_removesArrayFormula_ifCellIsPartOfAnArrayFormulaGroupContainingOnlyThisCell()
{
+ public void
setBlank_removesArrayFormula_ifCellIsPartOfAnArrayFormulaGroupContainingOnlyThisCell()
{
Cell cell = getInstance();
cell.getSheet().setArrayFormula("1", CellRangeAddress.valueOf("A1"));
@@ -1227,18 +1227,18 @@ public abstract class BaseTestCell {
assertTrue(cell.isPartOfArrayFormulaGroup());
assertEquals("1", cell.getCellFormula());
- cell.setCellType(CellType.BLANK);
+ cell.setBlank();
assertEquals(CellType.BLANK, cell.getCellType());
assertFalse(cell.isPartOfArrayFormulaGroup());
}
@Test(expected = IllegalStateException.class)
- public void
setCellType_BLANK_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells()
{
+ public void
setBlank_throwsISE_ifCellIsPartOfAnArrayFormulaGroupContainingOtherCells() {
Cell cell = getInstance();
cell.getSheet().setArrayFormula("1",
CellRangeAddress.valueOf("A1:B1"));
cell.setCellValue("foo");
- cell.setCellType(CellType.BLANK);
+ cell.setBlank();
}
@Test(expected = IllegalStateException.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
