[utilities COMMIT] in /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection: Transformed...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jan 18 15:12:24 2012
New Revision: 211

URL: http://svn.shibboleth.net/view/utilities?rev=211&view=rev
Log:
Add missing functions in terms of the standardXXX functions provided in the parent class.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputSet.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java?rev=211&r1=210&r2=211&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputList.java Wed Jan 18 15:12:24 2012
@@ -62,13 +62,7 @@
 
     /** {@inheritDoc} */
     public boolean add(@Nullable E element) {
-        Optional<? extends E> processedElement = transform.apply(element);
-
-        if (processedElement.isPresent()) {
-            return delegate().add(processedElement.get());
-        }
-
-        return false;
+        return standardAdd(element);
     }
 
     /** {@inheritDoc} */
@@ -82,30 +76,17 @@
 
     /** {@inheritDoc} */
     public boolean addAll(@Nullable @NullableElements Collection<? extends E> collection) {
-        if (collection == null) {
-            return false;
-        }
-
-        boolean collectionChanged = false;
-        for (E element : collection) {
-            if (add(element)) {
-                collectionChanged = true;
-            }
-        }
-
-        return collectionChanged;
+        return standardAddAll(collection);
     }
 
     /** {@inheritDoc} */
     public boolean addAll(int index, Collection<? extends E> elements) {
-        // TODO
-        return false;
+        return standardAddAll(index, elements);
     }
 
     /** {@inheritDoc} */
     public boolean retainAll(Collection<?> collection) {
-        // TODO Auto-generated method stub
-        return false;
+        return standardRetainAll(collection);
     }
 
     /** {@inheritDoc} */
@@ -117,6 +98,11 @@
         }
 
         return null;
+    }
+
+    /** {@inheritDoc} */
+    public List<E> subList(int fromIndex, int toIndex) {
+        return standardSubList(fromIndex, toIndex);
     }
 
     /** {@inheritDoc} */

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java?rev=211&r1=210&r2=211&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputMap.java Wed Jan 18 15:12:24 2012
@@ -87,13 +87,7 @@
 
     /** {@inheritDoc} */
     public void putAll(Map<? extends K, ? extends V> map) {
-        if (map == null) {
-            return;
-        }
-
-        for (Entry<? extends K, ? extends V> entry : map.entrySet()) {
-            put(entry.getKey(), entry.getValue());
-        }
+       standardPutAll(map);
     }
 
     /**

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputSet.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputSet.java?rev=211&r1=210&r2=211&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputSet.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/TransformedInputSet.java Wed Jan 18 15:12:24 2012
@@ -73,24 +73,12 @@
 
     /** {@inheritDoc} */
     public boolean addAll(@Nullable @NullableElements Collection<? extends E> collection) {
-        if (collection == null) {
-            return false;
-        }
-
-        boolean collectionChanged = false;
-        for (E element : collection) {
-            if (add(element)) {
-                collectionChanged = true;
-            }
-        }
-
-        return collectionChanged;
+        return standardAddAll(collection);
     }
 
     /** {@inheritDoc} */
     public boolean retainAll(Collection<?> collection) {
-        // TODO Auto-generated method stub
-        return false;
+        return standardRetainAll(collection);
     }
 
     /** {@inheritDoc} */