incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r931554 - /sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
Date Wed, 07 Apr 2010 13:58:30 GMT
Author: cziegeler
Date: Wed Apr  7 13:58:30 2010
New Revision: 931554

URL: http://svn.apache.org/viewvc?rev=931554&view=rev
Log:
Remove unused parameter

Modified:
    sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java

Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java?rev=931554&r1=931553&r2=931554&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
(original)
+++ sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/helper/ResourceCollector.java
Wed Apr  7 13:58:30 2010
@@ -179,7 +179,7 @@ public class ResourceCollector {
             // get the location resource, use a synthetic resource if there
             // is no real location. There may still be children at this
             // location
-            Resource locationRes = getResource(resolver, null, location);
+            Resource locationRes = getResource(resolver, location);
             getWeightedResources(resources, locationRes);
         }
 
@@ -303,37 +303,23 @@ public class ResourceCollector {
     }
 
     /**
-     * Returns a resource for the given <code>path</code>. If the
-     * <code>path</code> is relative, the resource is accessed relative to the
-     * <code>base</code> resource. If no resource exists at the given path -
-     * absolute or relative to the base resource - a
+     * Returns a resource for the given <code>path</code>.
+     * If no resource exists at the given path a
      * <code>SyntheticResource</code> is returned.
      *
      * @param resolver The <code>ResourceResolver</code> used to access the
      *            resource.
-     * @param base The (optional) base resource. This may be <code>null</code>
-     *            if the <code>path</code> is absolute.
-     * @param path The absolute or relative (to the base resource) path of the
-     *            resource to return.
+     * @param path The absolute path of the resource to return.
      * @return The actual resource at the given <code>path</code> or a
      *         synthetic resource representing the path location.
      */
     protected final Resource getResource(ResourceResolver resolver,
-            Resource base, String path) {
-        Resource res;
-        if (base == null) {
-            res = resolver.getResource(path);
-        } else {
-            res = resolver.getResource(base, path);
-        }
+            String path) {
+        Resource res = resolver.getResource(path);
 
         if (res == null) {
             if (!path.startsWith("/")) {
-                if (base == null) {
-                    path = "/".concat(path);
-                } else {
-                    path = base.getPath() + "/" + path;
-                }
+                path = "/".concat(path);
             }
 
             res = new SyntheticResource(resolver, path, "$synthetic$");



Mime
View raw message