[sling-org-apache-sling-resourcemerger] 07/24: SLING-2986 : Minor code optimization

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.0.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 6a8e82cfaf9feaffbee601882029fd3324b1761e
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Jan 29 16:09:30 2014 +0000

    SLING-2986 : Minor code optimization
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1562492
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../impl/MergedResourceProvider.java               | 45 ++++++++++------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
index f63e9dc..d722512 100644
--- 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
+++ 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourceProvider.java
@@ -86,12 +86,12 @@ public class MergedResourceProvider implements 
ResourceProvider {
      */
     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 implements 
ResourceProvider {
                 }
 
                 // 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

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.