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:54 UTC
[sling-org-apache-sling-resourceresolver] 10/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 ffc0c62993776fbfe90c8ad8f4ba9303c53bfa95
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 26 06:50:07 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@1450052 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/resourceresolver/impl/ResourceResolverImpl.java | 14 +++++++-------
.../resourceresolver/impl/ResourceResolverImplTest.java | 4 ++--
2 files changed, 9 insertions(+), 9 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 706b7ff..487cf97 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
@@ -1085,23 +1085,23 @@ public class ResourceResolverImpl extends SlingAdaptable implements ResourceReso
}
/**
- * @see org.apache.sling.api.resource.ResourceResolver#getResourceSuperType(org.apache.sling.api.resource.Resource)
+ * @see org.apache.sling.api.resource.ResourceResolver#getParentResourceType(org.apache.sling.api.resource.Resource)
*/
- public String getResourceSuperType(final Resource resource) {
+ public String getParentResourceType(final Resource resource) {
String resourceSuperType = null;
if ( resource != null ) {
resourceSuperType = resource.getResourceSuperType();
if (resourceSuperType == null) {
- resourceSuperType = this.getResourceSuperType(resource.getResourceType());
+ resourceSuperType = this.getParentSuperType(resource.getResourceType());
}
}
return resourceSuperType;
}
/**
- * @see org.apache.sling.api.resource.ResourceResolver#getResourceSuperType(java.lang.String)
+ * @see org.apache.sling.api.resource.ResourceResolver#getParentSuperType(java.lang.String)
*/
- public String getResourceSuperType(final String resourceType) {
+ public String getParentSuperType(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
@@ -1138,12 +1138,12 @@ public class ResourceResolverImpl extends SlingAdaptable implements ResourceReso
if (resourceType.equals(resource.getResourceType())) {
result = true;
} else {
- String superType = this.getResourceSuperType(resource);
+ String superType = this.getParentResourceType(resource);
while (!result && superType != null) {
if (resourceType.equals(superType)) {
result = true;
} else {
- superType = this.getResourceSuperType(superType);
+ superType = this.getParentSuperType(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 4b4f559..4c3deb9 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.getResourceSuperType(r.getResourceType()));
- assertNull(resolver.getResourceSuperType(r2.getResourceType()));
+ assertEquals("t:c", resolver.getParentSuperType(r.getResourceType()));
+ assertNull(resolver.getParentSuperType(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>.