Author: fanningpj
Date: Sat May 17 16:46:23 2025
New Revision: 1925649
URL: http://svn.apache.org/viewvc?rev=1925649&view=rev
Log:
code refactor
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.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/XSSFName.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
Sat May 17 16:46:23 2025
@@ -151,7 +151,7 @@ public abstract class ContentTypeManager
public void addContentType(PackagePartName partName, String contentType) {
boolean defaultCTExists =
this.defaultContentType.containsValue(contentType);
String extension = partName.getExtension().toLowerCase(Locale.ROOT);
- if ((extension.length() == 0) ||
+ if (extension.isEmpty() ||
// check if content-type and extension do match in both
directions
// some applications create broken files, e.g. extension "jpg"
instead of "jpeg"
(this.defaultContentType.containsKey(extension) &&
!defaultCTExists) ||
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
Sat May 17 16:46:23 2025
@@ -110,7 +110,7 @@ public class XDGFText {
public void draw(Graphics2D graphics) {
String textContent = getTextContent();
- if (textContent.length() == 0) {
+ if (textContent.isEmpty()) {
return;
}
@@ -148,7 +148,7 @@ public class XDGFText {
float nextY = 0;
for (String line : lines) {
- if (line.length() == 0) {
+ if (line.isEmpty()) {
continue;
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
Sat May 17 16:46:23 2025
@@ -152,7 +152,7 @@ public class XSSFBHyperlinksTable {
CellRangeAddress cellRangeAddress = new
CellRangeAddress(hyperlinkCellRange.firstRow, hyperlinkCellRange.lastRow,
hyperlinkCellRange.firstCol, hyperlinkCellRange.lastCol);
String url = relIdToHyperlink.get(relId);
- if (location.length() == 0) {
+ if (location.isEmpty()) {
location = url;
}
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=1925649&r1=1925648&r2=1925649&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 16:46:23 2025
@@ -391,7 +391,7 @@ public class SheetDataWriter implements
}
protected void outputEscapedString(String s) throws IOException {
- if (s == null || s.length() == 0) {
+ if (s == null || s.isEmpty()) {
return;
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
Sat May 17 16:46:23 2025
@@ -390,7 +390,7 @@ public final class XSSFName implements N
*/
private static void validateName(String name) {
- if (name.length() == 0) {
+ if (name.isEmpty()) {
throw new IllegalArgumentException("Name cannot be blank");
}
if (name.length() > 255) {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
Sat May 17 16:46:23 2025
@@ -1438,7 +1438,7 @@ public class XWPFRun implements ISDTCont
@Override
public String toString() {
String phonetic = getPhonetic();
- if (phonetic.length() > 0) {
+ if (!phonetic.isEmpty()) {
return text() + " (" + phonetic + ")";
} else {
return text();
@@ -1486,7 +1486,7 @@ public class XWPFRun implements ISDTCont
}
}
// Any picture text?
- if (pictureText != null && pictureText.length() > 0) {
+ if (pictureText != null && !pictureText.isEmpty()) {
text.append("\n").append(pictureText).append("\n");
}
}
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
Sat May 17 16:46:23 2025
@@ -141,10 +141,10 @@ public final class HMEFContentsExtractor
// Decide what to call it
String filename = att.getLongFilename();
- if(filename == null || filename.length() == 0) {
+ if(filename == null || filename.isEmpty()) {
filename = att.getFilename();
}
- if(filename == null || filename.length() == 0) {
+ if(filename == null || filename.isEmpty()) {
filename = "attachment" + count;
if(att.getExtension() != null) {
filename += att.getExtension();
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
Sat May 17 16:46:23 2025
@@ -177,7 +177,7 @@ public class OutlookTextExtractor implem
* {@code "Nick <[email protected]>; Jim <[email protected]>"}
*/
protected void handleEmails(StringBuilder s, String type, String
displayText, Iterator<String> emails) {
- if (displayText == null || displayText.length() == 0) {
+ if (displayText == null || displayText.isEmpty()) {
return;
}
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
Sat May 17 16:46:23 2025
@@ -174,7 +174,7 @@ class AbstractExcelUtils {
}
static boolean isEmpty(String str) {
- return str == null || str.length() == 0;
+ return str == null || str.isEmpty();
}
static boolean isNotEmpty(String str) {
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
Sat May 17 16:46:23 2025
@@ -310,8 +310,7 @@ public abstract class AbstractWordConver
continue;
}
String text = characterRun.text();
- if (text == null || text.length() == 0
- || text.charAt(0) != FIELD_BEGIN_MARK) {
+ if (text == null || text.isEmpty() || text.charAt(0) !=
FIELD_BEGIN_MARK) {
continue;
}
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
Sat May 17 16:46:23 2025
@@ -417,7 +417,7 @@ public class AbstractWordUtils {
static boolean isEmpty( String str )
{
- return str == null || str.length() == 0;
+ return str == null || str.isEmpty();
}
static boolean isNotEmpty( String str )
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
Sat May 17 16:46:23 2025
@@ -87,7 +87,7 @@ public class DefaultFontReplacer impleme
private static boolean isEmpty( String str )
{
- return str == null || str.length() == 0;
+ return str == null || str.isEmpty();
}
private static boolean isNotEmpty( String str )
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
Sat May 17 16:46:23 2025
@@ -139,7 +139,7 @@ public final class WordExtractor impleme
* Add the header/footer text, if it's not empty
*/
private void appendHeaderFooter( String text, StringBuilder out ) {
- if ( text == null || text.length() == 0 )
+ if ( text == null || text.isEmpty())
return;
text = text.replace( '\r', '\n' );
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java Sat
May 17 16:46:23 2025
@@ -180,7 +180,7 @@ public final class HSSFName implements N
*/
private static void validateName(String name) {
- if (name.length() == 0) {
+ if (name.isEmpty()) {
throw new IllegalArgumentException("Name cannot be blank");
}
if (name.length() > 255) {
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
Sat May 17 16:46:23 2025
@@ -282,7 +282,7 @@ public abstract class HeaderFooter imple
int pos;
// Check we really got something to work on
- if (pText == null || pText.length() == 0) {
+ if (pText == null || pText.isEmpty()) {
return pText;
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
Sat May 17 16:46:23 2025
@@ -141,22 +141,23 @@ public class POIFSReader
* assumed
* @param name the document name
*
- * @throws NullPointerException if listener is null or name is
- * null or empty
+ * @throws NullPointerException if listener is null or name is null
* @throws IllegalStateException if read() has already been
- * called
+ * called or name is empty
*/
-
public void registerListener(final POIFSReaderListener listener,
final POIFSDocumentPath path,
final String name) {
- if ((listener == null) || (name == null) || (name.length() == 0)) {
- throw new NullPointerException();
+ if (listener == null || name == null) {
+ throw new NullPointerException("invalid null parameter");
+ }
+ if (name.isEmpty()) {
+ throw new IllegalStateException("name must not be empty");
}
if (registryClosed) {
- throw new IllegalStateException();
+ throw new IllegalStateException("registry closed");
}
- registry.registerListener(listener, (path == null) ? new
POIFSDocumentPath() : path, name);
+ registry.registerListener(listener, path == null ? new
POIFSDocumentPath() : path, name);
}
/**
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
Sat May 17 16:46:23 2025
@@ -46,7 +46,7 @@ public class DocumentDescriptor
{
throw new NullPointerException("name must not be null");
}
- if (name.length() == 0)
+ if (name.isEmpty())
{
throw new IllegalArgumentException("name cannot be empty");
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
Sat May 17 16:46:23 2025
@@ -251,7 +251,7 @@ public class CellFormatPart {
*/
private static Color getColor(Matcher m) {
String cdesc = m.group(COLOR_GROUP);
- if (cdesc == null || cdesc.length() == 0)
+ if (cdesc == null || cdesc.isEmpty())
return null;
Color c = NAMED_COLORS.get(cdesc);
if (c == null) {
@@ -270,7 +270,7 @@ public class CellFormatPart {
*/
private CellFormatCondition getCondition(Matcher m) {
String mdesc = m.group(CONDITION_OPERATOR_GROUP);
- if (mdesc == null || mdesc.length() == 0)
+ if (mdesc == null || mdesc.isEmpty())
return null;
return CellFormatCondition.getInstance(m.group(
CONDITION_OPERATOR_GROUP), m.group(CONDITION_VALUE_GROUP));
@@ -509,7 +509,7 @@ public class CellFormatPart {
StringBuffer fmt = new StringBuffer();
while (m.find()) {
String part = group(m, 0);
- if (part.length() > 0) {
+ if (!part.isEmpty()) {
String repl = partHandler.handlePart(m, part, type, fmt);
if (repl == null) {
switch (part.charAt(0)) {
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java?rev=1925649&r1=1925648&r2=1925649&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
Sat May 17 16:46:23 2025
@@ -357,7 +357,7 @@ public class EvaluationConditionalFormat
String f2 = rule.getFormula2();
ValueEval eval2 = BlankEval.instance;
- if (f2 != null && f2.length() > 0) {
+ if (f2 != null && !f2.isEmpty()) {
eval2 = unwrapEval(workbookEvaluator.evaluate(f2,
ConditionalFormattingEvaluator.getRef(cell), region));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
