svn commit: r653735 - /incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/LocationResource.java

[fm...@apache.org]

Author: fmeschbe
Date: Tue May  6 03:20:33 2008
New Revision: 653735

URL: http://svn.apache.org/viewvc?rev=653735&view=rev
Log:
SLING-387 Make LocationResource a Resource by extending from WrappedResource

Modified:
    incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/LocationResource.java

Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/LocationResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/LocationResource.java?rev=653735&r1=653734&r2=653735&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/LocationResource.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/LocationResource.java Tue May  6 03:20:33 2008
@@ -19,8 +19,9 @@
 package org.apache.sling.servlet.resolver.helper;
 
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceWrapper;
 
-public class LocationResource implements Comparable<LocationResource> {
+public class LocationResource extends ResourceWrapper implements Comparable<LocationResource> {
 
     static final int WEIGHT_NONE = 0;
 
@@ -32,16 +33,15 @@
 
     private final int ordinal;
 
-    private final Resource resource;
-
     private final int numSelectors;
 
     private int methodPrefixWeight;
 
     public LocationResource(int ordinal, Resource resource, int numSelectors,
             int methodPrefixWeight) {
+        super(resource);
+        
         this.ordinal = ordinal;
-        this.resource = resource;
         this.numSelectors = numSelectors;
         this.methodPrefixWeight = methodPrefixWeight;
     }
@@ -50,10 +50,6 @@
         return ordinal;
     }
 
-    public Resource getResource() {
-        return resource;
-    }
-
     public int getNumSelectors() {
         return numSelectors;
     }