svn commit: r990629 - in /sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource: ServletResourceIterator.java ServletResourceProvider.java

[fmeschbe]

Author: fmeschbe
Date: Sun Aug 29 19:08:34 2010
New Revision: 990629

URL: http://svn.apache.org/viewvc?rev=990629&view=rev
Log:
SLING-1672 Remove implementation ServletResourceIterator to generate the 
synthetic parent tree to list the servlets (and their parents) with the 
ResourceResolver.listChildren method. This functionality is now part of the 
JcrResourceResolver implementation (which is expected).

Removed:
    
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceIterator.java
Modified:
    
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java

Modified: 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java?rev=990629&r1=990628&r2=990629&view=diff
==============================================================================
--- 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
 (original)
+++ 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProvider.java
 Sun Aug 29 19:08:34 2010
@@ -20,6 +20,7 @@ package org.apache.sling.servlets.resolv
 
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import javax.servlet.Servlet;
@@ -31,6 +32,21 @@ import org.apache.sling.api.resource.Res
 
 public class ServletResourceProvider implements ResourceProvider {
 
+    private static final Iterator<Resource> EMPTY_ITERATOR = new 
Iterator<Resource>() {
+
+        public boolean hasNext() {
+            return false;
+        }
+
+        public Resource next() {
+            throw new NoSuchElementException();
+        }
+
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    };
+
     private Servlet servlet;
 
     private Set<String> resourcePaths;
@@ -58,7 +74,7 @@ public class ServletResourceProvider imp
     }
 
     public Iterator<Resource> listChildren(final Resource parent) {
-        return new ServletResourceIterator(this, parent);
+        return EMPTY_ITERATOR;
     }
 
     Servlet getServlet() {
@@ -76,8 +92,8 @@ public class ServletResourceProvider imp
     /** Return suitable info for logging */
     @Override
     public String toString() {
-       return getClass().getSimpleName()
-       + ": servlet=" + servlet.getClass().getName()
-       + ", paths=" + Arrays.toString(getServletPaths());
+        return getClass().getSimpleName() + ": servlet="
+            + servlet.getClass().getName() + ", paths="
+            + Arrays.toString(getServletPaths());
     }
 }