ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-24 13:28:07 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

brought in line with Sun's SDK, should no longer break on values call

Browse Source
This commit is contained in:
mweaver 2009-04-22 10:04:38 -06:00
parent c5dd57f74c
commit 34da6da3db
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
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()) {
@ -158,20 +158,29 @@ public class HashMap<K, V> implements Map<K, V> {
return c; return c;
} }
public boolean containsKey(K key) { public boolean containsKey(Object key) {
return find(key) != null; return find(key) != null;
} }
public boolean containsValue(V value) { public boolean containsValue(Object value) {
return values().contains(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);
} }