You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
202 lines
9.7 KiB
202 lines
9.7 KiB
diff --git a/build.xml b/build.xml
|
|
index d6282d0..ea4c7b7 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -154,8 +154,7 @@
|
|
|
|
<!-- NOTE: A jar built using JDK1.4 is incompatible with JDK1.2 -->
|
|
<jar jarfile="${build.jar.name}"
|
|
- basedir="${build.classes}"
|
|
- manifest="${build.conf}/MANIFEST.MF"/>
|
|
+ basedir="${build.classes}"/>
|
|
</target>
|
|
|
|
<!-- ====================================================================== -->
|
|
diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java
|
|
index 7fec9af..53470d1 100644
|
|
--- a/src/java/org/apache/commons/collections/MultiHashMap.java
|
|
+++ b/src/java/org/apache/commons/collections/MultiHashMap.java
|
|
@@ -331,7 +331,7 @@ public class MultiHashMap extends HashMap implements MultiMap {
|
|
* @param item the value to remove
|
|
* @return the value removed (which was passed in), null if nothing removed
|
|
*/
|
|
- public Object remove(Object key, Object item) {
|
|
+ public Object removeMapping(Object key, Object item) {
|
|
Collection valuesForKey = getCollection(key);
|
|
if (valuesForKey == null) {
|
|
return null;
|
|
diff --git a/src/java/org/apache/commons/collections/MultiMap.java b/src/java/org/apache/commons/collections/MultiMap.java
|
|
index be9455b..60375a6 100644
|
|
--- a/src/java/org/apache/commons/collections/MultiMap.java
|
|
+++ b/src/java/org/apache/commons/collections/MultiMap.java
|
|
@@ -66,7 +66,7 @@ public interface MultiMap extends Map {
|
|
* @throws ClassCastException if the key or value is of an invalid type
|
|
* @throws NullPointerException if the key or value is null and null is invalid
|
|
*/
|
|
- public Object remove(Object key, Object item);
|
|
+ public Object removeMapping(Object key, Object item);
|
|
|
|
//-----------------------------------------------------------------------
|
|
/**
|
|
diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
|
|
index 9e3e02d..65bffe9 100644
|
|
--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
|
|
+++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
|
|
@@ -197,7 +197,7 @@ public class MultiKeyMap
|
|
* @param key2 the second key
|
|
* @return the value mapped to the removed key, null if key not in map
|
|
*/
|
|
- public Object remove(Object key1, Object key2) {
|
|
+ public Object removeMultiKey(Object key1, Object key2) {
|
|
int hashCode = hash(key1, key2);
|
|
int index = map.hashIndex(hashCode, map.data.length);
|
|
AbstractHashedMap.HashEntry entry = map.data[index];
|
|
diff --git a/src/java/org/apache/commons/collections/map/MultiValueMap.java b/src/java/org/apache/commons/collections/map/MultiValueMap.java
|
|
index f44999b..fb1a4d1 100644
|
|
--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java
|
|
+++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java
|
|
@@ -153,7 +153,7 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap {
|
|
* @param value the value to remove
|
|
* @return the value removed (which was passed in), null if nothing removed
|
|
*/
|
|
- public Object remove(Object key, Object value) {
|
|
+ public Object removeMapping(Object key, Object value) {
|
|
Collection valuesForKey = getCollection(key);
|
|
if (valuesForKey == null) {
|
|
return null;
|
|
diff --git a/src/test/org/apache/commons/collections/TestMultiHashMap.java b/src/test/org/apache/commons/collections/TestMultiHashMap.java
|
|
index eca833a..9d47438 100644
|
|
--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java
|
|
+++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java
|
|
@@ -217,7 +217,7 @@ public class TestMultiHashMap extends AbstractTestMap {
|
|
MultiHashMap one = new MultiHashMap();
|
|
Integer value = new Integer(1);
|
|
one.put("One", value);
|
|
- one.remove("One", value);
|
|
+ one.removeMapping("One", value);
|
|
|
|
MultiHashMap two = new MultiHashMap();
|
|
assertEquals(two, one);
|
|
@@ -269,7 +269,7 @@ public class TestMultiHashMap extends AbstractTestMap {
|
|
assertEquals(4, map.totalSize());
|
|
map.remove("A");
|
|
assertEquals(3, map.totalSize());
|
|
- map.remove("B", "BC");
|
|
+ map.removeMapping("B", "BC");
|
|
assertEquals(2, map.totalSize());
|
|
}
|
|
|
|
@@ -292,7 +292,7 @@ public class TestMultiHashMap extends AbstractTestMap {
|
|
map.remove("A");
|
|
assertEquals(0, map.size("A"));
|
|
assertEquals(3, map.size("B"));
|
|
- map.remove("B", "BC");
|
|
+ map.removeMapping("B", "BC");
|
|
assertEquals(0, map.size("A"));
|
|
assertEquals(2, map.size("B"));
|
|
}
|
|
@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap {
|
|
map.put("A", "AA");
|
|
map.put("A", "AB");
|
|
map.put("A", "AC");
|
|
- assertEquals(null, map.remove("C", "CA"));
|
|
- assertEquals(null, map.remove("A", "AD"));
|
|
- assertEquals("AC", map.remove("A", "AC"));
|
|
- assertEquals("AB", map.remove("A", "AB"));
|
|
- assertEquals("AA", map.remove("A", "AA"));
|
|
+ assertEquals(null, map.removeMapping("C", "CA"));
|
|
+ assertEquals(null, map.removeMapping("A", "AD"));
|
|
+ assertEquals("AC", map.removeMapping("A", "AC"));
|
|
+ assertEquals("AB", map.removeMapping("A", "AB"));
|
|
+ assertEquals("AA", map.removeMapping("A", "AA"));
|
|
assertEquals(new MultiHashMap(), map);
|
|
}
|
|
|
|
diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
|
|
index dfde362..8287f33 100644
|
|
--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
|
|
+++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
|
|
@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject {
|
|
verify();
|
|
|
|
try {
|
|
- array = collection.toArray(null);
|
|
+ array = collection.toArray((Object[]) null);
|
|
fail("toArray(null) should raise NPE");
|
|
} catch (NullPointerException e) {
|
|
// expected
|
|
diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
|
|
index b1ee3d0..9845721 100644
|
|
--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
|
|
+++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
|
|
@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap {
|
|
switch (key.size()) {
|
|
case 2:
|
|
assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));
|
|
- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1)));
|
|
+ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
|
|
assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
|
|
assertEquals(size - 1, multimap.size());
|
|
- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1)));
|
|
+ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
|
|
assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
|
|
break;
|
|
case 3:
|
|
diff --git a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
|
|
index b9a5ac8..3138a83 100644
|
|
--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
|
|
+++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
|
|
@@ -161,7 +161,7 @@ public class TestMultiValueMap extends TestCase {
|
|
MultiValueMap one = new MultiValueMap();
|
|
Integer value = new Integer(1);
|
|
one.put("One", value);
|
|
- one.remove("One", value);
|
|
+ one.removeMapping("One", value);
|
|
|
|
MultiValueMap two = new MultiValueMap();
|
|
assertEquals(two, one);
|
|
@@ -187,7 +187,7 @@ public class TestMultiValueMap extends TestCase {
|
|
assertEquals(4, map.totalSize());
|
|
map.remove("A");
|
|
assertEquals(3, map.totalSize());
|
|
- map.remove("B", "BC");
|
|
+ map.removeMapping("B", "BC");
|
|
assertEquals(2, map.totalSize());
|
|
}
|
|
|
|
@@ -204,7 +204,7 @@ public class TestMultiValueMap extends TestCase {
|
|
assertEquals(2, map.size());
|
|
map.remove("A");
|
|
assertEquals(2, map.size());
|
|
- map.remove("B", "BC");
|
|
+ map.removeMapping("B", "BC");
|
|
assertEquals(2, map.size());
|
|
}
|
|
|
|
@@ -227,7 +227,7 @@ public class TestMultiValueMap extends TestCase {
|
|
map.remove("A");
|
|
assertEquals(0, map.size("A"));
|
|
assertEquals(3, map.size("B"));
|
|
- map.remove("B", "BC");
|
|
+ map.removeMapping("B", "BC");
|
|
assertEquals(0, map.size("A"));
|
|
assertEquals(2, map.size("B"));
|
|
}
|
|
@@ -338,11 +338,11 @@ public class TestMultiValueMap extends TestCase {
|
|
map.put("A", "AA");
|
|
map.put("A", "AB");
|
|
map.put("A", "AC");
|
|
- assertEquals(null, map.remove("C", "CA"));
|
|
- assertEquals(null, map.remove("A", "AD"));
|
|
- assertEquals("AC", map.remove("A", "AC"));
|
|
- assertEquals("AB", map.remove("A", "AB"));
|
|
- assertEquals("AA", map.remove("A", "AA"));
|
|
+ assertEquals(null, map.removeMapping("C", "CA"));
|
|
+ assertEquals(null, map.removeMapping("A", "AD"));
|
|
+ assertEquals("AC", map.removeMapping("A", "AC"));
|
|
+ assertEquals("AB", map.removeMapping("A", "AB"));
|
|
+ assertEquals("AA", map.removeMapping("A", "AA"));
|
|
assertEquals(new MultiValueMap(), map);
|
|
}
|
|
|