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 2017/09/19 19:02:07 UTC
svn commit: r1808928 - in /poi/trunk/src/java/org/apache/poi:
hssf/usermodel/HSSFCell.java hssf/usermodel/HSSFName.java
hssf/util/CellReference.java ss/usermodel/CellValue.java
ss/usermodel/FormulaEvaluator.java
Author: centic
Date: Tue Sep 19 19:02:06 2017
New Revision: 1808928
URL: http://svn.apache.org/viewvc?rev=1808928&view=rev
Log:
IntelliJ warnings, deprecation
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
poi/trunk/src/java/org/apache/poi/hssf/util/CellReference.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.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=1808928&r1=1808927&r2=1808928&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 Tue Sep 19 19:02:06 2017
@@ -53,7 +53,6 @@ import org.apache.poi.ss.util.CellAddres
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.ss.util.NumberToTextConverter;
-import org.apache.poi.util.Internal;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.Removal;
@@ -306,7 +305,7 @@ public class HSSFCell implements Cell {
break;
case NUMERIC :
- NumberRecord nrec = null;
+ NumberRecord nrec;
if (cellType != _cellType)
{
@@ -356,7 +355,7 @@ public class HSSFCell implements Cell {
break;
case BLANK :
- BlankRecord brec = null;
+ BlankRecord brec;
if (cellType != _cellType)
{
@@ -375,7 +374,7 @@ public class HSSFCell implements Cell {
break;
case BOOLEAN :
- BoolErrRecord boolRec = null;
+ BoolErrRecord boolRec;
if (cellType != _cellType)
{
@@ -396,7 +395,7 @@ public class HSSFCell implements Cell {
break;
case ERROR :
- BoolErrRecord errRec = null;
+ BoolErrRecord errRec;
if (cellType != _cellType)
{
@@ -574,7 +573,7 @@ public class HSSFCell implements Cell {
if (_cellType != CellType.STRING) {
setCellType(CellType.STRING, false, row, col, styleIndex);
}
- int index = 0;
+ int index;
HSSFRichTextString hvalue = (HSSFRichTextString) value;
UnicodeString str = hvalue.getUnicodeString();
@@ -1132,8 +1131,6 @@ public class HSSFCell implements Cell {
* on the cached value of the formula
*
* @since POI 4.0
- * @return <code>CellType</code> depending
- * on the cached value of the formula
*/
@Override
public CellType getCachedFormulaResultType() {
@@ -1182,10 +1179,7 @@ public class HSSFCell implements Cell {
}
public boolean isPartOfArrayFormulaGroup() {
- if (_cellType != CellType.FORMULA) {
- return false;
- }
- return ((FormulaRecordAggregate)_record).isPartOfArrayFormula();
+ return _cellType == CellType.FORMULA && ((FormulaRecordAggregate) _record).isPartOfArrayFormula();
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java?rev=1808928&r1=1808927&r2=1808928&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java Tue Sep 19 19:02:06 2017
@@ -175,8 +175,6 @@ public final class HSSFName implements N
* Case sensitivity: all names are case-insensitive
*
* Uniqueness: must be unique (for names with the same scope)
- *
- * @param name
*/
private static void validateName(String name) {
@@ -267,11 +265,9 @@ public final class HSSFName implements N
}
public String toString() {
- StringBuffer sb = new StringBuffer(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(_definedNameRec.getNameText());
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ _definedNameRec.getNameText() +
+ "]";
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/util/CellReference.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/util/CellReference.java?rev=1808928&r1=1808927&r2=1808928&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/util/CellReference.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/util/CellReference.java Tue Sep 19 19:02:06 2017
@@ -21,6 +21,10 @@ package org.apache.poi.hssf.util;
* Common conversion functions between Excel style A1, C27 style
* cell references, and POI usermodel style row=0, column=0
* style references.
+ *
+ * @deprecated POI 4.0.0-SNAPSHOT. Use {@link org.apache.poi.ss.util.CellReference} instead.
+ * Actually the replacement CellReference was added earlier, but the deprecation notice
+ * was added only in 4.0.0-SNAPSHOT.
*/
public final class CellReference extends org.apache.poi.ss.util.CellReference {
/**
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java?rev=1808928&r1=1808927&r2=1808928&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java Tue Sep 19 19:02:06 2017
@@ -111,11 +111,9 @@ public final class CellValue {
}
public String toString() {
- StringBuffer sb = new StringBuffer(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(formatAsString());
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ formatAsString() +
+ "]";
}
public String formatAsString() {
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=1808928&r1=1808927&r2=1808928&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 Tue Sep 19 19:02:06 2017
@@ -76,7 +76,7 @@ public interface FormulaEvaluator {
* the cell and also its cell type. This method should be preferred over
* evaluateInCell() when the call should not modify the contents of the
* original cell.
- * @param cell
+ * @param cell The {@link Cell} to evaluate
*/
CellValue evaluate(Cell cell);
@@ -144,7 +144,7 @@ public interface FormulaEvaluator {
* Be aware that your cell value will be changed to hold the
* result of the formula. If you simply want the formula
* value computed for you, use {@link #evaluateFormulaCell(Cell)}
- * @param cell
+ * @param cell The {@link Cell} to evaluate and modify.
*/
Cell evaluateInCell(Cell cell);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org