Author: stefanegli
Date: Fri Sep 20 15:28:32 2013
New Revision: 1525034
URL: http://svn.apache.org/r1525034
Log:
SLING-2985 : content-browser improvement: icons-/jcrPath calculation fixlet
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java?rev=1525034&r1=1525033&r2=1525034&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
Fri Sep 20 15:28:32 2013
@@ -83,6 +83,11 @@ public class DirNode extends JcrNode {
}
@Override
+ String getJcrPathName() {
+ return getDecodedName();
+ }
+
+ @Override
protected void addChild(JcrNode jcrNode) {
JcrNode effectiveSibling = getEffectiveSibling();
if (effectiveSibling!=this && effectiveSibling!=null) {
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1525034&r1=1525033&r2=1525034&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Fri Sep 20 15:28:32 2013
@@ -394,21 +394,20 @@ public class JcrNode implements IAdaptab
String primaryType = getProperty("jcr:primaryType");
boolean typeFolder = primaryType!=null &&
((primaryType.equals("nt:folder") || primaryType.equals("sling:Folder")));
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")));
boolean isVaultFile = false;
try {
- isVaultFile = resource!=null && !isVaultFile(resource);
+ isVaultFile = resource!=null && isVaultFile(resource);
} catch (Exception e) {
// this empty catch is okay
}
String mimeType = null;
- if (isVaultFile) {
- mimeType = getJcrContentProperty("jcr:mimeType");
- if (mimeType == null) {
- mimeType = getProperty("jcr:mimeType");
- }
+ mimeType = getJcrContentProperty("jcr:mimeType");
+ if (mimeType == null) {
+ mimeType = getProperty("jcr:mimeType");
}
if (typeUnstructured) {
@@ -427,7 +426,7 @@ public class JcrNode implements IAdaptab
}
return workbenchLabelProvider.getImage(resource);
} else {
- if (resource!=null) {
+ if (resource!=null && !isVaultFile) {
return
workbenchLabelProvider.getImage(resource);
}
return WhitelabelSupport.JCR_NODE_ICON.createImage();
@@ -488,7 +487,11 @@ public class JcrNode implements IAdaptab
prefix = prefix + "/";
}
}
- return prefix + getName();
+ return prefix + getJcrPathName();
+ }
+
+ String getJcrPathName() {
+ return getName();
}
@Override
