Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7759E1009C for ; Fri, 20 Sep 2013 09:59:48 +0000 (UTC) Received: (qmail 10021 invoked by uid 500); 20 Sep 2013 09:59:46 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 9984 invoked by uid 500); 20 Sep 2013 09:59:43 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 9943 invoked by uid 99); 20 Sep 2013 09:59:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Sep 2013 09:59:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Sep 2013 09:59:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0779E238899C; Fri, 20 Sep 2013 09:59:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@sling.apache.org From: stefanegli@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130920095916.0779E238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 {