svn commit: r1654805 - in /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl: CRUDMergingResourceProvider.java MergingResourceProvider.java

[cz...@apache.org]

Author: cziegeler
Date: Mon Jan 26 14:03:33 2015
New Revision: 1654805

URL: http://svn.apache.org/r1654805
Log:
SLING-4247 : clean up code and add missing break

Modified:
    sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
    sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java

Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java?rev=1654805&r1=1654804&r2=1654805&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java Mon Jan 26 14:03:33 2015
@@ -30,7 +30,6 @@ import org.apache.sling.api.resource.Per
 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;
 

Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java?rev=1654805&r1=1654804&r2=1654805&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java Mon Jan 26 14:03:33 2015
@@ -71,7 +71,7 @@ class MergingResourceProvider implements
         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
                 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
 
         /**
          * 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) {