sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefane...@apache.org
Subject svn commit: r1524963 - in /sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui: META-INF/MANIFEST.MF src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Date Fri, 20 Sep 2013 09:59:15 GMT
Author: stefanegli
Date: Fri Sep 20 09:59:15 2013
New Revision: 1524963

URL: http://svn.apache.org/r1524963
Log:
SLING-2985 : content-browser improvement: decode xml element names properly

Modified:
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
    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/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF?rev=1524963&r1=1524962&r2=1524963&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF Fri Sep 20
09:59:15 2013
@@ -11,6 +11,7 @@ Import-Package: org.apache.commons.httpc
  org.apache.commons.httpclient.methods;version="3.1.0",
  org.apache.commons.httpclient.methods.multipart;version="3.1.0",
  org.apache.commons.httpclient.params;version="3.1.0",
+ org.apache.jackrabbit.util,
  org.apache.maven.artifact.repository,
  org.apache.maven.model,
  org.apache.sling.ide.eclipse.core,

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=1524963&r1=1524962&r2=1524963&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 09:59:15 2013
@@ -30,6 +30,7 @@ import javax.xml.parsers.ParserConfigura
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.apache.jackrabbit.util.ISO9075;
 import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
 import org.apache.sling.ide.eclipse.core.ProjectUtil;
 import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
@@ -217,9 +218,9 @@ public class JcrNode implements IAdaptab
 	/** shown in the navigator (project explorer) as the label of this element **/
 	public String getLabel() {
 		if (domNode!=null && resource!=null) {
-			return domNode.getNodeName();// + "[domnode+file]";
+			return ISO9075.decode(domNode.getNodeName());// + "[domnode+file]";
 		} else if (domNode!=null && resource==null) {
-			return domNode.getNodeName();// + "[domnode]";
+			return ISO9075.decode(domNode.getNodeName());// + "[domnode]";
 		} else if (resource!=null) {
 			return resource.getName();//+" [file]";
 		} else {
@@ -466,7 +467,7 @@ public class JcrNode implements IAdaptab
 
 	public String getName() {
 		if (domNode!=null) {
-			return domNode.getNodeName();
+			return ISO9075.decode(domNode.getNodeName());
 		} else if (resource!=null) {
 			return resource.getName();
 		} else {



Mime
View raw message