Author: onealj
Date: Wed Oct 18 07:45:53 2017
New Revision: 1812463
URL: http://svn.apache.org/viewvc?rev=1812463&view=rev
Log:
string.equals("") -> string.isEmpty() or "".equals(string)
Modified:
poi/trunk/src/examples/jsp/HSSFExample.jsp
poi/trunk/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/DGet.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
Modified: poi/trunk/src/examples/jsp/HSSFExample.jsp
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/jsp/HSSFExample.jsp?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/examples/jsp/HSSFExample.jsp (original)
+++ poi/trunk/src/examples/jsp/HSSFExample.jsp Wed Oct 18 07:45:53 2017
@@ -32,7 +32,7 @@ Select an Excel file to read.
<%
String filename = request.getParameter("xls_filename");
- if (filename != null && !filename.equals("")) {
+ if (filename != null && !filename.isEmpty()) {
%>
<br>You chose the file <%= filename %>.
<br><br>It's contents are:
Modified: poi/trunk/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java
(original)
+++ poi/trunk/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java Wed
Oct 18 07:45:53 2017
@@ -479,7 +479,7 @@ public class ToHtml {
style.getDataFormatString());
CellFormatResult result = cf.apply(cell);
content = result.text;
- if (content.equals("")) {
+ if ("".equals(content)) {
content = " ";
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java Wed
Oct 18 07:45:53 2017
@@ -296,7 +296,7 @@ public class EscherGraphics extends Grap
@Override
public void drawString(String str, int x, int y)
{
- if (str == null || str.equals(""))
+ if (str == null || str.isEmpty())
return;
Font excelFont = font;
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java Wed Oct 18
07:45:53 2017
@@ -328,7 +328,7 @@ public class CellFormatPart {
*/
private CellFormatType formatType(String fdesc) {
fdesc = fdesc.trim();
- if (fdesc.equals("") || fdesc.equalsIgnoreCase("General"))
+ if (fdesc.isEmpty() || fdesc.equalsIgnoreCase("General"))
return CellFormatType.GENERAL;
Matcher m = SPECIFICATION_PAT.matcher(fdesc);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/DGet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/DGet.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/DGet.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/DGet.java Wed Oct 18
07:45:53 2017
@@ -61,7 +61,7 @@ public final class DGet implements IDSta
return ErrorEval.VALUE_INVALID;
} else
try {
-
if(OperandResolver.coerceValueToString(OperandResolver.getSingleValue(result,
0, 0)).equals("")) {
+
if(OperandResolver.coerceValueToString(OperandResolver.getSingleValue(result,
0, 0)).isEmpty()) {
return ErrorEval.VALUE_INVALID;
}
else {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java Wed
Oct 18 07:45:53 2017
@@ -847,7 +847,7 @@ public abstract class OPCPackage impleme
throw new IllegalArgumentException("partName");
}
- if (contentType == null || contentType.equals("")) {
+ if (contentType == null || contentType.isEmpty()) {
throw new IllegalArgumentException("contentType");
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
Wed Oct 18 07:45:53 2017
@@ -56,7 +56,7 @@ public final class PackagePartCollection
PackagingURIHelper.FORWARD_SLASH_STRING);
StringBuilder concatSeg = new StringBuilder();
for (String seg : segments) {
- if (!seg.equals(""))
+ if (!seg.isEmpty())
concatSeg.append(PackagingURIHelper.FORWARD_SLASH_CHAR);
concatSeg.append(seg);
if
(this.registerPartNameStr.contains(concatSeg.toString())) {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
Wed Oct 18 07:45:53 2017
@@ -241,14 +241,14 @@ public final class PackagePartName imple
// Split the URI into several part and analyze each
String[] segments = partUri.toASCIIString().split("/");
- if (segments.length <= 1 || !segments[0].equals(""))
+ if (segments.length <= 1 || !segments[0].isEmpty())
throw new InvalidFormatException(
"A part name shall not have empty
segments [M1.3]: "
+ partUri.getPath());
for (int i = 1; i < segments.length; ++i) {
String seg = segments[i];
- if (seg == null || "".equals(seg)) {
+ if (seg == null || seg.isEmpty()) {
throw new InvalidFormatException(
"A part name shall not have
empty segments [M1.3]: "
+
partUri.getPath());
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
Wed Oct 18 07:45:53 2017
@@ -35,6 +35,9 @@ import org.apache.poi.util.POILogger;
* @version 0.1
*/
public final class PackagingURIHelper {
+ // FIXME: this class implements a lot of path joining and splitting logic
that
+ // is already implemented in java.nio.file.Path.
+ // This class should heavily leverage Java library code to reduce the
number of lines of code that POI has to maintain and test
private final static POILogger _logger =
POILogFactory.getLogger(PackagingURIHelper.class);
/**
@@ -321,13 +324,13 @@ public final class PackagingURIHelper {
// If we didn't have a good match or at least except a first
empty element
if ((segmentsTheSame == 0 || segmentsTheSame == 1) &&
- segmentsSource[0].equals("") &&
segmentsTarget[0].equals("")) {
+ segmentsSource[0].isEmpty() &&
segmentsTarget[0].isEmpty()) {
for (int i = 0; i < segmentsSource.length - 2; i++) {
retVal.append("../");
}
for (int i = 0; i < segmentsTarget.length; i++) {
- if (segmentsTarget[i].equals(""))
- continue;
+ if (segmentsTarget[i].isEmpty())
+ continue;i
retVal.append(segmentsTarget[i]);
if (i != segmentsTarget.length - 1)
retVal.append("/");
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
Wed Oct 18 07:45:53 2017
@@ -566,7 +566,7 @@ public final class PackagePropertiesPart
* Convert a strig value into a Nullable<String>
*/
private Nullable<String> setStringValue(String s) {
- if (s == null || s.equals("")) {
+ if (s == null || s.isEmpty()) {
return new Nullable<>();
}
return new Nullable<>(s);
@@ -579,7 +579,7 @@ public final class PackagePropertiesPart
* Throws if the date format isnot valid.
*/
private Nullable<Date> setDateValue(String dateStr) throws
InvalidFormatException {
- if (dateStr == null || dateStr.equals("")) {
+ if (dateStr == null || dateStr.isEmpty()) {
return new Nullable<>();
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
Wed Oct 18 07:45:53 2017
@@ -382,7 +382,7 @@ public class XSSFExportToXml implements
private boolean isNamespaceDeclared() {
String schemaNamespace = getNamespace();
- return schemaNamespace!=null && !schemaNamespace.equals("");
+ return schemaNamespace!=null && !schemaNamespace.isEmpty();
}
private String getNamespace() {
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
Wed Oct 18 07:45:53 2017
@@ -76,7 +76,7 @@ public final class TestXSSFExportToXML {
String xml = os.toString("UTF-8");
assertNotNull(xml);
- assertFalse(xml.equals(""));
+ assertFalse(xml.isEmpty());
String docente =
xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
String nome =
xml.split("<NOME>")[1].split("</NOME>")[0].trim();
@@ -124,7 +124,7 @@ public final class TestXSSFExportToXML {
String xml = os.toString("UTF-8");
assertNotNull(xml);
- assertFalse(xml.equals(""));
+ assertFalse(xml.isEmpty());
String docente =
xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
String nome =
xml.split("<NOME>")[1].split("</NOME>")[0].trim();
@@ -256,7 +256,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertFalse(xmlData.equals(""));
+ assertFalse(xmlData.isEmpty());
String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
String b = a.split("<B>")[1].split("</B>")[0].trim();
@@ -299,7 +299,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertFalse(xmlData.equals(""));
+ assertFalse(xmlData.isEmpty());
assertEquals("2012-01-13",
xmlData.split("<DATE>")[1].split("</DATE>")[0].trim());
assertEquals("2012-02-16",
xmlData.split("<FORMULA_DATE>")[1].split("</FORMULA_DATE>")[0].trim());
@@ -333,7 +333,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertFalse(xmlData.equals(""));
+ assertFalse(xmlData.isEmpty());
String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
String doubleValue =
a.split("<DOUBLE>")[1].split("</DOUBLE>")[0].trim();
@@ -372,7 +372,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertFalse(xmlData.equals(""));
+ assertFalse(xmlData.isEmpty());
String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
String euro = a.split("<EUR>")[1].split("</EUR>")[0].trim();
@@ -397,7 +397,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertTrue(!xmlData.equals(""));
+ assertTrue(!xmlData.isEmpty());
String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
String a_b = a.split("<B>")[1].split("</B>")[0].trim();
@@ -472,7 +472,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertFalse(xmlData.equals(""));
+ assertFalse(xmlData.isEmpty());
String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
String a_b = a.split("<B>")[1].split("</B>")[0].trim();
@@ -569,7 +569,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertFalse(xmlData.equals(""));
+ assertFalse(xmlData.isEmpty());
parseXML(xmlData);
@@ -600,7 +600,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertFalse(xmlData.equals(""));
+ assertFalse(xmlData.isEmpty());
parseXML(xmlData);
@@ -631,7 +631,7 @@ public final class TestXSSFExportToXML {
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertFalse(xmlData.equals(""));
+ assertFalse(xmlData.isEmpty());
assertEquals("2014-12-31",
xmlData.split("<DATE>")[1].split("</DATE>")[0].trim());
assertEquals("12.5",
xmlData.split("<REFELEMENT>")[1].split("</REFELEMENT>")[0].trim());
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java?rev=1812463&r1=1812462&r2=1812463&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java Wed
Oct 18 07:45:53 2017
@@ -505,7 +505,7 @@ public abstract class BaseTestCell {
assertEquals("abc", cellA1.getStringCellValue());
fe.evaluateInCell(cellA1);
- assertFalse("Identified bug with writing back formula result of type
string", cellA1.getStringCellValue().equals(""));
+ assertFalse("Identified bug with writing back formula result of type
string", cellA1.getStringCellValue().isEmpty());
assertEquals("abc", cellA1.getStringCellValue());
wb.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
