You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/02/16 02:55:38 UTC
ant git commit: Use the isEmpty method instead of comparing the value
of size() to 0.
Repository: ant
Updated Branches:
refs/heads/master 9873bf6c8 -> 782ec7463
Use the isEmpty method instead of comparing the value of size() to 0.
This closes #61 pull request at github/apache/ant repo
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/782ec746
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/782ec746
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/782ec746
Branch: refs/heads/master
Commit: 782ec746386f9b9599bc757e2819683ba855bb54
Parents: 9873bf6
Author: reudismam <re...@gmail.com>
Authored: Thu Feb 15 14:30:25 2018 -0300
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Fri Feb 16 08:24:23 2018 +0530
----------------------------------------------------------------------
src/main/org/apache/tools/ant/ComponentHelper.java | 2 +-
src/main/org/apache/tools/ant/Main.java | 2 +-
src/main/org/apache/tools/ant/helper/AntXMLContext.java | 4 ++--
src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java | 2 +-
.../org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java | 2 +-
.../junit/org/apache/tools/ant/IntrospectionHelperTest.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/782ec746/src/main/org/apache/tools/ant/ComponentHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java
index ab8ced9..17a9bb6 100644
--- a/src/main/org/apache/tools/ant/ComponentHelper.java
+++ b/src/main/org/apache/tools/ant/ComponentHelper.java
@@ -850,7 +850,7 @@ public class ComponentHelper {
}
checkedNamespaces.add(uri);
- if (antTypeTable.size() == 0) {
+ if (antTypeTable.isEmpty()) {
// Project instance doesn't know the tasks and types
// defined in defaults.properties, likely created by the
// user - without those definitions it cannot parse antlib
http://git-wip-us.apache.org/repos/asf/ant/blob/782ec746/src/main/org/apache/tools/ant/Main.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index 7e0f09d..faf996b 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -840,7 +840,7 @@ public class Main implements AntMain {
}
// make sure that we have a target to execute
- if (targets.size() == 0) {
+ if (targets.isEmpty()) {
if (project.getDefaultTarget() != null) {
targets.addElement(project.getDefaultTarget());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/782ec746/src/main/org/apache/tools/ant/helper/AntXMLContext.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/AntXMLContext.java b/src/main/org/apache/tools/ant/helper/AntXMLContext.java
index a6b1ed1..c5295a7 100644
--- a/src/main/org/apache/tools/ant/helper/AntXMLContext.java
+++ b/src/main/org/apache/tools/ant/helper/AntXMLContext.java
@@ -377,7 +377,7 @@ public class AntXMLContext {
*/
public void endPrefixMapping(String prefix) {
List<String> list = prefixMapping.get(prefix);
- if (list == null || list.size() == 0) {
+ if (list == null || list.isEmpty()) {
return; // Should not happen
}
list.remove(list.size() - 1);
@@ -391,7 +391,7 @@ public class AntXMLContext {
*/
public String getPrefixMapping(String prefix) {
List<String> list = prefixMapping.get(prefix);
- if (list == null || list.size() == 0) {
+ if (list == null || list.isEmpty()) {
return null;
}
return (String) list.get(list.size() - 1);
http://git-wip-us.apache.org/repos/asf/ant/blob/782ec746/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
index 3a61f7c..9a9829e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
@@ -468,7 +468,7 @@ public class CvsTagDiff extends AbstractCvsTask {
* @exception BuildException if a parameter is not correctly set
*/
private void validate() throws BuildException {
- if (null == mypackage && getModules().size() == 0) {
+ if (null == mypackage && getModules().isEmpty()) {
throw new BuildException("Package/module must be set.");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/782ec746/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
index a2d1153..287feba 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
@@ -288,7 +288,7 @@ public class XMLValidateTask extends Task {
public void execute() throws BuildException {
try {
int fileProcessed = 0;
- if (file == null && (filesets.size() == 0)) {
+ if (file == null && (filesets.isEmpty())) {
throw new BuildException(
"Specify at least one source - " + "a file or a fileset.");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/782ec746/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
index 48acf79..40e44be 100644
--- a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
@@ -739,7 +739,7 @@ public class IntrospectionHelperTest {
public void addConfigured(Map m) {
// Valid extension point
- assertTrue(m.size() == 0);
+ assertTrue(m.isEmpty());
}
public void addConfigured(Hashtable h) {