[Yanel-commits] rev 33883 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation

[michi at wyona.com]

Author: michi
Date: 2008-03-23 09:23:00 +0100 (Sun, 23 Mar 2008)
New Revision: 33883

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeDOMImpl.java
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeResConfigAndDataRepoImpl.java
Log:
getLabel() implemented

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeDOMImpl.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeDOMImpl.java	2008-03-23 08:22:34 UTC (rev 33882)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeDOMImpl.java	2008-03-23 08:23:00 UTC (rev 33883)
@@ -83,16 +83,24 @@
      *
      */
     public boolean isCollection() {
-        log.error("TODO: Implementation not finished yet!");
-        return false;
+        org.w3c.dom.NodeList nl = element.getElementsByTagName("node");
+        if (nl.getLength() > 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
      *
      */
     public Node[] getChildren() {
-        log.error("TODO: Implementation not finished yet!");
-        return null;
+        org.w3c.dom.NodeList nl = element.getElementsByTagName("node");
+        NodeDOMImpl[] nodes = new NodeDOMImpl[nl.getLength()];
+        for (int i = 0; i < nodes.length; i++) {
+            nodes[i] = new NodeDOMImpl((org.w3c.dom.Element) nl.item(i));
+        }
+        return nodes;
     }
 
     /**
@@ -128,10 +136,22 @@
     }
 
     /**
-     *
+     * @see
      */
     public String getName() {
-        log.error("TODO: Implementation not finished yet!");
-        return null;
+        if (element.getNodeName().equals("sitetree")) {
+            log.warn("Sitetree node has no name");
+        }
+        return element.getAttribute("name");
     }
+
+    /**
+     * @see
+     */
+    public String getLabel() {
+        if (element.getNodeName().equals("sitetree")) {
+            log.warn("Sitetree node has no label");
+        }
+        return element.getElementsByTagName("label").item(0).getFirstChild().getNodeValue();
+    }
 }

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java	2008-03-23 08:22:34 UTC (rev 33882)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java	2008-03-23 08:23:00 UTC (rev 33883)
@@ -202,4 +202,11 @@
     public String getName() {
         return path.getName();
     }
+
+    /**
+     * @see
+     */
+    public String getLabel() {
+        return getName();
+    }
 }

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeResConfigAndDataRepoImpl.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeResConfigAndDataRepoImpl.java	2008-03-23 08:22:34 UTC (rev 33882)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeResConfigAndDataRepoImpl.java	2008-03-23 08:23:00 UTC (rev 33883)
@@ -230,4 +230,11 @@
     public String getName() {
         return path.getName();
     }
+
+    /**
+     * @see
+     */
+    public String getLabel() {
+        return getName();
+    }
 }