svn commit: r1562492 - /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java

[cz...@apache.org]

Author: cziegeler
Date: Wed Jan 29 16:09:30 2014
New Revision: 1562492

URL: http://svn.apache.org/r1562492
Log:
SLING-2986 : Minor code optimization

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

Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java?rev=1562492&r1=1562491&r2=1562492&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java Wed Jan 29 16:09:30 2014
@@ -86,12 +86,12 @@ public class MergedResourceProvider impl
      */
     public Iterator<Resource> listChildren(final Resource resource) {
         if (resource instanceof MergedResource) {
-            MergedResource mergedResource = (MergedResource) resource;
-            ResourceResolver resolver = mergedResource.getResourceResolver();
-            List<Resource> children = new ArrayList<Resource>();
+            final MergedResource mergedResource = (MergedResource) resource;
+            final ResourceResolver resolver = mergedResource.getResourceResolver();
+            final List<Resource> children = new ArrayList<Resource>();
 
-            for (String mappedResourcePath : mergedResource.getMappedResources()) {
-                Resource mappedResource = resolver.getResource(mappedResourcePath);
+            for (final String mappedResourcePath : mergedResource.getMappedResources()) {
+                final Resource mappedResource = resolver.getResource(mappedResourcePath);
 
                 // Check if the resource exists
                 if (mappedResource == null) {
@@ -99,30 +99,27 @@ public class MergedResourceProvider impl
                 }
 
                 // Check if some previously defined children have to be ignored
-                ValueMap mappedResourceProps = mappedResource.adaptTo(ValueMap.class);
-                List<String> childrenToHide = Arrays.asList(mappedResourceProps.get(MergedResourceConstants.PN_HIDE_CHILDREN, new String[0]));
-                if (childrenToHide.isEmpty()) {
-                    String childToHide = mappedResourceProps.get(MergedResourceConstants.PN_HIDE_CHILDREN, String.class);
-                    if (childToHide != null) {
-                        childrenToHide.add(childToHide);
-                    }
-                }
-                if (childrenToHide.contains("*")) {
-                    // Clear current children list
-                    children.clear();
-                } else {
-                    // Go through current children in order to hide them individually
-                    Iterator<Resource> it = children.iterator();
-                    while (it.hasNext()) {
-                        if (childrenToHide.contains(it.next().getName())) {
-                            it.remove();
+                final ValueMap mappedResourceProps = mappedResource.adaptTo(ValueMap.class);
+                final String[] childrenToHideArray = mappedResourceProps.get(MergedResourceConstants.PN_HIDE_CHILDREN, String[].class);
+                if ( childrenToHideArray != null ) {
+                    final List<String> childrenToHide = Arrays.asList(childrenToHideArray);
+                    if ( childrenToHide.contains("*") ) {
+                        // Clear current children list
+                        children.clear();
+                    } else {
+                        // Go through current children in order to hide them individually
+                        final Iterator<Resource> it = children.iterator();
+                        while (it.hasNext()) {
+                            if (childrenToHide.contains(it.next().getName())) {
+                                it.remove();
+                            }
                         }
                     }
                 }
 
                 // Browse children of current physical resource
-                for (Resource child : mappedResource.getChildren()) {
-                    String childRelativePath = ResourceUtil.normalize(mergedResource.getRelativePath() + "/" + child.getName());
+                for (final Resource child : mappedResource.getChildren()) {
+                    final String childRelativePath = ResourceUtil.normalize(mergedResource.getRelativePath() + "/" + child.getName());
 
                     if (child.adaptTo(ValueMap.class).get(MergedResourceConstants.PN_HIDE_RESOURCE, Boolean.FALSE)) {
                         // Child resource has to be hidden