svn commit: r1705884 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java

[rombert]

Author: rombert
Date: Tue Sep 29 15:51:08 2015
New Revision: 1705884

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

JcrNode - better toString() by including the actual class name

Modified:
    
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java

Modified: 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1705884&r1=1705883&r2=1705884&view=diff
==============================================================================
--- 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
 Tue Sep 29 15:51:08 2015
@@ -150,7 +150,7 @@ public class JcrNode implements IAdaptab
        
        @Override
        public String toString() {
-               return "JcrNode[dom:"+domElement+", file:"+resource+", 
jcrPath:"+getJcrPath()+"]";
+               return getClass().getSimpleName() + "[dom:"+domElement+", 
file:"+resource+", jcrPath:"+getJcrPath()+"]";
        }
        
        @Override
@@ -425,7 +425,7 @@ public class JcrNode implements IAdaptab
        public Image getImage() {
                boolean plainFolder = resource!=null && (resource instanceof 
IFolder);
                String primaryType = 
getProperty("jcr:primaryType").getValueAsString();
-               boolean typeFolder = primaryType!=null && 
((primaryType.equals("nt:folder") || primaryType.equals("sling:Folder")));
+               boolean typeFolder = probablyFolderType(primaryType);
                boolean typeFile = primaryType!=null && 
((primaryType.equals("nt:file") || primaryType.equals("nt:resource") || 
primaryType.equals("sling:File")));
                typeFile |= (resource!=null && primaryType==null);
                boolean typeUnstructured = primaryType!=null && 
((primaryType.equals("nt:unstructured")));
@@ -462,6 +462,11 @@ public class JcrNode implements IAdaptab
                
        }
 
+    private boolean probablyFolderType(String primaryType) {
+        return primaryType != null && 
+                (primaryType.equals("nt:folder") || 
primaryType.equals("sling:Folder"));
+    }
+
        private ImageDescriptor getImageDescriptor(String filename, String 
jcrMimeType) {
                final String modifiedFilename;
                if (jcrMimeType.equals("image/jpeg")) {
@@ -975,7 +980,7 @@ public class JcrNode implements IAdaptab
     private SerializationKind getFallbackSerializationKind(String nodeType) {
         if (nodeType.equals("nt:file")) {
             return SerializationKind.FILE;
-        } else if (nodeType.equals("nt:folder") || 
nodeType.equals("sling:Folder")) {
+        } else if (probablyFolderType(nodeType)) {
             return SerializationKind.FOLDER;
         } else {
             return SerializationKind.METADATA_PARTIAL;