From 7d14559875bbe1036c6c9674a12049b6aa6b292c Mon Sep 17 00:00:00 2001 From: mdb Date: Sat, 23 Oct 2004 17:26:30 +0000 Subject: [PATCH] ListUtil.containsEqual() -> ListUtil.contains() git-svn-id: https://samskivert.googlecode.com/svn/trunk@1515 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../src/java/com/samskivert/util/ListUtil.java | 10 +++++----- .../src/java/com/samskivert/util/RuntimeAdjust.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/util/ListUtil.java b/projects/samskivert/src/java/com/samskivert/util/ListUtil.java index 74ee6edd..1ee9664f 100644 --- a/projects/samskivert/src/java/com/samskivert/util/ListUtil.java +++ b/projects/samskivert/src/java/com/samskivert/util/ListUtil.java @@ -119,7 +119,7 @@ public class ListUtil * expanded if necessary. * * @param list the list in which to insert the element. Can be null. - * @param startIdx the index at which to insert the element. + * @param index the index at which to insert the element. * @param element the element to insert. * * @return a reference to the list with element inserted (might not be @@ -250,7 +250,7 @@ public class ListUtil * * @return true if a matching element was found, false otherwise. */ - public static boolean containsEqual (Object[] list, Object element) + public static boolean contains (Object[] list, Object element) { return contains(EQUALS_COMP, list, element); } @@ -497,10 +497,10 @@ public class ListUtil String newBar = new String("bar"); // prevent java from cleverly // referencing the same string // from the constant pool - System.out.println("contains(newBar): " + + System.out.println("containsRef(newBar): " + ListUtil.containsRef(list, newBar)); - System.out.println("containsEqual(newBar): " + - ListUtil.containsEqual(list, newBar)); + System.out.println("contains(newBar): " + + ListUtil.contains(list, newBar)); ListUtil.clearEqual(list, newBar); System.out.println("clearEqual(newBar): " + StringUtil.toString(list)); diff --git a/projects/samskivert/src/java/com/samskivert/util/RuntimeAdjust.java b/projects/samskivert/src/java/com/samskivert/util/RuntimeAdjust.java index a1935cdc..6c4fb6d1 100644 --- a/projects/samskivert/src/java/com/samskivert/util/RuntimeAdjust.java +++ b/projects/samskivert/src/java/com/samskivert/util/RuntimeAdjust.java @@ -265,7 +265,7 @@ public class RuntimeAdjust public void setValue (String value) { - if (!ListUtil.containsEqual(_values, value)) { + if (!ListUtil.contains(_values, value)) { Log.warning("Refusing invalid adjustment [name=" + _name + ", values=" + StringUtil.toString(_values) + ", value=" + value + "].");