[Yanel-commits] rev 35087 - public/yanel/trunk/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation

[michi at wyona.com]

Author: michi
Date: 2008-04-09 10:43:02 +0200 (Wed, 09 Apr 2008)
New Revision: 35087

Modified:
   public/yanel/trunk/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
Log:
use name as label because of current encoding issues

Modified: public/yanel/trunk/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java	2008-04-09 08:40:10 UTC (rev 35086)
+++ public/yanel/trunk/src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java	2008-04-09 08:43:02 UTC (rev 35087)
@@ -99,6 +99,9 @@
         if (node != null) {
             if (node.isCollection()) {
                 sb.append("<collection path=\"" + path + "\" name=\"" + node.getName() + "\">");
+                // TODO: ...
+                sb.append("<label><![CDATA[" + node.getName() + "]]></label>");
+                //sb.append("<label><![CDATA[" + node.getLabel() + "]]></label>");
                 Node[] children = node.getChildren();
                 for (int i = 0; i < children.length; i++) {
                     String childPath = path + "/" + children[i].getName();
@@ -111,8 +114,12 @@
                         sb.append(getNodeAsXML(childPath));
                         //sb.append(getNodeAsXML(children[i].getPath()));
                     } else if (children[i].isResource()) {
-                        sb.append("<resource path=\"" + childPath + "\" name=\"" + children[i].getName() + "\"/>");
-                        //sb.append("<resource path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\"/>");
+                        sb.append("<resource path=\"" + childPath + "\" name=\"" + children[i].getName() + "\">");
+                        //sb.append("<resource path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\">");
+                        // TODO ...
+                        sb.append("<label><![CDATA[" + children[i].getName() + "]]></label>");
+                        //sb.append("<label><![CDATA[" + children[i].getLabel() + "]]></label>");
+                        sb.append("</resource>");
                     } else {
                         sb.append("<neither-resource-nor-collection path=\"" + childPath + "\" name=\"" + children[i].getName() + "\"/>");
                         //sb.append("<neither-resource-nor-collection path=\"" + children[i].getPath() + "\" name=\"" + children[i].getName() + "\"/>");
@@ -120,7 +127,11 @@
                 }
                 sb.append("</collection>");
             } else {
-                sb.append("<resource path=\"" + path + "\" name=\"" + node.getName() + "\"/>");
+                sb.append("<resource path=\"" + path + "\" name=\"" + node.getName() + "\">");
+                // TODO ...
+                sb.append("<label><![CDATA[" + node.getName() + "]]></label>");
+                //sb.append("<label><![CDATA[" + node.getLabel() + "]]></label>");
+                sb.append("</resource>");
             }
         } else {
             String errorMessage = "node is null for path: " + path;