ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-09 20:12:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of oss.readytalk.com:/var/local/git/avian

Browse Source
This commit is contained in:
Joel Dice 2009-04-22 13:01:29 -06:00
commit 0070446740
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classpath/java/util/Collection.java
View File

@ -15,7 +15,7 @@ public interface Collection<T> extends Iterable<T> {
public boolean isEmpty(); public boolean isEmpty();
public boolean contains(T element); public boolean contains(Object element);
public boolean add(T element); public boolean add(T element);

33
classpath/java/util/HashMap.java
View File

@ -107,7 +107,7 @@ public class HashMap<K, V> implements Map<K, V> {
array = newArray; array = newArray;
} }
private Cell<K, V> find(K key) { private Cell<K, V> find(Object key) {
if (array != null) { if (array != null) {
int index = helper.hash(key) & (array.length - 1); int index = helper.hash(key) & (array.length - 1);
for (Cell<K, V> c = array[index]; c != null; c = c.next()) { for (Cell<K, V> c = array[index]; c != null; c = c.next()) {
@ -159,19 +159,28 @@ public class HashMap<K, V> implements Map<K, V> {
} }
public boolean containsKey(Object key) { public boolean containsKey(Object key) {
return find((K)key) != null; return find(key) != null;
} }
public boolean containsValue(Object value) { public boolean containsValue(Object value) {
return values().contains((V)value); if (array != null) {
int index = array.length - 1;
for (Cell<K, V> c = array[index]; c != null; c = c.next()) {
if (helper.equal(value, c.getValue())) {
return true;
}
}
}
return false;
} }
public V get(K key) { public V get(Object key) {
Cell<K, V> c = find(key); Cell<K, V> c = find(key);
return (c == null ? null : c.getValue()); return (c == null ? null : c.getValue());
} }
public Cell<K, V> removeCell(K key) { public Cell<K, V> removeCell(Object key) {
Cell<K, V> old = null; Cell<K, V> old = null;
if (array != null) { if (array != null) {
int index = helper.hash(key) & (array.length - 1); int index = helper.hash(key) & (array.length - 1);
@ -213,8 +222,8 @@ public class HashMap<K, V> implements Map<K, V> {
} }
} }
public V remove(K key) { public V remove(Object key) {
Cell<K, V> c = removeCell(key); Cell<K, V> c = removeCell((K)key);
return (c == null ? null : c.getValue()); return (c == null ? null : c.getValue());
} }
@ -314,8 +323,8 @@ public class HashMap<K, V> implements Map<K, V> {
return HashMap.this.isEmpty(); return HashMap.this.isEmpty();
} }
public boolean contains(Entry<K, V> e) { public boolean contains(Object o) {
return containsKey(e.getKey()); return (o instanceof Entry<?,?>) ? containsKey(((Entry<?,?>)o).getKey()) : false;
} }
public boolean add(Entry<K, V> e) { public boolean add(Entry<K, V> e) {
@ -354,7 +363,7 @@ public class HashMap<K, V> implements Map<K, V> {
return HashMap.this.isEmpty(); return HashMap.this.isEmpty();
} }
public boolean contains(K key) { public boolean contains(Object key) {
return containsKey(key); return containsKey(key);
} }
@ -368,7 +377,7 @@ public class HashMap<K, V> implements Map<K, V> {
return change; return change;
} }
public boolean remove(K key) { public boolean remove(Object key) {
return removeCell(key) != null; return removeCell(key) != null;
} }
@ -395,7 +404,7 @@ public class HashMap<K, V> implements Map<K, V> {
return HashMap.this.isEmpty(); return HashMap.this.isEmpty();
} }
public boolean contains(V value) { public boolean contains(Object value) {
return containsValue(value); return containsValue(value);
} }

8
classpath/java/util/Map.java
View File

@ -15,17 +15,17 @@ public interface Map<K, V> {
public int size(); public int size();
public boolean containsKey(Object key); public boolean containsKey(Object obj);
public boolean containsValue(Object value); public boolean containsValue(Object obj);
public V get(K key); public V get(Object key);
public V put(K key, V value); public V put(K key, V value);
public void putAll(Map<? extends K,? extends V> elts); public void putAll(Map<? extends K,? extends V> elts);
public V remove(K key); public V remove(Object key);
public void clear(); public void clear();