You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2017/09/18 16:06:54 UTC
svn commit: r1808739 - in /poi/trunk/src:
java/org/apache/poi/ss/format/CellFormat.java
ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java
Author: fanningpj
Date: Mon Sep 18 16:06:54 2017
New Revision: 1808739
URL: http://svn.apache.org/viewvc?rev=1808739&view=rev
Log:
change CellFormat.ultimateType to return CellType
Modified:
poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java?rev=1808739&r1=1808738&r2=1808739&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java Mon Sep 18 16:06:54 2017
@@ -37,6 +37,7 @@ import org.apache.poi.ss.usermodel.DataF
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.util.DateFormatConverter;
import org.apache.poi.util.LocaleUtil;
+import org.apache.poi.util.Removal;
/**
* Format a value according to the standard Excel behavior. This "standard" is
@@ -289,7 +290,7 @@ public class CellFormat {
* @return The result, in a {@link CellFormatResult}.
*/
public CellFormatResult apply(Cell c) {
- switch (ultimateTypeEnum(c)) {
+ switch (ultimateType(c)) {
case BLANK:
return apply("");
case BOOLEAN:
@@ -359,7 +360,7 @@ public class CellFormat {
* @return The result, in a {@link CellFormatResult}.
*/
public CellFormatResult apply(JLabel label, Cell c) {
- switch (ultimateTypeEnum(c)) {
+ switch (ultimateType(c)) {
case BLANK:
return apply(label, "");
case BOOLEAN:
@@ -438,16 +439,16 @@ public class CellFormat {
* {@link Cell#getCachedFormulaResultType()}. Otherwise this returns the
* result of {@link Cell#getCellType()}.
*
- * Will return {@link CellType} in a future version of POI.
- * For forwards compatibility, do not hard-code cell type literals in your code.
- *
* @param cell The cell.
*
* @return The ultimate type of this cell.
- * @deprecated POI 3.15. This will return a CellType enum in the future
*/
- public static int ultimateType(Cell cell) {
- return ultimateTypeEnum(cell).getCode();
+ public static CellType ultimateType(Cell cell) {
+ CellType type = cell.getCellType();
+ if (type == CellType.FORMULA)
+ return cell.getCachedFormulaResultType();
+ else
+ return type;
}
/**
@@ -460,15 +461,12 @@ public class CellFormat {
*
* @return The ultimate type of this cell.
* @since POI 3.15 beta 3
- * @deprecated POI 3.15 beta 3
- * Will be deleted when we make the CellType enum transition. See bug 59791.
+ * @deprecated use <code>ultimateType</code> instead
*/
+ @Deprecated
+ @Removal(version = "4.2")
public static CellType ultimateTypeEnum(Cell cell) {
- CellType type = cell.getCellType();
- if (type == CellType.FORMULA)
- return cell.getCachedFormulaResultType();
- else
- return type;
+ return ultimateType(cell);
}
/**
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java?rev=1808739&r1=1808738&r2=1808739&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java Mon Sep 18 16:06:54 2017
@@ -59,7 +59,7 @@ public class TestCellFormatPart extends
runFormatTests("GeneralFormatTests.xlsx", new CellValue() {
@Override
public Object getValue(Cell cell) {
- switch (CellFormat.ultimateTypeEnum(cell)) {
+ switch (CellFormat.ultimateType(cell)) {
case BOOLEAN:
return cell.getBooleanCellValue();
case NUMERIC:
@@ -132,7 +132,7 @@ public class TestCellFormatPart extends
runFormatTests("TextFormatTests.xlsx", new CellValue() {
@Override
public Object getValue(Cell cell) {
- switch(CellFormat.ultimateTypeEnum(cell)) {
+ switch(CellFormat.ultimateType(cell)) {
case BOOLEAN:
return cell.getBooleanCellValue();
default:
@@ -158,7 +158,7 @@ public class TestCellFormatPart extends
throw new IllegalArgumentException(
"Cannot find numer in \"" + str + "\"");
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
// The groups in the pattern are the parts of the number
for (int i = 1; i <= m.groupCount(); i++) {
String part = m.group(i);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org