Author: fanningpj
Date: Sat May 17 17:00:58 2025
New Revision: 1925650
URL: http://svn.apache.org/viewvc?rev=1925650&view=rev
Log:
code refactor
Modified:
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Code.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Complex.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/AreaReference.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellReference.java
poi/trunk/poi/src/test/java/org/apache/poi/POIDataSamples.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
Modified:
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
(original)
+++
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
Sat May 17 17:00:58 2025
@@ -203,7 +203,7 @@ public final class ConditionalFormats {
if (rn%10 == 0) {
str = str + "x10 ";
}
- if (str.length() == 0) {
+ if (str.isEmpty()) {
str = "nothing special...";
}
r.createCell(1).setCellValue("It is " + str);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
Sat May 17 17:00:58 2025
@@ -356,7 +356,7 @@ public final class PackagePartName imple
private static void throwExceptionIfPartNameNotStartsWithForwardSlashChar(
URI partUri) throws InvalidFormatException {
String uriPath = partUri.getPath();
- if (uriPath.length() > 0
+ if (!uriPath.isEmpty()
&& uriPath.charAt(0) != PackagingURIHelper.FORWARD_SLASH_CHAR)
{
throw new InvalidFormatException(
"A part name shall start with a forward slash ('/')
character [M1.4]: "
@@ -377,7 +377,7 @@ public final class PackagePartName imple
private static void throwExceptionIfPartNameEndsWithForwardSlashChar(
URI partUri) throws InvalidFormatException {
String uriPath = partUri.getPath();
- if (uriPath.length() > 0
+ if (!uriPath.isEmpty()
&& uriPath.charAt(uriPath.length() - 1) ==
PackagingURIHelper.FORWARD_SLASH_CHAR) {
throw new InvalidFormatException(
"A part name shall not have a forward slash as the last
character [M1.5]: "
@@ -422,7 +422,7 @@ public final class PackagePartName imple
*/
public String getExtension() {
String fragment = this.partNameURI.getPath();
- if (fragment.length() > 0) {
+ if (!fragment.isEmpty()) {
int i = fragment.lastIndexOf('.');
if (i > -1) {
return fragment.substring(i + 1);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
Sat May 17 17:00:58 2025
@@ -287,7 +287,7 @@ public final class PackagingURIHelper {
// form must actually be an absolute URI
if(sourceURI.toString().equals("/")) {
String path = targetURI.getPath();
- if(msCompatible && path.length() > 0 && path.charAt(0) == '/') {
+ if(msCompatible && !path.isEmpty() && path.charAt(0) == '/') {
try {
targetURI = new URI(path.substring(1));
} catch (Exception e) {
@@ -701,7 +701,7 @@ public final class PackagingURIHelper {
}
// trailing white spaces must be url-encoded, see Bugzilla 53282
- if(value.length() > 0 ){
+ if(!value.isEmpty()){
StringBuilder b = new StringBuilder();
int idx = value.length() - 1;
for(; idx >= 0; idx--){
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
Sat May 17 17:00:58 2025
@@ -51,16 +51,16 @@ class XSSFBHeaderFooter {
String left = HEADER_FOOTER_HELPER.getLeftSection(rawString);
String center = HEADER_FOOTER_HELPER.getCenterSection(rawString);
String right = HEADER_FOOTER_HELPER.getRightSection(rawString);
- if (left != null && left.length() > 0) {
+ if (left != null && !left.isEmpty()) {
sb.append(left);
}
- if (center != null && center.length() > 0) {
+ if (center != null && !center.isEmpty()) {
if (sb.length() > 0) {
sb.append(' ');
}
sb.append(center);
}
- if (right != null && right.length() > 0) {
+ if (right != null && !right.isEmpty()) {
if (sb.length() > 0) {
sb.append(' ');
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
Sat May 17 17:00:58 2025
@@ -359,7 +359,7 @@ public class XSSFReader {
for (XSSFSheetRef xssfSheetRef : xmlSheetRefReader.getSheetRefs())
{
//if there's no relationship id, silently skip the sheet
String sheetId = xssfSheetRef.getId();
- if (sheetId != null && sheetId.length() > 0) {
+ if (sheetId != null && !sheetId.isEmpty()) {
validSheets.add(xssfSheetRef);
}
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
Sat May 17 17:00:58 2025
@@ -417,7 +417,7 @@ public class XSSFSheetXMLHandler extends
case SST_STRING:
String sstIndex = value.toString();
- if (sstIndex.length() > 0) {
+ if (!sstIndex.isEmpty()) {
try {
int idx = Integer.parseInt(sstIndex);
RichTextString rtss =
sharedStringsTable.getItemAt(idx);
@@ -430,7 +430,7 @@ public class XSSFSheetXMLHandler extends
case NUMBER:
String n = value.toString();
- if (this.formatString != null && n.length() > 0) {
+ if (this.formatString != null && !n.isEmpty()) {
try {
thisStr = formatter.formatRawCellContents(
Double.parseDouble(n), this.formatIndex,
this.formatString);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
Sat May 17 17:00:58 2025
@@ -302,7 +302,7 @@ public class XSSFEventBasedExcelExtracto
for (XSSFShape shape : shapes) {
if (shape instanceof XSSFSimpleShape) {
String sText = ((XSSFSimpleShape) shape).getText();
- if (sText != null && sText.length() > 0) {
+ if (sText != null && !sText.isEmpty()) {
text.append(sText).append('\n');
}
}
@@ -384,7 +384,7 @@ public class XSSFEventBasedExcelExtracto
*/
private void appendHeaderFooterText(StringBuilder buffer, String name)
{
String text = headerFooterMap.get(name);
- if (text != null && text.length() > 0) {
+ if (text != null && !text.isEmpty()) {
// this is a naive way of handling the left, center, and right
// header and footer delimiters, but it seems to be as good as
// the method used by XSSFExcelExtractor
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
Sat May 17 17:00:58 2025
@@ -192,7 +192,7 @@ public class XSSFExcelExtractor
for (XSSFShape shape : drawing.getShapes()){
if (shape instanceof XSSFSimpleShape){
String boxText =
((XSSFSimpleShape)shape).getText();
- if (boxText.length() > 0){
+ if (!boxText.isEmpty()){
text.append(boxText);
text.append('\n');
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
Sat May 17 17:00:58 2025
@@ -382,7 +382,7 @@ public class SheetDataWriter implements
* need to be preserved with the xml:space=\"preserve\" attribute
*/
boolean hasLeadingTrailingSpaces(String str) {
- if (str != null && str.length() > 0) {
+ if (str != null && !str.isEmpty()) {
char firstChar = str.charAt(0);
char lastChar = str.charAt(str.length() - 1);
return Character.isWhitespace(firstChar) ||
Character.isWhitespace(lastChar) ;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
Sat May 17 17:00:58 2025
@@ -428,7 +428,7 @@ public abstract class BaseXSSFEvaluation
// TODO - no idea if this is right
CTDefinedName ctn = _nameRecord.getCTName();
String strVal = ctn.getStringValue();
- return !ctn.getFunction() && strVal != null && strVal.length() > 0;
+ return !ctn.getFunction() && strVal != null && !strVal.isEmpty();
}
@Override
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
Sat May 17 17:00:58 2025
@@ -485,7 +485,7 @@ public class XSSFRichTextString implemen
*/
protected static void preserveSpaces(STXstring xs) {
String text = xs.getStringValue();
- if (text != null && text.length() > 0) {
+ if (text != null && !text.isEmpty()) {
char firstChar = text.charAt(0);
char lastChar = text.charAt(text.length() - 1);
if(Character.isWhitespace(firstChar) ||
Character.isWhitespace(lastChar)) {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
Sat May 17 17:00:58 2025
@@ -199,7 +199,8 @@ public class XSSFSimpleShape extends XSS
}
XSSFTextParagraph p = _paragraphs.get(i);
- if (p.isBullet() && p.getText().length() > 0) {
+ final String pText = p.getText();
+ if (p.isBullet() && !pText.isEmpty()) {
int level = Math.min(p.getLevel(), MAX_LEVELS - 1);
@@ -211,11 +212,11 @@ public class XSSFSimpleShape extends XSS
out.append('\t');
}
String character = p.getBulletCharacter();
- out.append(character.length() > 0 ? character + " " : "-
");
- out.append(p.getText());
+ out.append(!character.isEmpty() ? character + " " : "- ");
+ out.append(pText);
}
} else {
- out.append(p.getText());
+ out.append(pText);
// this paragraph is not a bullet, so reset the count array
for (int k = 0; k < MAX_LEVELS; k++) {
@@ -254,9 +255,10 @@ public class XSSFSimpleShape extends XSS
for (int j = 0; j < level; j++) {
out.append('\t');
}
- if (p.getText().length() > 0) {
+ final String pText = p.getText();
+ if (!pText.isEmpty()) {
out.append(getBulletPrefix(scheme, levelCount.get(level)));
- out.append(p.getText());
+ out.append(pText);
}
while (true) {
XSSFTextParagraph nextp = (index + 1) == _paragraphs.size() ? null
: _paragraphs.get(index + 1);
@@ -291,11 +293,12 @@ public class XSSFSimpleShape extends XSS
}
// check for empty text - only output a bullet if there is
text,
// but it is still part of the group
- if (nextp.getText().length() > 0) {
+ final String npText = nextp.getText();
+ if (!npText.isEmpty()) {
// increment the count for this level
levelCount.set(level, levelCount.get(level) + 1);
out.append(getBulletPrefix(nextScheme,
levelCount.get(level)));
- out.append(nextp.getText());
+ out.append(npText);
}
} else {
// something doesn't match so stop
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
Sat May 17 17:00:58 2025
@@ -65,7 +65,7 @@ public class XSSFTextParagraph implement
}
}
- public String getText(){
+ public String getText() {
StringBuilder out = new StringBuilder();
for (XSSFTextRun r : _runs) {
out.append(r.getText());
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
Sat May 17 17:00:58 2025
@@ -483,7 +483,7 @@ public final class FormulaParser {
} else {
// Is it a named range?
String name = parseAsName();
- if (name.length() == 0) {
+ if (name.isEmpty()) {
throw new FormulaParseException("Cell reference or
Named Range "
+ "expected after sheet name at index " +
_pointer + ".");
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java
Sat May 17 17:00:58 2025
@@ -86,7 +86,7 @@ final class TextJoinFunction implements
String textValue =
OperandResolver.coerceValueToString(textArg);
// If we're not ignoring empty values or if our value is
not empty, add it to the list
- if (!ignoreEmpty || (textValue != null &&
textValue.length() > 0)) {
+ if (!ignoreEmpty || (textValue != null &&
!textValue.isEmpty())) {
textValues.add(textValue);
}
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
Sat May 17 17:00:58 2025
@@ -124,7 +124,7 @@ final class FunctionMetadataReader {
byte returnClassCode = parseReturnTypeCode(parts[4]);
byte[] parameterClassCodes = parseOperandTypeCodes(parts[5]);
// 6 isVolatile
- boolean hasNote = parts[7].length() > 0;
+ boolean hasNote = !parts[7].isEmpty();
validateFunctionName(functionName);
// TODO - make POI use isVolatile
@@ -134,7 +134,7 @@ final class FunctionMetadataReader {
private static byte parseReturnTypeCode(String code) {
- if(code.length() == 0) {
+ if(code.isEmpty()) {
return Ptg.CLASS_REF; // happens for GETPIVOTDATA
}
return parseOperandTypeCode(code);
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
Sat May 17 17:00:58 2025
@@ -23,7 +23,7 @@ public class BaseNumberUtils {
public static double convertToDecimal(String value, int base, int
maxNumberOfPlaces) throws IllegalArgumentException {
- if (value == null || value.length() == 0) {
+ if (value == null || value.isEmpty()) {
return 0.0;
}
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=1925650&r1=1925649&r2=1925650&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
Sat May 17 17:00:58 2025
@@ -41,7 +41,7 @@ public class Code extends Fixed1ArgFunct
}
String text = OperandResolver.coerceValueToString(veText1);
- if (text.length() == 0) {
+ if (text.isEmpty()) {
return ErrorEval.VALUE_INVALID;
}
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=1925650&r1=1925649&r2=1925650&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
Sat May 17 17:00:58 2025
@@ -90,7 +90,7 @@ public class Complex extends Var2or3ArgF
}
String suffixValue = OperandResolver.coerceValueToString(suffix);
- if (suffixValue.length() == 0) {
+ if (suffixValue.isEmpty()) {
suffixValue = DEFAULT_SUFFIX;
}
if (suffixValue.equals(DEFAULT_SUFFIX.toUpperCase(Locale.ROOT)) ||
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Countif.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
Sat May 17 17:00:58 2025
@@ -339,7 +339,7 @@ public final class Countif extends Fixed
switch(getCode()) {
case CmpOp.NONE:
case CmpOp.EQ:
- return _value.length() == 0;
+ return _value.isEmpty();
case CmpOp.NE:
// pred '<>' matches empty string but not blank cell
// pred '<>ABC' matches blank and 'not ABC'
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=1925650&r1=1925649&r2=1925650&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
Sat May 17 17:00:58 2025
@@ -74,7 +74,7 @@ public class Imaginary extends Fixed1Arg
String imaginaryGroup = m.group(5);
boolean hasImaginaryPart = imaginaryGroup.equals("i") ||
imaginaryGroup.equals("j");
- if (imaginaryGroup.length() == 0) {
+ if (imaginaryGroup.isEmpty()) {
return new StringEval(String.valueOf(0));
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
Sat May 17 17:00:58 2025
@@ -152,7 +152,7 @@ public final class Value extends Fixed1A
foundPercentage = true;
break;
}
- if (remainingTextTrimmed.length() > 0) {
+ if (!remainingTextTrimmed.isEmpty()) {
// intervening spaces not allowed once the digits start
return null;
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
[UTF-8] (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
[UTF-8] Sat May 17 17:00:58 2025
@@ -624,7 +624,7 @@ public class DateUtil {
}
// If we didn't get a real string, don't even cache it as we can
always find this out quickly
- if(formatString == null || formatString.length() == 0) {
+ if(formatString == null || formatString.isEmpty()) {
return false;
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/AreaReference.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/AreaReference.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/AreaReference.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/AreaReference.java Sat
May 17 17:00:58 2025
@@ -326,7 +326,7 @@ public class AreaReference {
String currentSegment = "";
StringTokenizer st = new StringTokenizer(reference, ",");
while(st.hasMoreTokens()) {
- if (currentSegment.length() > 0) {
+ if (!currentSegment.isEmpty()) {
currentSegment += ",";
}
currentSegment += st.nextToken();
@@ -336,7 +336,7 @@ public class AreaReference {
currentSegment = "";
}
}
- if (currentSegment.length() > 0) {
+ if (!currentSegment.isEmpty()) {
results.add(currentSegment);
}
return results.toArray(new String[0]);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellReference.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellReference.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellReference.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellReference.java Sat
May 17 17:00:58 2025
@@ -116,22 +116,22 @@ public class CellReference implements Ge
_sheetName = parts.sheetName;
String colRef = parts.colRef;
- _isColAbs = (colRef.length() > 0) && colRef.charAt(0) == '$';
+ _isColAbs = (!colRef.isEmpty()) && colRef.charAt(0) == '$';
if (_isColAbs) {
colRef = colRef.substring(1);
}
- if (colRef.length() == 0) {
+ if (colRef.isEmpty()) {
_colIndex = -1;
} else {
_colIndex = convertColStringToIndex(colRef);
}
String rowRef=parts.rowRef;
- _isRowAbs = (rowRef.length() > 0) && rowRef.charAt(0) == '$';
+ _isRowAbs = (!rowRef.isEmpty()) && rowRef.charAt(0) == '$';
if (_isRowAbs) {
rowRef = rowRef.substring(1);
}
- if (rowRef.length() == 0) {
+ if (rowRef.isEmpty()) {
_rowIndex = -1;
} else {
// throws NumberFormatException if rowRef is not convertible to an
int
Modified: poi/trunk/poi/src/test/java/org/apache/poi/POIDataSamples.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/POIDataSamples.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/POIDataSamples.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/POIDataSamples.java Sat May 17
17:00:58 2025
@@ -169,7 +169,7 @@ public final class POIDataSamples {
+ "' not found in data dir '" +
_resolvedDataDir.getAbsolutePath() + "'");
}
try {
- if(sampleFileName.length() > 0) {
+ if(!sampleFileName.isEmpty()) {
String fn = sampleFileName;
if(fn.indexOf('/') > 0) {
fn = fn.substring(fn.indexOf('/')+1);
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
Sat May 17 17:00:58 2025
@@ -16,7 +16,9 @@
==================================================================== */
package org.apache.poi.hssf.eventusermodel;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -96,7 +98,7 @@ final class TestFormatTrackingHSSFListen
// Should always give us a string
String s = listener.formatNumberDateCell(cvr);
assertNotNull(s);
- assertTrue(s.length() > 0);
+ assertNotEquals(0, s.length());
}
}
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
Sat May 17 17:00:58 2025
@@ -149,7 +149,7 @@ public final class ExcelCetabFunctionExt
public void addFunction(int funcIx, boolean hasFootnote, String
funcName, int minParams, int maxParams,
String returnClass, String paramClasses,
String volatileFlagStr) {
- boolean isVolatile = volatileFlagStr.length() > 0;
+ boolean isVolatile = !volatileFlagStr.isEmpty();
Integer funcIxKey = Integer.valueOf(funcIx);
if(!_groupFunctionIndexes.add(funcIxKey)) {
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java?rev=1925650&r1=1925649&r2=1925650&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
Sat May 17 17:00:58 2025
@@ -171,7 +171,7 @@ public final class ExcelFileFormatDocFun
public void addFunction(int funcIx, boolean hasFootnote, String
funcName, int minParams, int maxParams,
String returnClass, String paramClasses,
String volatileFlagStr) {
- boolean isVolatile = volatileFlagStr.length() > 0;
+ boolean isVolatile = !volatileFlagStr.isEmpty();
Integer funcIxKey = funcIx;
if(!_groupFunctionIndexes.add(funcIxKey)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
