svn commit: r1705889 - in /sling/trunk/tooling/ide: eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java

[rombert]

Author: rombert
Date: Tue Sep 29 16:24:26 2015
New Revision: 1705889

URL: http://svn.apache.org/viewvc?rev=1705889&view=rev
Log:
SLING-4988 - Not all folders are displayed in Project Explorer 

Partial fix + enabled test.

Modified:
    
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java
    
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java

Modified: 
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java?rev=1705889&r1=1705888&r2=1705889&view=diff
==============================================================================
--- 
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrContentContentProviderTest.java
 Tue Sep 29 16:24:26 2015
@@ -31,7 +31,6 @@ import org.eclipse.core.resources.IFolde
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.Path;
 import org.hamcrest.CoreMatchers;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -169,7 +168,6 @@ public class JcrContentContentProviderTe
     }
     
     @Test
-    @Ignore("SLING-4998")
     public void listChildrenOnNtFolderIncludedUnderJcrContentNode() throws 
Exception  {
         
         // create faceted project

Modified: 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java?rev=1705889&r1=1705888&r2=1705889&view=diff
==============================================================================
--- 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
 Tue Sep 29 16:24:26 2015
@@ -26,6 +26,7 @@ import javax.xml.parsers.ParserConfigura
 
 import org.apache.commons.io.IOUtils;
 import org.apache.sling.ide.eclipse.core.internal.Activator;
+import org.apache.sling.ide.serialization.SerializationManager;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -160,6 +161,9 @@ public class GenericJcrRootFile extends
        }
 
     public void pickResources(List<IResource> membersList) {
+        
+        final SerializationManager serializationManager = 
Activator.getDefault().getSerializationManager();
+
         for (Iterator<IResource> it = membersList.iterator(); it.hasNext();) {
             final IResource resource = it.next();
                        final String resName = resource.getName();
@@ -171,7 +175,7 @@ public class GenericJcrRootFile extends
                        }
                        while(it2.hasNext()) {
                 JcrNode aChild = it2.next();
-                               if (resName.equals(aChild.getName())) {
+                               if 
(resName.equals(serializationManager.getOsPath(aChild.getName()))) {
                                        // then pick this one
                                        it.remove();
                                        aChild.setResource(resource);