From 68fa1410975ccecc35db8a97669f0fbe5ef9b451 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 21 Aug 2014 08:27:25 +0200 Subject: java: use isEmpty() instead of "size() == 0" Change-Id: I23e1038246999b0744d8e9ae83b66fa1f7dafa99 --- qadevOOo/runner/graphical/IniFile.java | 2 +- qadevOOo/runner/share/DescGetter.java | 2 +- qadevOOo/runner/util/XMLTools.java | 4 ++-- .../com/sun/star/script/framework/container/ScriptMetaData.java | 6 +++--- scripting/java/org/openoffice/idesupport/CommandLineTools.java | 2 +- scripting/java/org/openoffice/idesupport/JavaFinder.java | 3 +-- toolkit/test/accessibility/AccTreeNode.java | 2 +- toolkit/test/accessibility/Canvas.java | 2 +- vcl/qa/complex/memCheck/CheckMemoryUsage.java | 2 +- wizards/com/sun/star/wizards/common/FileAccess.java | 2 +- wizards/com/sun/star/wizards/form/FormDocument.java | 2 +- 11 files changed, 14 insertions(+), 15 deletions(-) diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 8c3e6f31168e..16bf0ad79743 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -52,7 +52,7 @@ public class IniFile implements Enumeration public void insertFirstComment(String[] _aList) { - if (m_aList.size() == 0) + if (m_aList.isEmpty()) { // can only insert if there is nothing else already in the ini file for (int i = 0; i < _aList.length; i++) diff --git a/qadevOOo/runner/share/DescGetter.java b/qadevOOo/runner/share/DescGetter.java index e9bd0d5efa32..ad0ce136786e 100644 --- a/qadevOOo/runner/share/DescGetter.java +++ b/qadevOOo/runner/share/DescGetter.java @@ -153,7 +153,7 @@ public abstract class DescGetter } } - if (entryList.size() == 0) + if (entryList.isEmpty()) { return null; } diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 5f43f06d7c0c..ce15982727f9 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -289,7 +289,7 @@ public class XMLTools { public void endElement(String name) { super.endElement(name); if (wellFormed) { - if (tagStack.size() == 0) { + if (tagStack.isEmpty()) { wellFormed = false ; printError("No tags to close (bad closing tag )") ; } else { @@ -718,7 +718,7 @@ public class XMLTools { if (!isWellFormed()) log.println("!!! Some errors were found in XML structure") ; - boolean result = tags.size() == 0 && chars.size() == 0 && isWellFormed(); + boolean result = tags.isEmpty() && chars.size() == 0 && isWellFormed(); reset(); return result; } diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index 2c36a579c3a9..db30afb201d9 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -218,9 +218,9 @@ public class ScriptMetaData extends ScriptEntry { if (url != null) { classPathVec.add(url); } - } + } - return classPathVec.toArray(new URL[classPathVec.size()]); + return classPathVec.toArray(new URL[classPathVec.size()]); } catch (Exception e) { LogUtils.DEBUG("Failed to build class path " + e.toString()); LogUtils.DEBUG(LogUtils.getTrace(e)); @@ -320,4 +320,4 @@ public class ScriptMetaData extends ScriptEntry { LogUtils.DEBUG("Creating script url for " + sUrl); return createURL(sUrl); } -} \ No newline at end of file +} diff --git a/scripting/java/org/openoffice/idesupport/CommandLineTools.java b/scripting/java/org/openoffice/idesupport/CommandLineTools.java index 5b9050cfd621..85995cdfac42 100644 --- a/scripting/java/org/openoffice/idesupport/CommandLineTools.java +++ b/scripting/java/org/openoffice/idesupport/CommandLineTools.java @@ -284,7 +284,7 @@ public class CommandLineTools { } if (scripts != null) { - if (scripts.size() == 0) + if (scripts.isEmpty()) throw new Exception("No valid scripts found"); ParcelDescriptor desc = new ParcelDescriptor(parcelxml, language); diff --git a/scripting/java/org/openoffice/idesupport/JavaFinder.java b/scripting/java/org/openoffice/idesupport/JavaFinder.java index e9385fd3c57e..b1139ab7dbc7 100644 --- a/scripting/java/org/openoffice/idesupport/JavaFinder.java +++ b/scripting/java/org/openoffice/idesupport/JavaFinder.java @@ -191,8 +191,7 @@ public class JavaFinder implements MethodFinder { private String[] findClassNames(File basedir) { ArrayList classFiles = findFiles(basedir, CLASS_SUFFIX); - - if (classFiles == null || classFiles.size() == 0) + if(classFiles == null || classFiles.isEmpty()) return null; ArrayList javaFiles = findFiles(basedir, JAVA_SUFFIX); diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java index 73eb9a757e29..136f872a68d7 100644 --- a/toolkit/test/accessibility/AccTreeNode.java +++ b/toolkit/test/accessibility/AccTreeNode.java @@ -281,7 +281,7 @@ class AccTreeNode @Override public boolean isLeaf() { - return (maHandlers.size() == 0); + return maHandlers.isEmpty(); } @Override diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java index d815f9df3ff1..c600a9e7f91d 100644 --- a/toolkit/test/accessibility/Canvas.java +++ b/toolkit/test/accessibility/Canvas.java @@ -98,7 +98,7 @@ class Canvas { aObject = new CanvasShape (aNode); // Update bounding box that includes all objects. - if (maObjects.size() == 0) + if (maObjects.isEmpty()) maBoundingBox = aObject.getBBox(); else maBoundingBox = maBoundingBox.union (aObject.getBBox()); diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java index 3b119c4a5b20..ad0e249b4cdf 100644 --- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java +++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java @@ -153,7 +153,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */ } } // if no param given, set defaults. - if (v.size() == 0) + if (v.isEmpty()) { v.add(sWriterDoc); v.add(sCalcDoc); diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index 862f1b8c9c58..a44c786cea2a 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -632,7 +632,7 @@ public class FileAccess throws NoValidPathException { String[][] LocLayoutFiles = new String[2][]; - if (FolderName.size() == 0) + if (FolderName.isEmpty()) { throw new NoValidPathException(null, "Path not given."); } diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index eb2a997ef6bf..15d526f4e686 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -141,7 +141,7 @@ public class FormDocument extends TextDocument adjustPageStyle(); if (_baddParentForm) { - if (oControlForms.size() == 0) + if (oControlForms.isEmpty()) { final ControlForm aMainControlForm = new ControlForm(this, SOMAINFORM, aMainFormPoint, getMainFormSize(FormWizard.AS_GRID)); oControlForms.add(aMainControlForm); -- cgit