svn commit: r1174791 - /jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java

[re...@apache.org]

Author: reschke
Date: Fri Sep 23 14:11:35 2011
New Revision: 1174791

URL: http://svn.apache.org/viewvc?rev=1174791&view=rev
Log:
generics

Modified:
    jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java

Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java?rev=1174791&r1=1174790&r2=1174791&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/FilterContentPackage.java Fri Sep 23 14:11:35 2011
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.commons.pre
 
 public class FilterContentPackage implements ContentPackage {
 
-    protected final List content = new ArrayList();
+    protected final List<Content> content = new ArrayList<Content>();
 
     protected boolean includeProperties = false;
 
@@ -47,9 +47,9 @@ public class FilterContentPackage implem
     /**
      * @see org.apache.jackrabbit.commons.packaging.ContentPackage#getItems(javax.jcr.Session)
      */
-    public Iterator getItems(Session session)
+    public Iterator<Item> getItems(Session session)
     throws RepositoryException {
-        return new FilteringIterator(session, new ArrayList(this.content), this.includeProperties);
+        return new FilteringIterator(session, new ArrayList<Content>(this.content), this.includeProperties);
     }
 
     protected static class Content {
@@ -65,7 +65,7 @@ public class FilterContentPackage implem
     public static class FilteringIterator implements Iterator {
 
         /** The content we will iterate over. */
-        protected final List content;
+        protected final List<Content> content;
 
         /**
          * Filter that defines which items are included
@@ -80,7 +80,7 @@ public class FilterContentPackage implem
 
         protected final Session session;
 
-        protected final List nodeIteratorStack = new ArrayList();
+        protected final List<NodeIterator> nodeIteratorStack = new ArrayList<NodeIterator>();
 
         protected final boolean includeProperties;
 
@@ -95,7 +95,7 @@ public class FilterContentPackage implem
          * @param includeProperties Should properties be included.
          */
         public FilteringIterator(final Session session,
-                                 final List contentList,
+                                 final List<Content> contentList,
                                  final boolean includeProperties) {
             this.content = contentList;
             this.session = session;