You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/10/18 19:11:40 UTC

svn commit: r1023910 - in /commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag: TransformedBag.java TransformedSortedBag.java

Author: sebb
Date: Mon Oct 18 17:11:40 2010
New Revision: 1023910

URL: http://svn.apache.org/viewvc?rev=1023910&view=rev
Log:
Generics

Modified:
    commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedBag.java
    commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedBag.java?rev=1023910&r1=1023909&r2=1023910&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedBag.java Mon Oct 18 17:11:40 2010
@@ -74,11 +74,11 @@ public class TransformedBag<E>
      * @throws IllegalArgumentException if bag or transformer is null
      * @since Commons Collections 3.3
      */
-    // TODO: Generics
-    public static Bag decorateTransform(Bag bag, Transformer transformer) {
-        TransformedBag decorated = new TransformedBag(bag, transformer);
+    public static <E> Bag<E> decorateTransform(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
+        TransformedBag<E> decorated = new TransformedBag<E>(bag, transformer);
         if (transformer != null && bag != null && bag.size() > 0) {
-            Object[] values = bag.toArray();
+            @SuppressWarnings("unchecked") // Bag is of type E
+            E[] values = (E[]) bag.toArray();
             bag.clear();
             for(int i=0; i<values.length; i++) {
                 decorated.decorated().add(transformer.transform(values[i]));

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java?rev=1023910&r1=1023909&r2=1023910&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java Mon Oct 18 17:11:40 2010
@@ -72,11 +72,11 @@ public class TransformedSortedBag<E>
      * @throws IllegalArgumentException if bag or transformer is null
      * @since Commons Collections 3.3
      */
-    // TODO: Generics
-    public static SortedBag decorateTransform(SortedBag bag, Transformer transformer) {
-        TransformedSortedBag decorated = new TransformedSortedBag(bag, transformer);
+    public static <E> SortedBag<E>  decorateTransform(SortedBag<E> bag, Transformer<? super E, ? extends E> transformer) {
+        TransformedSortedBag<E>  decorated = new TransformedSortedBag<E>(bag, transformer);
         if (transformer != null && bag != null && bag.size() > 0) {
-            Object[] values = bag.toArray();
+            @SuppressWarnings("unchecked") // bag is type E
+            E[] values = (E[]) bag.toArray();
             bag.clear();
             for(int i=0; i<values.length; i++) {
                 decorated.decorated().add(transformer.transform(values[i]));