You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:00:55 UTC
[sling-org-apache-sling-resourceresolver] 11/24: SLING-2739 : Add
methods for handling the resource type hierarchy to the resource resolver
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit 48db14bba4e5ca094b17c2933f3420e08df13226
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 26 11:04:40 2013 +0000
SLING-2739 : Add methods for handling the resource type hierarchy to the resource resolver
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1450131 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/resourceresolver/impl/ResourceResolverImpl.java | 8 ++++----
.../sling/resourceresolver/impl/ResourceResolverImplTest.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
index 487cf97..e965941 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
@@ -1092,16 +1092,16 @@ public class ResourceResolverImpl extends SlingAdaptable implements ResourceReso
if ( resource != null ) {
resourceSuperType = resource.getResourceSuperType();
if (resourceSuperType == null) {
- resourceSuperType = this.getParentSuperType(resource.getResourceType());
+ resourceSuperType = this.getParentResourceType(resource.getResourceType());
}
}
return resourceSuperType;
}
/**
- * @see org.apache.sling.api.resource.ResourceResolver#getParentSuperType(java.lang.String)
+ * @see org.apache.sling.api.resource.ResourceResolver#getParentResourceType(java.lang.String)
*/
- public String getParentSuperType(final String resourceType) {
+ public String getParentResourceType(final String resourceType) {
// normalize resource type to a path string
final String rtPath = (resourceType == null ? null : ResourceUtil.resourceTypeToPath(resourceType));
// get the resource type resource and check its super type
@@ -1143,7 +1143,7 @@ public class ResourceResolverImpl extends SlingAdaptable implements ResourceReso
if (resourceType.equals(superType)) {
result = true;
} else {
- superType = this.getParentSuperType(superType);
+ superType = this.getParentResourceType(superType);
}
}
}
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
index 4c3deb9..71450cf 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
@@ -370,8 +370,8 @@ public class ResourceResolverImplTest {
resolver.setResource("/a", r);
resolver.setResource("/a/b", typeResource);
- assertEquals("t:c", resolver.getParentSuperType(r.getResourceType()));
- assertNull(resolver.getParentSuperType(r2.getResourceType()));
+ assertEquals("t:c", resolver.getParentResourceType(r.getResourceType()));
+ assertNull(resolver.getParentResourceType(r2.getResourceType()));
}
@Test public void test_isA() {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.