[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/collection/ClassToInst...
noreply at shibboleth.net
noreply at shibboleth.net
Sun Jul 13 12:10:53 EDT 2014
Author: rdw
Date: Sun Jul 13 12:10:53 2014
New Revision: 624
URL: http://svn.shibboleth.net/view/utilities?rev=624&view=rev
Log:
Nail some TODOs
Modified:
java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java
Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java?rev=624&r1=623&r2=624&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java Sun Jul 13 12:10:53 2014
@@ -206,13 +206,13 @@
putAll(map.values());
}
-
+
/**
* Remove the specified value from the map and from the value list of all indexes.
*
* <p>
- * If the value list for a type index becomes empty due to the value removal, the entire type
- * index will be removed and {@link #containsKey(Class)} for that type will then return <code>false</code>.
+ * If the value list for a type index becomes empty due to the value removal, the entire type index will be removed
+ * and {@link #containsKey(Class)} for that type will then return <code>false</code>.
* </p>
*
* @param value the value to remove
@@ -221,9 +221,9 @@
if (value == null) {
return;
}
-
+
values.remove(value);
-
+
List<B> indexValues;
for (Class<?> indexKey : getIndexTypes(value)) {
indexValues = backingMap.get(indexKey);
@@ -235,13 +235,13 @@
}
}
}
-
+
/**
* Remove the specified values from the map and from the value list of all indexes.
*
* <p>
- * If the value list for a type index becomes empty due to a value removal, the entire type
- * index will be removed and {@link #containsKey(Class)} for that type will then return <code>false</code>.
+ * If the value list for a type index becomes empty due to a value removal, the entire type index will be removed
+ * and {@link #containsKey(Class)} for that type will then return <code>false</code>.
* </p>
*
* @param removeValues the values to remove
@@ -250,18 +250,18 @@
if (removeValues == null) {
return;
}
-
+
for (B value : removeValues) {
remove(value);
}
}
-
+
/**
* Remove the values contained in the specified map from this map and from the value list of all indexes.
*
* <p>
- * If the value list for a type index becomes empty due to a value removal, the entire type
- * index will be removed and {@link #containsKey(Class)} for that type will then return <code>false</code>.
+ * If the value list for a type index becomes empty due to a value removal, the entire type index will be removed
+ * and {@link #containsKey(Class)} for that type will then return <code>false</code>.
* </p>
*
* @param map the map containing the values to remove
@@ -270,21 +270,21 @@
if (map == null) {
return;
}
-
+
removeAll(map.values());
}
-
+
/**
* Remove from the map all values which have the specified type.
*
* <p>
- * Note that when a value was indexed by multiple superclass and/or interface types,
- * it will be removed from all those type indexes, not just the specified one.
- * </p>
- *
- * <p>
- * If the value list for a type index becomes empty due to a value removal, the entire type
- * index will be removed and {@link #containsKey(Class)} for that type will then return <code>false</code>.
+ * Note that when a value was indexed by multiple superclass and/or interface types, it will be removed from all
+ * those type indexes, not just the specified one.
+ * </p>
+ *
+ * <p>
+ * If the value list for a type index becomes empty due to a value removal, the entire type index will be removed
+ * and {@link #containsKey(Class)} for that type will then return <code>false</code>.
* </p>
*
* @param type the type of values to remove
@@ -293,9 +293,9 @@
if (type == null) {
return;
}
-
+
List<B> indexValues = backingMap.remove(type);
-
+
if (indexValues != null) {
for (B value : indexValues) {
remove(value);
@@ -313,10 +313,9 @@
public Collection<? extends B> values() {
return Collections.unmodifiableList(values);
}
-
- /**
[... 407 lines stripped ...]
More information about the commits
mailing list