ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-13 04:38:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adding changes to fix Map/Collections

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

Conflicts:

	classpath/java/util/HashMap.java
	classpath/java/util/Map.java
This commit is contained in:
mweaver
2009-04-22 11:34:32 -06:00
parent 34da6da3db af784f4cbc
commit d6fb1e0c7c
6 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,15 @@ public interface Map<K, V> {
public int size();
<<<<<<< HEAD:classpath/java/util/Map.java
public boolean containsKey(Object obj);
public boolean containsValue(Object obj);
=======
public boolean containsKey(Object key);
public boolean containsValue(Object value);
>>>>>>> af784f4cbc18911e29127bcda8110de9bb56d654:classpath/java/util/Map.java
public V get(Object key);