diff --git a/projects/samskivert/src/java/com/samskivert/swing/ObjectEditorTable.java b/projects/samskivert/src/java/com/samskivert/swing/ObjectEditorTable.java index b968ee2a..72b0b7fa 100644 --- a/projects/samskivert/src/java/com/samskivert/swing/ObjectEditorTable.java +++ b/projects/samskivert/src/java/com/samskivert/swing/ObjectEditorTable.java @@ -129,7 +129,7 @@ public class ObjectEditorTable extends JTable _fields = ClassUtil.getFields(protoClass); for (int ii=0, nn=_fields.length; ii < nn; ii++) { - if (ListUtil.contains(editableFields, _fields[ii].getName())) { + if (ListUtil.containsRef(editableFields, _fields[ii].getName())) { _editable.set(ii); } } diff --git a/projects/samskivert/src/java/com/samskivert/util/ListUtil.java b/projects/samskivert/src/java/com/samskivert/util/ListUtil.java index 7470ae1a..74ee6edd 100644 --- a/projects/samskivert/src/java/com/samskivert/util/ListUtil.java +++ b/projects/samskivert/src/java/com/samskivert/util/ListUtil.java @@ -236,7 +236,7 @@ public class ListUtil * * @return true if a matching element was found, false otherwise. */ - public static boolean contains (Object[] list, Object element) + public static boolean containsRef (Object[] list, Object element) { return contains(REFERENCE_COMP, list, element); } @@ -255,7 +255,7 @@ public class ListUtil return contains(EQUALS_COMP, list, element); } - /** Helper function for {@link #contains}, etc. */ + /** Helper function for {@link #containsRef}, etc. */ protected static boolean contains ( EqualityComparator eqc, Object[] list, Object element) { @@ -498,7 +498,7 @@ public class ListUtil // referencing the same string // from the constant pool System.out.println("contains(newBar): " + - ListUtil.contains(list, newBar)); + ListUtil.containsRef(list, newBar)); System.out.println("containsEqual(newBar): " + ListUtil.containsEqual(list, newBar)); diff --git a/projects/samskivert/src/java/com/samskivert/util/SortableArrayList.java b/projects/samskivert/src/java/com/samskivert/util/SortableArrayList.java index 8767d600..8bbb9dbc 100644 --- a/projects/samskivert/src/java/com/samskivert/util/SortableArrayList.java +++ b/projects/samskivert/src/java/com/samskivert/util/SortableArrayList.java @@ -155,7 +155,7 @@ public class SortableArrayList extends AbstractList // documentation inherited from interface public boolean contains (Object o) { - return ListUtil.contains(_elements, o); + return ListUtil.containsRef(_elements, o); } // documentation inherited from interface