diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2013-01-03 08:10:25 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2013-01-03 08:10:25 +0000 |
commit | 2853156a2bce535bcaa440c37cf872916f76c03b (patch) | |
tree | 8e161033a9bac8274dcaca05940964b91cdb2bfc /sca-cpp/trunk/modules/java/org | |
parent | 55607ea78e10832838d52fdb17cbdfe4355c3265 (diff) |
Refactoring, rename isNil to isNull.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428206 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-cpp/trunk/modules/java/org/apache/tuscany/IterableUtil.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sca-cpp/trunk/modules/java/org/apache/tuscany/IterableUtil.java b/sca-cpp/trunk/modules/java/org/apache/tuscany/IterableUtil.java index 2366d79af6..58bb18cf72 100644 --- a/sca-cpp/trunk/modules/java/org/apache/tuscany/IterableUtil.java +++ b/sca-cpp/trunk/modules/java/org/apache/tuscany/IterableUtil.java @@ -61,9 +61,9 @@ public class IterableUtil { /** * Return true if a list is nil (empty). */ - public static boolean isNil(final Object l) { + public static boolean isNull(final Object l) { if(l instanceof BasicIterable<?>) - return ((BasicIterable<?>)l).isNil(); + return ((BasicIterable<?>)l).isNull(); if(l instanceof Collection<?>) return ((Collection<?>)l).isEmpty(); return !((Iterable<?>)l).iterator().hasNext(); @@ -144,7 +144,7 @@ public class IterableUtil { */ @SuppressWarnings("unchecked") public static <T> Iterable<T> append(final Object a, final Object b) { - if (isNil(a)) + if (isNull(a)) return (Iterable<T>)b; return cons(car(a), append(cdr(a), b)); } @@ -153,7 +153,7 @@ public class IterableUtil { * Return the first pair matching a key from a list of key value pairs. */ public static <T> Iterable<T> assoc(final Object k, final Object l) { - if(isNil(l)) + if(isNull(l)) return list(); if(k.equals(car(car(l)))) return car(l); @@ -168,11 +168,11 @@ public class IterableUtil { abstract Iterable<T> cdr(); - abstract Boolean isNil(); + abstract Boolean isNull(); @Override public int size() { - return this.isNil()? 0 : 1 + ((List<T>)this.cdr()).size(); + return this.isNull()? 0 : 1 + ((List<T>)this.cdr()).size(); } @Override @@ -194,7 +194,7 @@ public class IterableUtil { } @Override - Boolean isNil() { + Boolean isNull() { return this.a.length - this.start == 0; } @@ -243,7 +243,7 @@ public class IterableUtil { } @Override - Boolean isNil() { + Boolean isNull() { return this.l.size() - this.start == 0; } @@ -292,7 +292,7 @@ public class IterableUtil { } @Override - Boolean isNil() { + Boolean isNull() { return false; } @@ -365,12 +365,12 @@ public class IterableUtil { assert jl.get(2) == Integer.valueOf(2); final Iterable<Object> n = list(); - assert isNil(n); + assert isNull(n); assert n.toString().equals("[]"); final Iterable<Object> cn = cons(0, n); - assert !isNil(cn); - assert isNil(cdr(cn)); + assert !isNull(cn); + assert isNull(cdr(cn)); assert cn.toString().equals("[0]"); final Iterable<Object> al = new ArrayList<Object>(Arrays.asList(1, 2, 3)); |