Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 85923 invoked from network); 20 Apr 2010 06:51:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Apr 2010 06:51:39 -0000 Received: (qmail 91390 invoked by uid 500); 20 Apr 2010 06:51:39 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 91226 invoked by uid 500); 20 Apr 2010 06:51:37 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 91217 invoked by uid 99); 20 Apr 2010 06:51:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Apr 2010 06:51:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Apr 2010 06:51:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 691E7238899B; Tue, 20 Apr 2010 06:50:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r935816 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java Date: Tue, 20 Apr 2010 06:50:49 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100420065049.691E7238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue Apr 20 06:50:49 2010 New Revision: 935816 URL: http://svn.apache.org/viewvc?rev=935816&view=rev Log: Clean up code and use resource wrapper Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java?rev=935816&r1=935815&r2=935816&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java (original) +++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/WorkspaceDecoratedResource.java Tue Apr 20 06:50:49 2010 @@ -17,53 +17,25 @@ package org.apache.sling.jcr.resource.internal; import org.apache.sling.api.resource.Resource; -import org.apache.sling.api.resource.ResourceMetadata; -import org.apache.sling.api.resource.ResourceResolver; +import org.apache.sling.api.resource.ResourceWrapper; /** * Decorated resource which prepends the workspace name to * a delegate resource's path. */ -class WorkspaceDecoratedResource implements Resource { +class WorkspaceDecoratedResource extends ResourceWrapper { - private final Resource delegate; private final String workspaceName; WorkspaceDecoratedResource(Resource resource, String workspaceName) { - this.delegate = resource; + super(resource); this.workspaceName = workspaceName; } - public AdapterType adaptTo(Class type) { - return delegate.adaptTo(type); - } - public String getPath() { if (workspaceName != null) { - return workspaceName + ":" + delegate.getPath(); - } else { - return delegate.getPath(); + return workspaceName + ":" + super.getPath(); } + return super.getPath(); } - - public ResourceMetadata getResourceMetadata() { - return delegate.getResourceMetadata(); - } - - public ResourceResolver getResourceResolver() { - return delegate.getResourceResolver(); - } - - public String getResourceSuperType() { - return delegate.getResourceSuperType(); - } - - public String getResourceType() { - return delegate.getResourceType(); - } - - public String toString() { - return delegate.toString(); - } - }