You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/05/21 21:22:41 UTC
svn commit: r1890089 [6/6] - in /poi/trunk: ./ poi-examples/
poi-examples/src/main/java/org/apache/poi/examples/hpsf/
poi-examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/
poi-examples/src/main/java/org/apache/poi/examples/xssf/stream...
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java Fri May 21 21:22:40 2021
@@ -24,7 +24,7 @@ import org.apache.poi.util.StringUtil;
/**
* To support Constant Values (2.5.7) as required by the CRN record.
* This class is also used for two dimensional arrays which are encoded by
- * EXTERNALNAME (5.39) records and Array tokens.<p>
+ * EXTERNALNAME (5.39) records and Array tokens.
*/
public final class ConstantValueParser {
// note - these (non-combinable) enum values are sparse.
@@ -59,7 +59,7 @@ public final class ConstantValueParser {
in.readLong(); // 8 byte 'not used' field
return EMPTY_REPRESENTATION;
case TYPE_NUMBER:
- return Double.valueOf(in.readDouble());
+ return in.readDouble();
case TYPE_STRING:
return StringUtil.readUnicodeString(in);
case TYPE_BOOLEAN:
@@ -88,7 +88,7 @@ public final class ConstantValueParser {
public static int getEncodedSize(Object[] values) {
// start with one byte 'type' code for each value
- int result = values.length * 1;
+ int result = values.length;
for (Object value : values) {
result += getEncodedSize(value);
}
@@ -126,14 +126,14 @@ public final class ConstantValueParser {
if (value instanceof Boolean) {
Boolean bVal = ((Boolean)value);
out.writeByte(TYPE_BOOLEAN);
- long longVal = bVal.booleanValue() ? 1L : 0L;
+ long longVal = bVal ? 1L : 0L;
out.writeLong(longVal);
return;
}
if (value instanceof Double) {
Double dVal = (Double) value;
out.writeByte(TYPE_NUMBER);
- out.writeDouble(dVal.doubleValue());
+ out.writeDouble(dVal);
return;
}
if (value instanceof String) {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java Fri May 21 21:22:40 2021
@@ -50,7 +50,7 @@ public interface AreaEval extends TwoDEv
/**
* @return the ValueEval from within this area at the specified row and col index. Never
- * <code>null</code> (possibly {@link BlankEval}). The specified indexes should be absolute
+ * {@code null} (possibly {@link BlankEval}). The specified indexes should be absolute
* indexes in the sheet and not relative indexes within the area.
*/
ValueEval getAbsoluteValue(int row, int col);
@@ -59,34 +59,32 @@ public interface AreaEval extends TwoDEv
* returns true if the cell at row and col specified
* as absolute indexes in the sheet is contained in
* this area.
- * @param row
- * @param col
*/
boolean contains(int row, int col);
/**
* returns true if the specified col is in range
- * @param col
*/
boolean containsColumn(int col);
/**
* returns true if the specified row is in range
- * @param row
*/
boolean containsRow(int row);
+ @Override
int getWidth();
+ @Override
int getHeight();
/**
* @return the ValueEval from within this area at the specified relativeRowIndex and
- * relativeColumnIndex. Never <code>null</code> (possibly {@link BlankEval}). The
+ * relativeColumnIndex. Never {@code null} (possibly {@link BlankEval}). The
* specified indexes should relative to the top left corner of this area.
*/
ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex);
/**
- * Creates an {@link AreaEval} offset by a relative amount from from the upper left cell
+ * Creates an AreaEval offset by a relative amount from from the upper left cell
* of this area
*/
AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java Fri May 21 21:22:40 2021
@@ -59,30 +59,37 @@ public abstract class AreaEvalBase imple
this(sheets, ptg.getFirstRow(), ptg.getFirstColumn(), ptg.getLastRow(), ptg.getLastColumn());
}
+ @Override
public final int getFirstColumn() {
return _firstColumn;
}
+ @Override
public final int getFirstRow() {
return _firstRow;
}
+ @Override
public final int getLastColumn() {
return _lastColumn;
}
+ @Override
public final int getLastRow() {
return _lastRow;
}
+ @Override
public int getFirstSheetIndex() {
return _firstSheet;
}
- public int getLastSheetIndex() {
+ @Override
+ public int getLastSheetIndex() {
return _lastSheet;
}
- public final ValueEval getAbsoluteValue(int row, int col) {
+ @Override
+ public final ValueEval getAbsoluteValue(int row, int col) {
int rowOffsetIx = row - _firstRow;
int colOffsetIx = col - _firstColumn;
@@ -97,40 +104,50 @@ public abstract class AreaEvalBase imple
return getRelativeValue(rowOffsetIx, colOffsetIx);
}
+ @Override
public final boolean contains(int row, int col) {
return _firstRow <= row && _lastRow >= row
&& _firstColumn <= col && _lastColumn >= col;
}
+ @Override
public final boolean containsRow(int row) {
return _firstRow <= row && _lastRow >= row;
}
+ @Override
public final boolean containsColumn(int col) {
return _firstColumn <= col && _lastColumn >= col;
}
+ @Override
public final boolean isColumn() {
return _firstColumn == _lastColumn;
}
+ @Override
public final boolean isRow() {
return _firstRow == _lastRow;
}
+ @Override
public int getHeight() {
return _lastRow-_firstRow+1;
}
- public final ValueEval getValue(int row, int col) {
+ @Override
+ public final ValueEval getValue(int row, int col) {
return getRelativeValue(row, col);
}
- public final ValueEval getValue(int sheetIndex, int row, int col) {
+ @Override
+ public final ValueEval getValue(int sheetIndex, int row, int col) {
return getRelativeValue(sheetIndex, row, col);
}
+ @Override
public abstract ValueEval getRelativeValue(int relativeRowIndex, int relativeColumnIndex);
public abstract ValueEval getRelativeValue(int sheetIndex, int relativeRowIndex, int relativeColumnIndex);
+ @Override
public int getWidth() {
return _lastColumn-_firstColumn+1;
}
@@ -139,7 +156,8 @@ public abstract class AreaEvalBase imple
* @return whether cell at rowIndex and columnIndex is a subtotal.
* By default return false which means 'don't care about subtotals'
*/
- public boolean isSubTotal(int rowIndex, int columnIndex) {
+ @Override
+ public boolean isSubTotal(int rowIndex, int columnIndex) {
return false;
}
@@ -147,7 +165,8 @@ public abstract class AreaEvalBase imple
* @return false by default, meaning all rows are calculated
* @see org.apache.poi.ss.formula.TwoDEval#isRowHidden(int)
*/
- public boolean isRowHidden(int rowIndex) {
+ @Override
+ public boolean isRowHidden(int rowIndex) {
return false;
}
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java Fri May 21 21:22:40 2021
@@ -22,7 +22,7 @@ import org.apache.poi.ss.formula.functio
/**
- * Implementation of Excel formula token '%'. <p>
+ * Implementation of Excel formula token '%'.
*/
public final class PercentEval extends Fixed1ArgFunction {
@@ -32,6 +32,7 @@ public final class PercentEval extends F
// enforce singleton
}
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
double d;
try {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java Fri May 21 21:22:40 2021
@@ -42,7 +42,7 @@ import org.apache.poi.util.Internal;
final class ForkedEvaluationSheet implements EvaluationSheet {
private final EvaluationSheet _masterSheet;
-
+
/**
* Only cells which have been split are put in this map. (This has been done to conserve memory).
*/
@@ -52,7 +52,7 @@ final class ForkedEvaluationSheet implem
_masterSheet = masterSheet;
_sharedCellsByRowCol = new HashMap<>();
}
-
+
/* (non-Javadoc)
* @see org.apache.poi.ss.formula.EvaluationSheet#getlastRowNum()
* @since POI 4.0.0
@@ -61,15 +61,16 @@ final class ForkedEvaluationSheet implem
public int getLastRowNum() {
return _masterSheet.getLastRowNum();
}
-
+
/* (non-Javadoc)
* @see org.apache.poi.ss.formula.EvaluationSheet#isRowHidden(int)
* @since POI 4.1.0
*/
+ @Override
public boolean isRowHidden(int rowIndex) {
return _masterSheet.isRowHidden(rowIndex);
}
-
+
@Override
public EvaluationCell getCell(int rowIndex, int columnIndex) {
RowColKey key = new RowColKey(rowIndex, columnIndex);
@@ -102,8 +103,7 @@ final class ForkedEvaluationSheet implem
RowColKey[] keys = new RowColKey[_sharedCellsByRowCol.size()];
_sharedCellsByRowCol.keySet().toArray(keys);
Arrays.sort(keys);
- for (int i = 0; i < keys.length; i++) {
- RowColKey key = keys[i];
+ for (RowColKey key : keys) {
Row row = sheet.getRow(key.getRowIndex());
if (row == null) {
row = sheet.createRow(key.getRowIndex());
@@ -125,14 +125,14 @@ final class ForkedEvaluationSheet implem
/* (non-Javadoc)
* leave the map alone, if it needs resetting, reusing this class is probably a bad idea.
* @see org.apache.poi.ss.formula.EvaluationSheet#clearAllCachedResultValues()
- *
+ *
* @since POI 3.15 beta 3
*/
@Override
public void clearAllCachedResultValues() {
_masterSheet.clearAllCachedResultValues();
}
-
+
// FIXME: serves same purpose as org.apache.poi.xssf.usermodel.XSSFEvaluationSheet$CellKey
private static final class RowColKey implements Comparable<RowColKey>{
private final int _rowIndex;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java Fri May 21 21:22:40 2021
@@ -24,7 +24,7 @@ import org.apache.poi.ss.formula.eval.Re
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation for Excel Bin2Dec() function.<p>
+ * Implementation for Excel Bin2Dec() function.
* <p>
* <b>Syntax</b>:<br> <b>Bin2Dec </b>(<b>number</b>)<br>
* <p>
@@ -42,6 +42,7 @@ public class Bin2Dec extends Fixed1ArgFu
public static final FreeRefFunction instance = new Bin2Dec();
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
final String number;
if (numberVE instanceof RefEval) {
@@ -113,6 +114,7 @@ public class Bin2Dec extends Fixed1ArgFu
return s2;
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Code.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Code.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Code.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Code.java Fri May 21 21:22:40 2021
@@ -20,7 +20,7 @@ package org.apache.poi.ss.formula.functi
import org.apache.poi.ss.formula.eval.*;
/**
- * Implementation for Excel CODE () function.<p>
+ * Implementation for Excel CODE () function.
* <p>
* <b>Syntax</b>:<br> <b>CODE </b>(<b>text</b> )<br>
* <p>
@@ -30,6 +30,7 @@ import org.apache.poi.ss.formula.eval.*;
*/
public class Code extends Fixed1ArgFunction {
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval textArg) {
ValueEval veText1;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Complex.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Complex.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Complex.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Complex.java Fri May 21 21:22:40 2021
@@ -27,13 +27,12 @@ import org.apache.poi.ss.formula.eval.St
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation for Excel COMPLEX () function.<p>
+ * Implementation for Excel COMPLEX () function.
* <p>
* <b>Syntax</b>:<br> <b>COMPLEX </b>(<b>real_num</b>,<b>i_num</b>,<b>suffix </b> )<br>
* <p>
* Converts real and imaginary coefficients into a complex number of the form x + yi or x + yj.
* <p>
- * <p>
* All complex number functions accept "i" and "j" for suffix, but neither "I" nor "J".
* Using uppercase results in the #VALUE! error value. All functions that accept two
* or more complex numbers require that all suffixes match.
@@ -41,11 +40,9 @@ import org.apache.poi.ss.formula.eval.Va
* <b>real_num</b> The real coefficient of the complex number.
* If this argument is nonnumeric, this function returns the #VALUE! error value.
* <p>
- * <p>
* <b>i_num</b> The imaginary coefficient of the complex number.
* If this argument is nonnumeric, this function returns the #VALUE! error value.
* <p>
- * <p>
* <b>suffix</b> The suffix for the imaginary component of the complex number.
* <ul>
* <li>If omitted, suffix is assumed to be "i".</li>
@@ -59,10 +56,12 @@ public class Complex extends Var2or3ArgF
public static final String DEFAULT_SUFFIX = "i";
public static final String SUPPORTED_SUFFIX = "j";
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval real_num, ValueEval i_num) {
return this.evaluate(srcRowIndex, srcColumnIndex, real_num, i_num, new StringEval(DEFAULT_SUFFIX));
}
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval real_num, ValueEval i_num, ValueEval suffix) {
ValueEval veText1;
try {
@@ -135,6 +134,7 @@ public class Complex extends Var2or3ArgF
return (number == Math.floor(number)) && !Double.isInfinite(number);
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length == 2) {
return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java Fri May 21 21:22:40 2021
@@ -29,7 +29,7 @@ import org.apache.poi.ss.usermodel.DateU
* Implementation for the DATEVALUE() Excel function.<p>
*
* <b>Syntax:</b><br>
- * <b>DATEVALUE</b>(<b>date_text</b>)<p>
+ * <b>DATEVALUE</b>(<b>date_text</b>)
* <p>
* The <b>DATEVALUE</b> function converts a date that is stored as text to a serial number that Excel
* recognizes as a date. For example, the formula <b>=DATEVALUE("1/1/2008")</b> returns 39448, the
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java Fri May 21 21:22:40 2021
@@ -25,7 +25,7 @@ import org.apache.poi.ss.formula.eval.Op
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation for Excel DELTA() function.<p>
+ * Implementation for Excel DELTA() function.
* <p>
* <b>Syntax</b>:<br> <b>DELTA </b>(<b>number1</b>,<b>number2</b> )<br>
* <p>
@@ -45,6 +45,7 @@ public final class Delta extends Fixed2A
private static final NumberEval ONE = new NumberEval(1);
private static final NumberEval ZERO = new NumberEval(0);
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg1, ValueEval arg2) {
try {
Double number1 = evaluateValue(arg1, srcRowIndex, srcColumnIndex);
@@ -62,6 +63,7 @@ public final class Delta extends Fixed2A
}
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length == 2) {
return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java Fri May 21 21:22:40 2021
@@ -29,12 +29,12 @@ import org.apache.poi.ss.usermodel.DateU
import org.apache.poi.util.LocaleUtil;
/**
- * Implementation for the Excel EOMONTH() function.<p>
+ * Implementation for the Excel EOMONTH() function.
* <p>
- * EOMONTH() returns the date of the last day of a month..<p>
+ * EOMONTH() returns the date of the last day of a month.
* <p>
* <b>Syntax</b>:<br>
- * <b>EOMONTH</b>(<b>start_date</b>,<b>months</b>)<p>
+ * <b>EOMONTH</b>(<b>start_date</b>,<b>months</b>)
* <p>
* <b>start_date</b> is the starting date of the calculation
* <b>months</b> is the number of months to be added to <b>start_date</b>,
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java Fri May 21 21:22:40 2021
@@ -24,7 +24,7 @@ import java.math.BigInteger;
import java.util.HashMap;
/**
- * Implementation for Excel FACTDOUBLE() function.<p>
+ * Implementation for Excel FACTDOUBLE() function.
* <p>
* <b>Syntax</b>:<br> <b>FACTDOUBLE </b>(<b>number</b>)<br>
* <p>
@@ -46,6 +46,7 @@ public class FactDouble extends Fixed1Ar
//Caching of previously calculated factorial for speed
static HashMap<Integer, BigInteger> cache = new HashMap<>();
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
int number;
try {
@@ -75,6 +76,7 @@ public class FactDouble extends Fixed1Ar
return result;
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java Fri May 21 21:22:40 2021
@@ -26,10 +26,10 @@ import java.util.Arrays;
/**
* Implementation of Excel 'Analysis ToolPak' function FREQUENCY()<br>
- * Returns a frequency distribution as a vertical array<p>
+ * Returns a frequency distribution as a vertical array
* <p>
* <b>Syntax</b><br>
- * <b>FREQUENCY</b>(<b>data_array</b>, <b>bins_array</b>)<p>
+ * <b>FREQUENCY</b>(<b>data_array</b>, <b>bins_array</b>)
* <p>
* <b>data_array</b> Required. An array of or reference to a set of values for which you want to count frequencies.
* If data_array contains no values, FREQUENCY returns an array of zeros.<br>
@@ -43,6 +43,7 @@ public class Frequency extends Fixed2Arg
// enforce singleton
}
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
MatrixFunction.MutableValueCollector collector = new MatrixFunction.MutableValueCollector(false, false);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java Fri May 21 21:22:40 2021
@@ -21,7 +21,7 @@ import org.apache.poi.ss.formula.Operati
import org.apache.poi.ss.formula.eval.*;
/**
- * Implementation for Excel HEX2DEC() function.<p>
+ * Implementation for Excel HEX2DEC() function.
* <p>
* <b>Syntax</b>:<br> <b>HEX2DEC </b>(<b>number</b>)<br>
* <p>
@@ -40,6 +40,7 @@ public class Hex2Dec extends Fixed1ArgFu
static final int HEXADECIMAL_BASE = 16;
static final int MAX_NUMBER_OF_PLACES = 10;
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
final String hex;
if (numberVE instanceof RefEval) {
@@ -55,6 +56,7 @@ public class Hex2Dec extends Fixed1ArgFu
}
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java Fri May 21 21:22:40 2021
@@ -27,7 +27,7 @@ import org.apache.poi.ss.formula.eval.St
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation for Excel ImReal() function.<p>
+ * Implementation for Excel ImReal() function.
* <p>
* <b>Syntax</b>:<br> <b>ImReal </b>(<b>Inumber</b>)<br>
* <p>
@@ -45,6 +45,7 @@ public class ImReal extends Fixed1ArgFun
public static final FreeRefFunction instance = new ImReal();
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval inumberVE) {
ValueEval veText1;
try {
@@ -55,38 +56,24 @@ public class ImReal extends Fixed1ArgFun
String iNumber = OperandResolver.coerceValueToString(veText1);
Matcher m = Imaginary.COMPLEX_NUMBER_PATTERN.matcher(iNumber);
- boolean result = m.matches();
-
- String real = "";
- if (result) {
- String realGroup = m.group(2);
- boolean hasRealPart = realGroup.length() != 0;
-
- if (realGroup.length() == 0) {
- return new StringEval(String.valueOf(0));
- }
-
- if (hasRealPart) {
- String sign = "";
- String realSign = m.group(Imaginary.GROUP1_REAL_SIGN);
- if (realSign.length() != 0 && !(realSign.equals("+"))) {
- sign = realSign;
- }
-
- String groupRealNumber = m.group(Imaginary.GROUP2_IMAGINARY_INTEGER_OR_DOUBLE);
- if (groupRealNumber.length() != 0) {
- real = sign + groupRealNumber;
- } else {
- real = sign + "1";
- }
- }
- } else {
+ if (!m.matches()) {
return ErrorEval.NUM_ERROR;
}
- return new StringEval(real);
+ String realGroup = m.group(2);
+ if (realGroup.isEmpty()) {
+ return new StringEval("0");
+ }
+
+ String realSign = m.group(Imaginary.GROUP1_REAL_SIGN);
+ String groupRealNumber = m.group(Imaginary.GROUP2_IMAGINARY_INTEGER_OR_DOUBLE);
+ String sign = "+".equals(realSign) ? "" : realSign;
+ String real = groupRealNumber.isEmpty() ? "1" : groupRealNumber;
+
+ return new StringEval(sign + real);
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java Fri May 21 21:22:40 2021
@@ -24,7 +24,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Implementation for Excel IMAGINARY() function.<p>
+ * Implementation for Excel IMAGINARY() function.
* <p>
* <b>Syntax</b>:<br> <b>IMAGINARY </b>(<b>Inumber</b>)<br>
* <p>
@@ -56,6 +56,7 @@ public class Imaginary extends Fixed1Arg
public static final int GROUP3_IMAGINARY_SIGN = 3;
public static final int GROUP4_IMAGINARY_INTEGER_OR_DOUBLE = 4;
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval inumberVE) {
ValueEval veText1;
try {
@@ -98,6 +99,7 @@ public class Imaginary extends Fixed1Arg
return new StringEval(imaginary);
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java Fri May 21 21:22:40 2021
@@ -28,7 +28,7 @@ import org.apache.poi.ss.formula.functio
* Calculates the INTERCEPT of the linear regression line that is used to predict y values from x values<br>
* (http://introcs.cs.princeton.edu/java/97data/LinearRegression.java.html)
* <b>Syntax</b>:<br>
- * <b>INTERCEPT</b>(<b>arrayX</b>, <b>arrayY</b>)<p>
+ * <b>INTERCEPT</b>(<b>arrayX</b>, <b>arrayY</b>)
*/
public final class Intercept extends Fixed2ArgFunction {
@@ -37,6 +37,7 @@ public final class Intercept extends Fix
func = new LinearRegressionFunction(FUNCTION.INTERCEPT);
}
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex,
ValueEval arg0, ValueEval arg1) {
return func.evaluate(srcRowIndex, srcColumnIndex, arg0, arg1);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java Fri May 21 21:22:40 2021
@@ -23,7 +23,7 @@ import org.apache.poi.ss.formula.eval.Op
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * <p>Implementation for Excel Oct2Dec() function.<p>
+ * <p>Implementation for Excel Oct2Dec() function.
* <p>
* Converts an octal number to decimal.
* </p>
@@ -44,6 +44,7 @@ public class Oct2Dec extends Fixed1ArgFu
static final int MAX_NUMBER_OF_PLACES = 10;
static final int OCTAL_BASE = 8;
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
String octal = OperandResolver.coerceValueToString(numberVE);
try {
@@ -53,6 +54,7 @@ public class Oct2Dec extends Fixed1ArgFu
}
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java Fri May 21 21:22:40 2021
@@ -23,11 +23,10 @@ import org.apache.poi.ss.formula.eval.Va
import org.apache.poi.ss.formula.eval.*;
/**
- * <p>Implementation for Excel QUOTIENT () function.<p>
+ * <p>Implementation for Excel QUOTIENT () function.
* <p>
* <b>Syntax</b>:<br> <b>QUOTIENT</b>(<b>Numerator</b>,<b>Denominator</b>)<br>
* <p>
- * <p>
* Numerator is the dividend.
* Denominator is the divisor.
*
@@ -41,16 +40,17 @@ public class Quotient extends Fixed2ArgF
public static final FreeRefFunction instance = new Quotient();
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval venumerator, ValueEval vedenominator) {
- double enumerator = 0;
+ double enumerator;
try {
enumerator = OperandResolver.coerceValueToDouble(venumerator);
} catch (EvaluationException e) {
return ErrorEval.VALUE_INVALID;
}
- double denominator = 0;
+ double denominator;
try {
denominator = OperandResolver.coerceValueToDouble(vedenominator);
} catch (EvaluationException e) {
@@ -64,6 +64,7 @@ public class Quotient extends Fixed2ArgF
return new NumberEval((int)(enumerator / denominator));
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length != 2) {
return ErrorEval.VALUE_INVALID;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Rept.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Rept.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Rept.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Rept.java Fri May 21 21:22:40 2021
@@ -24,7 +24,7 @@ import org.apache.poi.ss.formula.eval.St
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation for Excel REPT () function.<p>
+ * Implementation for Excel REPT () function.
* <p>
* <b>Syntax</b>:<br> <b>REPT </b>(<b>text</b>,<b>number_times</b> )<br>
* <p>
@@ -41,6 +41,7 @@ import org.apache.poi.ss.formula.eval.Va
public class Rept extends Fixed2ArgFunction {
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval text, ValueEval number_times) {
ValueEval veText1;
@@ -50,7 +51,7 @@ public class Rept extends Fixed2ArgFunct
return e.getErrorEval();
}
String strText1 = OperandResolver.coerceValueToString(veText1);
- double numberOfTime = 0;
+ double numberOfTime;
try {
numberOfTime = OperandResolver.coerceValueToDouble(number_times);
} catch (EvaluationException e) {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Roman.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Roman.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Roman.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Roman.java Fri May 21 21:22:40 2021
@@ -24,13 +24,12 @@ import org.apache.poi.ss.formula.eval.St
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation for Excel Roman() function.<p>
+ * Implementation for Excel Roman() function.
* <p>
* <b>Syntax</b>:<br> <b>Roman </b>(<b>number</b>,<b>form</b>)<br>
* <p>
* Converts an arabic numeral to roman, as text.
* <p>
- * <p>
* Number Required. The Arabic numeral you want converted.<p>
* Form Optional. A number specifying the type of roman numeral you want.
* The roman numeral style ranges from Classic to Simplified, becoming more concise as the value of form increases.
@@ -79,6 +78,7 @@ public class Roman extends Fixed2ArgFunc
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE, ValueEval formVE) {
final int number;
try {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Slope.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Slope.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Slope.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Slope.java Fri May 21 21:22:40 2021
@@ -28,7 +28,7 @@ import org.apache.poi.ss.formula.functio
* Calculates the SLOPE of the linear regression line that is used to predict y values from x values<br>
* (http://introcs.cs.princeton.edu/java/97data/LinearRegression.java.html)
* <b>Syntax</b>:<br>
- * <b>SLOPE</b>(<b>arrayX</b>, <b>arrayY</b>)<p>
+ * <b>SLOPE</b>(<b>arrayX</b>, <b>arrayY</b>)
*/
public final class Slope extends Fixed2ArgFunction {
@@ -37,6 +37,7 @@ public final class Slope extends Fixed2A
func = new LinearRegressionFunction(FUNCTION.SLOPE);
}
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex,
ValueEval arg0, ValueEval arg1) {
return func.evaluate(srcRowIndex, srcColumnIndex, arg0, arg1);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java Fri May 21 21:22:40 2021
@@ -29,13 +29,12 @@ import org.apache.poi.ss.usermodel.DateU
import org.apache.poi.util.LocaleUtil;
/**
- * Implementation for Excel WeekNum() function.<p>
+ * Implementation for Excel WeekNum() function.
* <p>
* <b>Syntax</b>:<br> <b>WeekNum </b>(<b>Serial_num</b>,<b>Return_type</b>)<br>
* <p>
* Returns a number that indicates where the week falls numerically within a year.
* <p>
- * <p>
* Serial_num is a date within the week. Dates should be entered by using the DATE function,
* or as results of other formulas or functions. For example, use DATE(2008,5,23)
* for the 23rd day of May, 2008. Problems can occur if dates are entered as text.
@@ -46,6 +45,7 @@ import org.apache.poi.util.LocaleUtil;
public class WeekNum extends Fixed2ArgFunction implements FreeRefFunction {
public static final FreeRefFunction instance = new WeekNum();
+ @Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval serialNumVE, ValueEval returnTypeVE) {
double serialNum;
try {
@@ -80,6 +80,7 @@ public class WeekNum extends Fixed2ArgFu
return cal.get(Calendar.WEEK_OF_YEAR);
}
+ @Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
if (args.length == 2) {
return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java Fri May 21 21:22:40 2021
@@ -18,7 +18,7 @@ package org.apache.poi.ss.usermodel;
/**
* Utility to identify built-in formats. The following is a list of the formats as
- * returned by this class.<p>
+ * returned by this class.
*<p>
* 0, "General"<br>
* 1, "0"<br>
@@ -59,7 +59,6 @@ package org.apache.poi.ss.usermodel;
* 0x30, "##0.0E+0"<br>
* 0x31, "@" - This is text format.<br>
* 0x31 "text" - Alias for "@"<br>
- * <p>
*/
public final class BuiltinFormats {
/**
@@ -108,7 +107,7 @@ public final class BuiltinFormats {
"reserved-0x22",
"reserved-0x23",
"reserved-0x24",
-
+
"#,##0_);(#,##0)",
"#,##0_);[Red](#,##0)",
"#,##0.00_);(#,##0.00)",
@@ -135,7 +134,7 @@ public final class BuiltinFormats {
* Get the format string that matches the given format index
*
* @param index of a built in format
- * @return string represented at index of format or <code>null</code> if there is not a built-in format at that index
+ * @return string represented at index of format or {@code null} if there is not a built-in format at that index
*/
public static String getBuiltinFormat(int index) {
if (index < 0 || index >=_formats.length) {
@@ -147,7 +146,7 @@ public final class BuiltinFormats {
/**
* Get the format index that matches the given format string.<br>
* Automatically converts "text" to excel's format string to represent text.
- *
+ *
* @param pFmt string matching a built-in format
* @return index of format or -1 if undefined.
*/
@@ -158,10 +157,10 @@ public final class BuiltinFormats {
for (String f : _formats) {
i++;
if (f.equals(fmt)) {
- return i;
+ return i;
}
}
-
+
return -1;
}
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Comment.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Comment.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Comment.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Comment.java Fri May 21 21:22:40 2021
@@ -24,17 +24,17 @@ public interface Comment {
/**
* Sets whether this comment is visible.
*
- * @param visible <code>true</code> if the comment is visible, <code>false</code> otherwise
+ * @param visible {@code true} if the comment is visible, {@code false} otherwise
*/
void setVisible(boolean visible);
/**
* Returns whether this comment is visible.
*
- * @return <code>true</code> if the comment is visible, <code>false</code> otherwise
+ * @return {@code true} if the comment is visible, {@code false} otherwise
*/
boolean isVisible();
-
+
/**
* Get the address of the cell that this comment is attached to
*
@@ -42,20 +42,17 @@ public interface Comment {
* @since 3.15-beta1
*/
CellAddress getAddress();
-
+
/**
* Set the address of the cell that this comment is attached to
*
- * @param addr
* @since 3.15-beta1
*/
void setAddress(CellAddress addr);
-
+
/**
* Set the address of the cell that this comment is attached to
*
- * @param row
- * @param col
* @since 3.15-beta1
*/
void setAddress(int row, int col);
@@ -101,11 +98,11 @@ public interface Comment {
* @param author the name of the original author of the comment
*/
void setAuthor(String author);
-
+
/**
* Fetches the rich text string of the comment
*/
- public RichTextString getString();
+ RichTextString getString();
/**
* Sets the rich text string used by this comment.
@@ -118,10 +115,10 @@ public interface Comment {
* Return defines position of this anchor in the sheet.
* The anchor is the yellow box/balloon that is rendered on top of the sheets
* when the comment is visible.
- *
+ *
* To associate a comment with a different cell, use {@link #setAddress}.
*
* @return defines position of this anchor in the sheet
*/
- public ClientAnchor getClientAnchor();
+ ClientAnchor getClientAnchor();
}
\ No newline at end of file
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java Fri May 21 21:22:40 2021
@@ -16,7 +16,7 @@
2012 - Alfresco Software, Ltd.
Alfresco Software has modified source of this file
- The details of changes as svn diff can be found in svn at location root/projects/3rd-party/src
+ The details of changes as svn diff can be found in svn at location root/projects/3rd-party/src
==================================================================== */
package org.apache.poi.ss.usermodel;
@@ -32,16 +32,15 @@ public class ExcelNumberFormat {
private final int idx;
private final String format;
-
+
/**
- * @param style
* @return null if the style is null, instance from style data format values otherwise
*/
public static ExcelNumberFormat from(CellStyle style) {
if (style == null) return null;
return new ExcelNumberFormat(style.getDataFormat(), style.getDataFormatString());
}
-
+
/**
* @param cell cell to extract format from
* @param cfEvaluator ConditionalFormattingEvaluator to use, or null if none in this context
@@ -49,9 +48,9 @@ public class ExcelNumberFormat {
*/
public static ExcelNumberFormat from(Cell cell, ConditionalFormattingEvaluator cfEvaluator) {
if (cell == null) return null;
-
+
ExcelNumberFormat nf = null;
-
+
if (cfEvaluator != null) {
// first one wins (priority order, per Excel help)
List<EvaluationConditionalFormatRule> rules = cfEvaluator.getConditionalFormattingForCell(cell);
@@ -66,7 +65,7 @@ public class ExcelNumberFormat {
}
return nf;
}
-
+
/**
* Use this carefully, prefer factory methods to ensure id/format relationships are not broken or confused.
* Left public so {@link ConditionalFormattingRule#getNumberFormat()} implementations can use it.
@@ -77,8 +76,8 @@ public class ExcelNumberFormat {
this.idx = idx;
this.format = format;
}
-
-
+
+
/**
*
@@ -87,7 +86,7 @@ public class ExcelNumberFormat {
public int getIdx() {
return idx;
}
-
+
/**
*
* @return Excel number format string for the index
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Table.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Table.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Table.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Table.java Fri May 21 21:22:40 2021
@@ -71,9 +71,9 @@ public interface Table {
* Returns the index of a given named column in the table (names are case insensitive in XSSF).
* Note this list is lazily loaded and cached for performance.
* Changes to the underlying table structure are not reflected in later calls
- * unless <code>XSSFTable.updateHeaders()</code> is called to reset the cache.
+ * unless {@code XSSFTable.updateHeaders()} is called to reset the cache.
* @param columnHeader the column header name to get the table column index of
- * @return column index corresponding to <code>columnHeader</code>
+ * @return column index corresponding to {@code columnHeader}
*/
int findColumnIndex(String columnHeader);
/**
@@ -115,7 +115,6 @@ public interface Table {
/**
* checks if the given cell is part of the table. Includes checking that they are on the same sheet.
- * @param cell
* @return true if the table and cell are on the same sheet and the cell is within the table range.
* @since 3.17 beta 1
* @see #contains(CellReference) (prefered, faster execution and handles undefined cells)
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java Fri May 21 21:22:40 2021
@@ -21,7 +21,7 @@ package org.apache.poi.ss.usermodel;
* Data table style definition. Includes style elements for various table components.
* Any number of style elements may be represented, and any cell may be styled by
* multiple elements. The order of elements in {@link TableStyleType} defines precedence.
- *
+ *
* @since 3.17 beta 1
*/
public interface TableStyle {
@@ -30,25 +30,23 @@ public interface TableStyle {
* @return name (may be a built-in name)
*/
String getName();
-
+
/**
* Some clients may care where in the table style list this definition came from, so we'll track it.
- * The spec only references these by name, unlike Dxf records, which these definitions reference by index
+ * The spec only references these by name, unlike Dxf records, which these definitions reference by index
* (XML definition order). Nice of MS to be consistent when defining the ECMA standard.
* Use org.apache.poi.xssf.usermodel.XSSFBuiltinTableStyle.isBuiltinStyle(TableStyle) to determine whether the index is for a built-in style or explicit user style
* @return index from org.apache.poi.xssf.model.StylesTable.getExplicitTableStyle(String) or org.apache.poi.xssf.usermodel.XSSFBuiltinTableStyle.ordinal()
*/
int getIndex();
-
+
/**
*
* @return true if this is a built-in style defined in the OOXML specification, false if it is a user style
*/
boolean isBuiltin();
-
+
/**
- *
- * @param type
* @return style definition for the given type, or null if not defined in this style.
*/
DifferentialStyleProvider getStyle(TableStyleType type);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java Fri May 21 21:22:40 2021
@@ -33,12 +33,13 @@ import org.apache.poi.ss.util.CellRefere
* first style is found defining a value for that property.
* <p>
* Enum names match the OOXML spec values exactly, so {@link #valueOf(String)} will work.
- *
+ *
* @since 3.17 beta 1
*/
public enum TableStyleType {
/***/
wholeTable {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
return new CellRangeAddress(table.getStartRowIndex(), table.getEndRowIndex(), table.getStartColIndex(), table.getEndColIndex());
}
@@ -49,6 +50,7 @@ public enum TableStyleType {
pageFieldValues, // pivot only
/***/
firstColumnStripe{
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
TableStyleInfo info = table.getStyle();
if (! info.isShowColumnStripes()) return null;
@@ -56,11 +58,11 @@ public enum TableStyleType {
DifferentialStyleProvider c2Style = info.getStyle().getStyle(secondColumnStripe);
int c1Stripe = c1Style == null ? 1 : Math.max(1, c1Style.getStripeSize());
int c2Stripe = c2Style == null ? 1 : Math.max(1, c2Style.getStripeSize());
-
+
int firstStart = table.getStartColIndex();
int secondStart = firstStart + c1Stripe;
final int c = cell.getCol();
-
+
// look for the stripe containing c, accounting for the style element stripe size
// could do fancy math, but tables can't be that wide, a simple loop is fine
// if not in this type of stripe, return null
@@ -76,10 +78,11 @@ public enum TableStyleType {
},
/***/
secondColumnStripe{
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
TableStyleInfo info = table.getStyle();
if (! info.isShowColumnStripes()) return null;
-
+
DifferentialStyleProvider c1Style = info.getStyle().getStyle(firstColumnStripe);
DifferentialStyleProvider c2Style = info.getStyle().getStyle(secondColumnStripe);
int c1Stripe = c1Style == null ? 1 : Math.max(1, c1Style.getStripeSize());
@@ -88,7 +91,7 @@ public enum TableStyleType {
int firstStart = table.getStartColIndex();
int secondStart = firstStart + c1Stripe;
final int c = cell.getCol();
-
+
// look for the stripe containing c, accounting for the style element stripe size
// could do fancy math, but tables can't be that wide, a simple loop is fine
// if not in this type of stripe, return null
@@ -104,10 +107,11 @@ public enum TableStyleType {
},
/***/
firstRowStripe {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
TableStyleInfo info = table.getStyle();
if (! info.isShowRowStripes()) return null;
-
+
DifferentialStyleProvider c1Style = info.getStyle().getStyle(firstRowStripe);
DifferentialStyleProvider c2Style = info.getStyle().getStyle(secondRowStripe);
int c1Stripe = c1Style == null ? 1 : Math.max(1, c1Style.getStripeSize());
@@ -116,7 +120,7 @@ public enum TableStyleType {
int firstStart = table.getStartRowIndex() + table.getHeaderRowCount();
int secondStart = firstStart + c1Stripe;
final int c = cell.getRow();
-
+
// look for the stripe containing c, accounting for the style element stripe size
// could do fancy math, but tables can't be that wide, a simple loop is fine
// if not in this type of stripe, return null
@@ -132,10 +136,11 @@ public enum TableStyleType {
},
/***/
secondRowStripe{
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
TableStyleInfo info = table.getStyle();
if (! info.isShowRowStripes()) return null;
-
+
DifferentialStyleProvider c1Style = info.getStyle().getStyle(firstRowStripe);
DifferentialStyleProvider c2Style = info.getStyle().getStyle(secondRowStripe);
int c1Stripe = c1Style == null ? 1 : Math.max(1, c1Style.getStripeSize());
@@ -144,7 +149,7 @@ public enum TableStyleType {
int firstStart = table.getStartRowIndex() + table.getHeaderRowCount();
int secondStart = firstStart + c1Stripe;
final int c = cell.getRow();
-
+
// look for the stripe containing c, accounting for the style element stripe size
// could do fancy math, but tables can't be that wide, a simple loop is fine
// if not in this type of stripe, return null
@@ -160,6 +165,7 @@ public enum TableStyleType {
},
/***/
lastColumn {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
if (! table.getStyle().isShowLastColumn()) return null;
return new CellRangeAddress(table.getStartRowIndex(), table.getEndRowIndex(), table.getEndColIndex(), table.getEndColIndex());
@@ -167,6 +173,7 @@ public enum TableStyleType {
},
/***/
firstColumn {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
if (! table.getStyle().isShowFirstColumn()) return null;
return new CellRangeAddress(table.getStartRowIndex(), table.getEndRowIndex(), table.getStartColIndex(), table.getStartColIndex());
@@ -174,6 +181,7 @@ public enum TableStyleType {
},
/***/
headerRow {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
if (table.getHeaderRowCount() < 1) return null;
return new CellRangeAddress(table.getStartRowIndex(), table.getStartRowIndex() + table.getHeaderRowCount() -1, table.getStartColIndex(), table.getEndColIndex());
@@ -181,6 +189,7 @@ public enum TableStyleType {
},
/***/
totalRow {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
if (table.getTotalsRowCount() < 1) return null;
return new CellRangeAddress(table.getEndRowIndex() - table.getTotalsRowCount() +1, table.getEndRowIndex(), table.getStartColIndex(), table.getEndColIndex());
@@ -188,6 +197,7 @@ public enum TableStyleType {
},
/***/
firstHeaderCell {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
if (table.getHeaderRowCount() < 1) return null;
return new CellRangeAddress(table.getStartRowIndex(), table.getStartRowIndex(), table.getStartColIndex(), table.getStartColIndex());
@@ -195,6 +205,7 @@ public enum TableStyleType {
},
/***/
lastHeaderCell {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
if (table.getHeaderRowCount() < 1) return null;
return new CellRangeAddress(table.getStartRowIndex(), table.getStartRowIndex(), table.getEndColIndex(), table.getEndColIndex());
@@ -202,6 +213,7 @@ public enum TableStyleType {
},
/***/
firstTotalCell {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
if (table.getTotalsRowCount() < 1) return null;
return new CellRangeAddress(table.getEndRowIndex() - table.getTotalsRowCount() +1, table.getEndRowIndex(), table.getStartColIndex(), table.getStartColIndex());
@@ -209,6 +221,7 @@ public enum TableStyleType {
},
/***/
lastTotalCell {
+ @Override
public CellRangeAddressBase getRange(Table table, CellReference cell) {
if (table.getTotalsRowCount() < 1) return null;
return new CellRangeAddress(table.getEndRowIndex() - table.getTotalsRowCount() +1, table.getEndRowIndex(), table.getEndColIndex(), table.getEndColIndex());
@@ -242,7 +255,7 @@ public enum TableStyleType {
/***/
thirdRowSubheading,
;
-
+
/**
* A range is returned only for the part of the table matching this enum instance and containing the given cell.
* Null is returned for all other cases, such as:
@@ -255,9 +268,9 @@ public enum TableStyleType {
* The returned range can be used to determine how style options may or may not apply to this cell.
* For example, {@link #wholeTable} borders only apply to the outer boundary of a table, while the
* rest of the styling, such as font and color, could apply to all the interior cells as well.
- *
+ *
* @param table table to evaluate
- * @param cell to evaluate
+ * @param cell to evaluate
* @return range in the table representing this class of cells, if it contains the given cell, or null if not applicable.
* Stripe style types return only the stripe range containing the given cell, or null.
*/
@@ -265,7 +278,7 @@ public enum TableStyleType {
if (cell == null) return null;
return appliesTo(table, new CellReference(cell.getSheet().getSheetName(), cell.getRowIndex(), cell.getColumnIndex(), true, true));
}
-
+
/**
* A range is returned only for the part of the table matching this enum instance and containing the given cell reference.
* Null is returned for all other cases, such as:
@@ -278,9 +291,9 @@ public enum TableStyleType {
* The returned range can be used to determine how style options may or may not apply to this cell.
* For example, {@link #wholeTable} borders only apply to the outer boundary of a table, while the
* rest of the styling, such as font and color, could apply to all the interior cells as well.
- *
+ *
* @param table table to evaluate
- * @param cell CellReference to evaluate
+ * @param cell CellReference to evaluate
* @return range in the table representing this class of cells, if it contains the given cell, or null if not applicable.
* Stripe style types return only the stripe range containing the given cell, or null.
*/
@@ -288,7 +301,7 @@ public enum TableStyleType {
if (table == null || cell == null) return null;
if ( ! cell.getSheetName().equals(table.getSheetName())) return null;
if ( ! table.contains(cell)) return null;
-
+
final CellRangeAddressBase range = getRange(table, cell);
if (range != null && range.isInRange(cell.getRow(), cell.getCol())) return range;
// else
@@ -297,8 +310,6 @@ public enum TableStyleType {
/**
* Calls {@link #getRange(Table, CellReference)}. Use that instead for performance.
- * @param table
- * @param cell
* @return default is unimplemented/null
* @see #getRange(Table, CellReference)
*/
@@ -306,11 +317,8 @@ public enum TableStyleType {
if (cell == null) return null;
return getRange(table, new CellReference(cell.getSheet().getSheetName(), cell.getRowIndex(), cell.getColumnIndex(), true, true));
}
-
+
/**
- *
- * @param table
- * @param cell
* @return default is unimplemented/null
*/
public CellRangeAddressBase getRange(Table table, CellReference cell) {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java Fri May 21 21:22:40 2021
@@ -23,7 +23,7 @@ import org.apache.poi.ss.formula.SheetNa
import org.apache.poi.util.LittleEndianOutput;
/**
- * See OOO documentation: excelfileformat.pdf sec 2.5.14 - 'Cell Range Address'<p>
+ * See OOO documentation: excelfileformat.pdf sec 2.5.14 - 'Cell Range Address'
*
* <p>In the Microsoft documentation, this is also known as a
* Ref8U - see page 831 of version 1.0 of the documentation.
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java Fri May 21 21:22:40 2021
@@ -52,8 +52,7 @@ public abstract class CellRangeAddressBa
/** range ending columns are equal */
RIGHT,
/** a cell or range is completely inside another range, without touching any edges (a cell in this position can't be in any others) */
- INSIDE,
- ;
+ INSIDE
}
private int _firstRow;
private int _firstCol;
@@ -81,7 +80,6 @@ public abstract class CellRangeAddressBa
}
/**
* Runs a bounds check for row numbers
- * @param row
*/
private static void validateRow(int row, SpreadsheetVersion ssVersion) {
int maxrow = ssVersion.getLastRowIndex();
@@ -91,7 +89,6 @@ public abstract class CellRangeAddressBa
/**
* Runs a bounds check for column numbers
- * @param column
*/
private static void validateColumn(int column, SpreadsheetVersion ssVersion) {
int maxcol = ssVersion.getLastColumnIndex();
@@ -231,8 +228,6 @@ public abstract class CellRangeAddressBa
/**
* Useful for logic like table/range styling, where some elements apply based on relative position in a range.
- * @param rowInd
- * @param colInd
* @return set of {@link CellPosition}s occupied by the given coordinates. Empty if the coordinates are not in the range, never null.
* @since 3.17 beta 1
*/
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java Fri May 21 21:22:40 2021
@@ -34,19 +34,19 @@ import org.apache.poi.ss.usermodel.Workb
/**
* <p>
- * A {@link PropertyTemplate} is a template that can be applied to any sheet in
+ * A PropertyTemplate is a template that can be applied to any sheet in
* a project. It contains all the border type and color attributes needed to
* draw all the borders for a single sheet. That template can be applied to any
* sheet in any workbook.
- *
- * This class requires the full spreadsheet to be in memory, so
+ *
+ * This class requires the full spreadsheet to be in memory, so
* {@link org.apache.poi.xssf.streaming.SXSSFWorkbook} Spreadsheets are not
- * supported. The same {@link PropertyTemplate} can, however, be applied to both
+ * supported. The same PropertyTemplate can, however, be applied to both
* {@link HSSFWorkbook} and {@link org.apache.poi.xssf.usermodel.XSSFWorkbook}
* objects if necessary. Portions of the border that fall outside the max range
* of the {@link Workbook} sheet are ignored.
* </p>
- *
+ *
* <p>
* This would replace {@link RegionUtil}.
* </p>
@@ -57,7 +57,7 @@ public final class PropertyTemplate {
* This is a list of cell properties for one shot application to a range of
* cells at a later time.
*/
- private Map<CellAddress, Map<String, Object>> _propertyTemplate;
+ private final Map<CellAddress, Map<String, Object>> _propertyTemplate;
/**
* Create a PropertyTemplate object
@@ -65,7 +65,7 @@ public final class PropertyTemplate {
public PropertyTemplate() {
_propertyTemplate = new HashMap<>();
}
-
+
/**
* Create a PropertyTemplate object from another PropertyTemplate
*
@@ -77,11 +77,11 @@ public final class PropertyTemplate {
_propertyTemplate.put(new CellAddress(entry.getKey()), cloneCellProperties(entry.getValue()));
}
}
-
+
private Map<CellAddress,Map<String, Object>> getTemplate() {
return _propertyTemplate;
}
-
+
private static Map<String, Object> cloneCellProperties(Map<String, Object> properties) {
Map<String, Object> newProperties = new HashMap<>();
for(Map.Entry<String, Object> entry : properties.entrySet()) {
@@ -89,12 +89,12 @@ public final class PropertyTemplate {
}
return newProperties;
}
-
+
/**
* Draws a group of cell borders for a cell range. The borders are not
* applied to the cells at this time, just the template is drawn. To apply
* the drawn borders to a sheet, use {@link #applyBorders}.
- *
+ *
* @param range
* - {@link CellRangeAddress} range of cells on which borders are
* drawn.
@@ -158,7 +158,7 @@ public final class PropertyTemplate {
* Draws a group of cell borders for a cell range. The borders are not
* applied to the cells at this time, just the template is drawn. To apply
* the drawn borders to a sheet, use {@link #applyBorders}.
- *
+ *
* @param range
* - {@link CellRangeAddress} range of cells on which borders are
* drawn.
@@ -183,7 +183,7 @@ public final class PropertyTemplate {
* <p>
* Draws the top border for a range of cells
* </p>
- *
+ *
* @param range
* - {@link CellRangeAddress} range of cells on which borders are
* drawn.
@@ -206,7 +206,7 @@ public final class PropertyTemplate {
* <p>
* Draws the bottom border for a range of cells
* </p>
- *
+ *
* @param range
* - {@link CellRangeAddress} range of cells on which borders are
* drawn.
@@ -405,10 +405,10 @@ public final class PropertyTemplate {
}
/**
- * Removes all border properties from this {@link PropertyTemplate} for the
+ * Removes all border properties from this PropertyTemplate for the
* specified range.
- *
- * @parm range - {@link CellRangeAddress} range of cells to remove borders.
+ *
+ * @param range - {@link CellRangeAddress} range of cells to remove borders.
*/
private void removeBorders(CellRangeAddress range) {
Set<String> properties = new HashSet<>();
@@ -752,10 +752,10 @@ public final class PropertyTemplate {
}
/**
- * Removes all border properties from this {@link PropertyTemplate} for the
+ * Removes all border properties from this PropertyTemplate for the
* specified range.
- *
- * @parm range - {@link CellRangeAddress} range of cells to remove borders.
+ *
+ * @param range - {@link CellRangeAddress} range of cells to remove borders.
*/
private void removeBorderColors(CellRangeAddress range) {
Set<String> properties = new HashSet<>();
@@ -772,24 +772,14 @@ public final class PropertyTemplate {
}
/**
- * Adds a property to this {@link PropertyTemplate} for a given cell
- *
- * @param row
- * @param col
- * @param property
- * @param value
+ * Adds a property to this PropertyTemplate for a given cell
*/
private void addProperty(int row, int col, String property, short value) {
addProperty(row, col, property, Short.valueOf(value));
}
/**
- * Adds a property to this {@link PropertyTemplate} for a given cell
- *
- * @param row
- * @param col
- * @param property
- * @param value
+ * Adds a property to this PropertyTemplate for a given cell
*/
private void addProperty(int row, int col, String property, Object value) {
CellAddress cell = new CellAddress(row, col);
@@ -802,12 +792,8 @@ public final class PropertyTemplate {
}
/**
- * Removes a set of properties from this {@link PropertyTemplate} for a
+ * Removes a set of properties from this PropertyTemplate for a
* given cell
- *
- * @param row
- * @param col
- * @param properties
*/
private void removeProperties(int row, int col, Set<String> properties) {
CellAddress cell = new CellAddress(row, col);
@@ -824,8 +810,6 @@ public final class PropertyTemplate {
/**
* Retrieves the number of borders assigned to a cell
- *
- * @param cell
*/
public int getNumBorders(CellAddress cell) {
Map<String, Object> cellProperties = _propertyTemplate.get(cell);
@@ -849,9 +833,6 @@ public final class PropertyTemplate {
/**
* Retrieves the number of borders assigned to a cell
- *
- * @param row
- * @param col
*/
public int getNumBorders(int row, int col) {
return getNumBorders(new CellAddress(row, col));
@@ -859,8 +840,6 @@ public final class PropertyTemplate {
/**
* Retrieves the number of border colors assigned to a cell
- *
- * @param cell
*/
public int getNumBorderColors(CellAddress cell) {
Map<String, Object> cellProperties = _propertyTemplate.get(cell);
@@ -884,9 +863,6 @@ public final class PropertyTemplate {
/**
* Retrieves the number of border colors assigned to a cell
- *
- * @param row
- * @param col
*/
public int getNumBorderColors(int row, int col) {
return getNumBorderColors(new CellAddress(row, col));
@@ -894,9 +870,6 @@ public final class PropertyTemplate {
/**
* Retrieves the border style for a given cell
- *
- * @param cell
- * @param property
*/
public BorderStyle getBorderStyle(CellAddress cell, String property) {
BorderStyle value = BorderStyle.NONE;
@@ -912,10 +885,6 @@ public final class PropertyTemplate {
/**
* Retrieves the border style for a given cell
- *
- * @param row
- * @param col
- * @param property
*/
public BorderStyle getBorderStyle(int row, int col, String property) {
return getBorderStyle(new CellAddress(row, col), property);
@@ -923,9 +892,6 @@ public final class PropertyTemplate {
/**
* Retrieves the border style for a given cell
- *
- * @param cell
- * @param property
*/
public short getTemplateProperty(CellAddress cell, String property) {
short value = 0;
@@ -941,10 +907,6 @@ public final class PropertyTemplate {
/**
* Retrieves the border style for a given cell
- *
- * @param row
- * @param col
- * @param property
*/
public short getTemplateProperty(int row, int col, String property) {
return getTemplateProperty(new CellAddress(row, col), property);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetBuilder.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetBuilder.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetBuilder.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SheetBuilder.java Fri May 21 21:22:40 2021
@@ -81,14 +81,13 @@ public class SheetBuilder {
* cells), creates cells if either corresponding array value is not
* null or createEmptyCells property is true.
* The conversion is performed in the following way:
- * <p>
* <ul>
* <li>Numbers become numeric cells.</li>
- * <li><code>java.util.Date</code> or <code>java.util.Calendar</code>
+ * <li>{@code java.util.Date} or {@code java.util.Calendar}
* instances become date cells.</li>
* <li>String with leading '=' char become formulas (leading '='
* will be truncated).</li>
- * <li>Other objects become strings via <code>Object.toString()</code>
+ * <li>Other objects become strings via {@code Object.toString()}
* method call.</li>
* </ul>
*
Modified: poi/trunk/poi/src/main/java/org/apache/poi/util/DocumentFormatException.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/util/DocumentFormatException.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/util/DocumentFormatException.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/util/DocumentFormatException.java Fri May 21 21:22:40 2021
@@ -39,11 +39,8 @@ public class DocumentFormatException ext
/**
* Syntactic sugar to check whether a DocumentFormatException should
- * be thrown. If assertTrue is <code>false</code>, this will throw this
+ * be thrown. If assertTrue is {@code false}, this will throw this
* exception with the message.
- *
- * @param assertTrue
- * @param message
*/
public static void check(boolean assertTrue, String message) {
if (!assertTrue) {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/util/GenericRecordUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/util/GenericRecordUtil.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/util/GenericRecordUtil.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/util/GenericRecordUtil.java Fri May 21 21:22:40 2021
@@ -32,7 +32,7 @@ public final class GenericRecordUtil {
public static Map<String, Supplier<?>>
getGenericProperties(String val1, Supplier<?> sup1) {
- return Collections.unmodifiableMap(Collections.singletonMap(val1, sup1));
+ return Collections.singletonMap(val1, sup1);
}
public static Map<String, Supplier<?>> getGenericProperties(
Modified: poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleID.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleID.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleID.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleID.java Fri May 21 21:22:40 2021
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
- * Locale Collection<p>
+ * Locale Collection
* <p>
* This enum can be used to map between Windows LCID and Java {@link java.util.Locale Locales}
*
Modified: poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/util/LocaleUtil.java Fri May 21 21:22:40 2021
@@ -115,9 +115,6 @@ public final class LocaleUtil {
/**
* Convenience method - month is 0-based as in java.util.Calendar
*
- * @param year
- * @param month
- * @param day
* @return a calendar for the user locale and time zone, and the given date
*/
public static Calendar getLocaleCalendar(int year, int month, int day) {
@@ -127,12 +124,6 @@ public final class LocaleUtil {
/**
* Convenience method - month is 0-based as in java.util.Calendar
*
- * @param year
- * @param month
- * @param day
- * @param hour
- * @param minute
- * @param second
* @return a calendar for the user locale and time zone, and the given date
*/
public static Calendar getLocaleCalendar(int year, int month, int day, int hour, int minute, int second) {
Modified: poi/trunk/poi/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/resources/log4j2-test.xml?rev=1890089&r1=1890088&r2=1890089&view=diff
==============================================================================
--- poi/trunk/poi/src/test/resources/log4j2-test.xml (original)
+++ poi/trunk/poi/src/test/resources/log4j2-test.xml Fri May 21 21:22:40 2021
@@ -31,8 +31,8 @@
<Logger name="org.apache.poi.hdgf.chunks.ChunkFactory" level="ERROR" />
<Logger name="org.apache.poi.hslf.model.textproperties.BitMaskTextProp" level="ERROR" />
<Logger name="org.apache.poi.hslf.usermodel.HSLFTextParagraph" level="ERROR" />
- <Logger name="org.apache.poi.openxml4j.opc.ZipPackage" level="ERROR" />
- <Logger name="org.apache.poi.POIDocument" level="WARN" />
+ <Logger name="org.apache.poi.openxml4j.opc.ZipPackage" level="FATAL" />
+ <Logger name="org.apache.poi.POIDocument" level="FATAL" />
<Logger name="org.apache.poi.openxml4j.opc.OPCPackage" level="ERROR" />
<Logger name="org.apache.poi.xssf.usermodel.XSSFWorkbook" level="ERROR" />
<Logger name="org.apache.poi.hslf.usermodel.HSLFGroupShape" level="WARN" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org