use isEmpty()

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1896547 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
index 36696d03f8aa8874c1c1c4f5f651b6742b6708e1..b2be5c50389e571a3b3ecd7af737eedf61c24c1c 100644 (file)
--- a/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
@@ -191,7 +191,7 @@ public class ExcelAntTest extends Task{
                      " of " + testCount + " evaluations failed to " +
                      "evaluate correctly.",
                      Project.MSG_ERR );
-            if(showFailureDetail && failureMessages.size() > 0 ) {
+            if(showFailureDetail && !failureMessages.isEmpty()) {
                 for (String failureMessage : failureMessages) {
                     log(failureMessage, Project.MSG_ERR);
                 }

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
index 4f52d26a7a00001d87f06211acd1f8542eaaa8f4..021228247a17a5ad7770c37302ea50e3f7485184 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
@@ -80,7 +80,7 @@ public class XDDFTextParagraph implements Iterable<XDDFTextRun> {
     public void setText(String text) {
         // keep the properties of current last run
         XmlObject existing = null;
-        if (_runs.size() > 0) {
+        if (!_runs.isEmpty()) {
             existing = _runs.get(_runs.size() - 1).getProperties().copy();
         }
         // remove all runs

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
index 77f05767a232080af3580bf9df9a8052d42620f1..9f97d4cd3cba0450dca85acc989a41c45f93e21f 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
@@ -134,7 +134,7 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
     public XSLFTextRun addLineBreak(){
         XSLFLineBreak run = new XSLFLineBreak(_p.addNewBr(), this);
         CTTextCharacterProperties brProps = run.getRPr(true);
-        if(_runs.size() > 0){
+        if (!_runs.isEmpty()) {
             // by default line break has the font size of the last text run
             CTTextCharacterProperties prevRun = _runs.get(_runs.size() - 1).getRPr(true);
             brProps.set(prevRun);

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
index ad566183f91b5a3d9ffaa84aef6837e2a4e69f96..82625070f1b0b11e838de60f4768063de5d10b0e 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
@@ -66,7 +66,7 @@ public class XSSFBSharedStringsTable implements SharedStrings {
                 pkg.getPartsByContentType(XSSFBRelation.SHARED_STRINGS_BINARY.getContentType());
 
         // Some workbooks have no shared strings table.
-        if (parts.size() > 0) {
+        if (!parts.isEmpty()) {
             PackagePart sstPart = parts.get(0);
             try (InputStream stream = sstPart.getInputStream()) {
                 readFrom(stream);

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
index b726545daf341c27ed8e82d8794c5fa9ddd4de05..0d8851c609e96f35f7525a292714e3960779c97b 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
@@ -226,7 +226,7 @@ public class XSSFBSheetHandler extends XSSFBParser {
 
     private void outputHeaderFooter(XSSFBHeaderFooter headerFooter) {
         String text = headerFooter.getString();
-        if (text != null && text.trim().length() > 0) {
+        if (text != null && !text.trim().isEmpty()) {
             handler.headerFooter(text, headerFooter.isHeader(), headerFooter.getHeaderFooterTypeLabel());
         }
     }
@@ -238,7 +238,7 @@ public class XSSFBSheetHandler extends XSSFBParser {
             return;
         }
         Queue<CellAddress> queue = comments.getAddresses();
-        while (queue.size() > 0) {
+        while (!queue.isEmpty()) {
             CellAddress cellAddress = queue.peek();
             if (cellAddress.getRow() == currentRow && cellAddress.getColumn() < colNum) {
                 cellAddress = queue.remove();
@@ -261,7 +261,7 @@ public class XSSFBSheetHandler extends XSSFBParser {
         }
         Queue<CellAddress> queue = comments.getAddresses();
         int lastInterpolatedRow = -1;
-        while (queue.size() > 0) {
+        while (!queue.isEmpty()) {
             CellAddress cellAddress = queue.peek();
             if (currentRow == CHECK_ALL_ROWS || cellAddress.getRow() < currentRow) {
                 cellAddress = queue.remove();

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
index 2f0c958260d51a75a01e6f5f61d2f8d8f0a5b169..95f0faaa14db5489b0cb47cb230f540ab9f8d146 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
@@ -129,7 +129,7 @@ public class ReadOnlySharedStringsTable extends DefaultHandler implements Shared
                 pkg.getPartsByContentType(XSSFRelation.SHARED_STRINGS.getContentType());
 
         // Some workbooks have no shared strings table.
-        if (parts.size() > 0) {
+        if (!parts.isEmpty()) {
             PackagePart sstPart = parts.get(0);
             try (InputStream stream = sstPart.getInputStream()) {
                 readFrom(stream);

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
index 9b2050e080dbfdda28db0696d6f37a693ac159f1..3345eac4ebb41a70382b8843f22d28f87920ee79 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
@@ -693,7 +693,7 @@ public class StylesTable extends POIXMLDocumentPart implements Styles {
         styleSheet.setBorders(ctBorders);
 
         // Xfs
-        if(xfs.size() > 0) {
+        if (!xfs.isEmpty()) {
             CTCellXfs ctXfs = styleSheet.getCellXfs();
             if (ctXfs == null) {
                 ctXfs = CTCellXfs.Factory.newInstance();
@@ -706,7 +706,7 @@ public class StylesTable extends POIXMLDocumentPart implements Styles {
         }
 
         // Style xfs
-        if(styleXfs.size() > 0) {
+        if (!styleXfs.isEmpty()) {
             CTCellStyleXfs ctSXfs = styleSheet.getCellStyleXfs();
             if (ctSXfs == null) {
                 ctSXfs = CTCellStyleXfs.Factory.newInstance();
@@ -719,7 +719,7 @@ public class StylesTable extends POIXMLDocumentPart implements Styles {
         }
 
         // Style dxfs
-        if(dxfs.size() > 0) {
+        if (!dxfs.isEmpty()) {
             CTDxfs ctDxfs = styleSheet.getDxfs();
             if (ctDxfs == null) {
                 ctDxfs = CTDxfs.Factory.newInstance();

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 50ab442b15a1aa7913cd5aceca3958768b8471b1..4c8694f0a0a38655308046a921eb98fb14d24367 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -3632,7 +3632,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet, OoxmlSheetEx
         }
 
         // Now re-generate our CTHyperlinks, if needed
-        if(hyperlinks.size() > 0) {
+        if (!hyperlinks.isEmpty()) {
             if(worksheet.getHyperlinks() == null) {
                 worksheet.addNewHyperlinks();
             }

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
index 0d33e0c4f66b722e453f971bc75539c3f209869b..f93c64474427a1d406a3a051468acf71c386f0d5 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
@@ -112,7 +112,7 @@ public class XSSFTextParagraph implements Iterable<XSSFTextRun>{
     public XSSFTextRun addLineBreak(){
         CTTextLineBreak br = _p.addNewBr();
         CTTextCharacterProperties brProps = br.addNewRPr();
-        if(_runs.size() > 0){
+        if (!_runs.isEmpty()) {
             // by default line break has the font size of the last text run
             CTTextCharacterProperties prevRun = _runs.get(_runs.size() - 1).getRPr();
             brProps.set(prevRun);

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index 0552d8182f2d56521dda0d1c0fc49efb5958951f..7988e4e6e099765e466cc28ee32e7d8dd9c76ff7 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -1741,7 +1741,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
      */
     private void saveNamedRanges(){
         // Named ranges
-        if(namedRanges.size() > 0) {
+        if (!namedRanges.isEmpty()) {
             CTDefinedNames names = CTDefinedNames.Factory.newInstance();
             CTDefinedName[] nr = new CTDefinedName[namedRanges.size()];
             int i = 0;

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
index 7c24e851d7ff60b802e0a872d04401468be83114..2319bf5eaa97e84f0a0d45894e81493676ed8c54 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
@@ -68,7 +68,7 @@ public class XWPFEndnote extends XWPFAbstractFootnoteEndnote {
     public void ensureFootnoteRef(XWPFParagraph p) {
 
         XWPFRun r = null;
-        if (p.getRuns().size() > 0) {
+        if (!p.runsIsEmpty()) {
             r = p.getRuns().get(0);
         }
         if (r == null) {

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
index 52584c310c88212443d91111a6dbab8a2d2b4c21..25be2a268126d27807aeac5fac6f98f3a95290ef 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
@@ -63,7 +63,7 @@ public class XWPFFootnote extends XWPFAbstractFootnoteEndnote {
     public void ensureFootnoteRef(XWPFParagraph p) {
 
         XWPFRun r = null;
-        if (p.getRuns().size() > 0) {
+        if (!p.runsIsEmpty()) {
             r = p.getRuns().get(0);
         }
         if (r == null) {

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
index c3185b4d3ee6c6f6586a4626b81435e555baa068..24837cc540ef07f73b4ff03bfabefdf67bdf0698 100644 (file)
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
@@ -180,6 +180,10 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para
         return Collections.unmodifiableList(runs);
     }
 
+    public boolean runsIsEmpty() {
+        return runs.isEmpty();
+    }
+
     /**
      * Return literal runs and sdt/content control objects.
      */

diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
index cff2221fb6e48bf71418daa68b56fc1de8eef2cb..e4c5e6015d97fef0258167877fc10b0ec78465ea 100644 (file)
--- a/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
@@ -641,7 +641,7 @@ public final class TestXSSFExportToXML {
     void testBug59026() throws Exception {
         try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("59026.xlsx")) {
             Collection<XSSFMap> mappings = wb.getCustomXMLMappings();
-            assertTrue(mappings.size() > 0);
+            assertFalse(mappings.isEmpty());
             for (XSSFMap map : mappings) {
                 XSSFExportToXml exporter = new XSSFExportToXml(map);
 

diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
index 931b2df2de3ff535f18e5c144494864b9a12e93e..8a0dc6695861b85cd9dfa76b1ef4a5dac90570ed 100644 (file)
--- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
@@ -906,7 +906,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
 
         // Add the new picture in
         int offset = 0;
-        if (_pictures.size() > 0) {
+        if (!_pictures.isEmpty()) {
             HSLFPictureData prev = _pictures.get(_pictures.size() - 1);
             offset = prev.getOffset() + prev.getBseSize();
         }

diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
index 6965aef44826fec8462b37ead8447d2cd766c4a2..c71f2a8e9b26ad0bd7248d83c350c32416ed3668 100644 (file)
--- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
@@ -226,7 +226,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
       ByteChunk htmlBodyBinaryChunk = mainChunks.getHtmlBodyChunkBinary();
       if (htmlBodyBinaryChunk != null) {
          List<PropertyValue> cpid = mainChunks.getProperties().get(MAPIProperty.INTERNET_CPID);
-         if (cpid != null && cpid.size() > 0) {
+         if (cpid != null && !cpid.isEmpty()) {
             int codepage = ((LongPropertyValue) cpid.get(0)).getValue();
             try {
                String encoding = CodePageUtil.codepageToEncoding(codepage, true);
@@ -423,7 +423,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
      // General codepage: Message codepage property.
      //
      List<PropertyValue> val = mainChunks.getProperties().get(MAPIProperty.MESSAGE_CODEPAGE);
-     if (val != null && val.size() > 0) {
+     if (val != null && !val.isEmpty()) {
        int codepage = ((LongPropertyValue) val.get(0)).getValue();
        try {
          String encoding = CodePageUtil.codepageToEncoding(codepage, true);
@@ -437,7 +437,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
      //
      if (generalcodepage == null) {
        val = mainChunks.getProperties().get(MAPIProperty.MESSAGE_LOCALE_ID);
-       if (val != null && val.size() > 0) {
+       if (val != null && !val.isEmpty()) {
          int lcid = ((LongPropertyValue) val.get(0)).getValue();
          int codepage = LocaleUtil.getDefaultCodePageFromLCID(lcid);
          try {
@@ -476,7 +476,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
      // UTF-8 is ignored for text body. This seems to be a special Outlook behavior.
      //
      val = mainChunks.getProperties().get(MAPIProperty.INTERNET_CPID);
-     if (val != null && val.size() > 0) {
+     if (val != null && !val.isEmpty()) {
        int codepage = ((LongPropertyValue) val.get(0)).getValue();
        try {
          String encoding = CodePageUtil.codepageToEncoding(codepage, true);
@@ -644,7 +644,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
                MAPIProperty.CREATION_TIME
          }) {
             List<PropertyValue> val = mainChunks.getProperties().get(prop);
-            if (val != null && val.size() > 0) {
+            if (val != null && !val.isEmpty()) {
                return ((TimePropertyValue)val.get(0)).getValue();
             }
          }

diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
index 4634d93349272e1023a68be9a70b7cb845b13928..38266f409d885fa071fbb781f3a483597845e4ba 100644 (file)
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
@@ -218,7 +218,7 @@ public final class HSSFChart {
             } else if(r instanceof SeriesTextRecord) {
                 // Applies to a series, unless we've seen a legend already
                 SeriesTextRecord str = (SeriesTextRecord)r;
-                if(lastChart.legendRecord == null && lastChart.series.size() > 0) {
+                if(lastChart.legendRecord == null && !lastChart.series.isEmpty()) {
                     HSSFSeries series = lastChart.series.get(lastChart.series.size()-1);
                     series.seriesTitleText = str;
                 } else {

diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index 0bc614264ee764011ac3bfc31a180a9570c2e26c..a0984ae0d9141a7f55125fbf947ca7d146113cda 100644 (file)
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -300,7 +300,7 @@ public final class HSSFSheet implements Sheet {
             }
         }
 
-        if (_rows.size() > 0) {
+        if (!_rows.isEmpty()) {
             Integer key = Integer.valueOf(row.getRowNum());
             HSSFRow removedRow = _rows.remove(key);
             if (removedRow != row) {

diff --git a/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java b/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
index b7e6356b38483f9b111edeebbabd412a226a697d..bfa87966346b676f2c6698239d8fd30d11f8d06a 100644 (file)
--- a/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
@@ -189,7 +189,7 @@ public class DirectoryProperty extends Property implements Parent, Iterable<Prop
      */
     protected void preWrite()
     {
-        if (_children.size() > 0)
+        if (!_children.isEmpty())
         {
             Property[] children = _children.toArray(new Property[ 0 ]);
 

diff --git a/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java b/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
index 7f233aa5bc25a9957ceddaaf8e4c00b195b1c42f..3765e3b4faae1dd031cbcc9d2d5c6152615365ef 100644 (file)
--- a/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
@@ -261,7 +261,7 @@ public class CellNumberFormatter extends CellFormatter {
                         first = false;
                     }
                 }
-            if (fractionalSpecials.size() > 0) {
+            if (!fractionalSpecials.isEmpty()) {
                 fmtBuf.append('.');
                 for (Special s : fractionalSpecials) {
                     if (isDigitFmt(s)) {
@@ -822,7 +822,7 @@ public class CellNumberFormatter extends CellFormatter {
     private void writeFractional(StringBuffer result, StringBuffer output) {
         int digit;
         int strip;
-        if (fractionalSpecials.size() > 0) {
+        if (!fractionalSpecials.isEmpty()) {
             String decimalSeparator = Character.toString(getDecimalFormatSymbols().getDecimalSeparator());
             digit = result.indexOf(decimalSeparator) + 1;
             if (exponent != null) {

diff --git a/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java b/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
index 339203890eec1b97f644913d8473b1e50d1507ff..2de8b9dfba2a1cd53c3e12a786222dee76a2469b 100644 (file)
--- a/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
@@ -49,7 +49,7 @@ public class CellNumberPartHandler implements PartHandler {
             // See comment in writeScientific -- exponent handling is complex.
             // (1) When parsing the format, remove the sign from after the 'e' and
             // put it before the first digit of the exponent.
-            if (exponent == null && specials.size() > 0) {
+            if (exponent == null && !specials.isEmpty()) {
                 exponent = new Special('.', pos);
                 specials.add(exponent);
                 insertSignForExponent = part.charAt(1);
@@ -73,7 +73,7 @@ public class CellNumberPartHandler implements PartHandler {
             break;
 
         case '.':
-            if (decimalPoint == null && specials.size() > 0) {
+            if (decimalPoint == null && !specials.isEmpty()) {
                 decimalPoint = new Special('.', pos);
                 specials.add(decimalPoint);
             }

diff --git a/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
index 907529a5d2a0f4c31ade9d818ef1414b0b1a6119..886340091c9c17a5a9d0c3a51a3669cf44c876d8 100644 (file)
--- a/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
@@ -357,7 +357,7 @@ final class TestPOIFSFileSystem {
                         dis.reset();
                     }
                 }
-                assertTrue(props.size() > 0);
+                assertFalse(props.isEmpty());
             }
         }
         return count;