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 09:59:51 UTC
[sling-org-apache-sling-resourcemerger] 10/31: SLING-4247 : clean
up code and add missing break
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit d824761e9ed3f172a73edc8c3e761cdce50c197b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jan 26 14:03:33 2015 +0000
SLING-4247 : clean up code and add missing break
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1654805 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/resourcemerger/impl/CRUDMergingResourceProvider.java | 2 --
.../apache/sling/resourcemerger/impl/MergingResourceProvider.java | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
index 782b21e..1ef1d6b 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
@@ -30,7 +30,6 @@ import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.resourcemerger.spi.MergedResourcePicker;
/**
@@ -48,7 +47,6 @@ public class CRUDMergingResourceProvider
private static final class ExtendedResourceHolder {
public final String name;
public final List<Resource> resources = new ArrayList<Resource>();
- public final List<ValueMap> valueMaps = new ArrayList<ValueMap>();
public int count;
public String highestResourcePath;
diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
index 82a9f91..08d68df 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
@@ -71,7 +71,7 @@ class MergingResourceProvider implements ResourceProvider {
private List<ExcludeEntry> entries = new ArrayList<ExcludeEntry>();
public ParentHidingHandler(final Resource parent) {
- final ValueMap parentProps = ResourceUtil.getValueMap(parent);
+ final ValueMap parentProps = parent.getValueMap();
final String[] childrenToHideArray = parentProps.get(MergedResourceConstants.PN_HIDE_CHILDREN, String[].class);
if (childrenToHideArray != null) {
for (final String value : childrenToHideArray) {
@@ -83,7 +83,7 @@ class MergingResourceProvider implements ResourceProvider {
Resource ancestor = parent.getParent();
String previousAncestorName = parent.getName();
while (ancestor != null) {
- final ValueMap ancestorProps = ResourceUtil.getValueMap(ancestor);
+ final ValueMap ancestorProps = ancestor.getValueMap();
final String[] ancestorChildrenToHideArray = ancestorProps.get(MergedResourceConstants.PN_HIDE_CHILDREN, String[].class);
if (ancestorChildrenToHideArray != null) {
for (final String value : ancestorChildrenToHideArray) {
@@ -117,7 +117,7 @@ class MergingResourceProvider implements ResourceProvider {
/**
* Determine if an entry should hide the named resource.
- *
+ *
* @return a non-null value if the entry matches; a null value if it does not
*/
private Boolean hides(final ExcludeEntry entry, final String name) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.