Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use isEmpty() 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1896547 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-12-30 21:35:45 +00:00
parent 9345c84194
commit c8fc960d2d
22 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
View File

@ -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);
}

2
poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
View File

@ -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

2
poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
View File

@ -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);

2
poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
View File

@ -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);

6
poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
View File

@ -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();

2
poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
View File

@ -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);

6
poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
View File

@ -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();

2
poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -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();
}

2
poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
View File

@ -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);

2
poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
View File

@ -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;

2
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
View File

@ -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) {

2
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
View File

@ -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) {

4
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
View File

@ -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.
*/

2
poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
View File

@ -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);

2
poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
View File

@ -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();
}

10
poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
View File

@ -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();
}
}

2
poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
View File

@ -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 {

2
poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
View File

@ -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) {

2
poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
View File

@ -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 ]);

4
poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
View File

@ -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) {

4
poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
View File

@ -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);
}

2
poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
View File

@ -357,7 +357,7 @@ final class TestPOIFSFileSystem {
dis.reset();
}
}
assertTrue(props.size() > 0);
assertFalse(props.isEmpty());
}
}
return count;