From bcbb6cc63784e59944598586d18a11183900593c Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Sat, 14 Apr 2007 20:19:20 +0000
Subject: [PATCH] WW-1813 Tree Tag's treeSelectedTopic attribute doesn't work.
 * Fix tree tag topic notification * Fix showcase examples

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@528866 13f79535-47bb-0310-9956-ffa450edef68
---
 .../struts2/showcase/DynamicTreeSelectAction.java |  2 +-
 .../main/webapp/tags/ui/treeExampleDynamic.jsp    | 15 +++++++--------
 .../src/main/webapp/tags/ui/treeExampleStatic.jsp | 10 ++++------
 .../org/apache/struts2/dojo/components/Tree.java  |  3 ++-
 .../src/main/resources/template/ajax/tree.ftl     |  6 +++++-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
index 5d22be5ef..b57833320 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
@@ -47,7 +47,7 @@ public class DynamicTreeSelectAction extends ActionSupport {
 
 
     public String getNodeName() {
-        return currentCategory.getName();
+        return currentCategory != null ? currentCategory.getName() : "Node not found";
     }
 }
 
diff --git a/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp b/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
index a07a210ed..5e280434e 100644
--- a/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
+++ b/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
@@ -10,25 +10,24 @@
 
 <!-- START SNIPPET: treeExampleDynamicJsp -->
 
-<script>
-    function treeNodeSelected(nodeId) {
+<script language="JavaScript" type="text/javascript">
+    dojo.event.topic.subscribe("treeSelected", function treeNodeSelected(node) {
         dojo.io.bind({
-            url: "<s:url value='/tags/ui/ajax/dynamicTreeSelectAction.action' />?nodeId="+nodeId,
+            url: "<s:url value='/tags/ui/ajax/dynamicTreeSelectAction.action'/>?nodeId="+node.node.widgetId,
             load: function(type, data, evt) {
-                var displayDiv = dojo.byId("displayId");
-                displayDiv.innerHTML = data;
+                var divDisplay = dojo.byId("displayId");
+                divDisplay.innerHTML=data;
             },
             mimeType: "text/html"
         });
-    };
-
-    dojo.event.topic.subscribe("treeSelected", this, "treeNodeSelected");
+    });
 </script>
 
 
 
 <div style="float:left; margin-right: 50px;">
 <sx:tree 
+    id="tree"
     rootNode="%{treeRootNode}" 
     childCollectionProperty="children" 
     nodeIdProperty="id"
diff --git a/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp b/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
index 1c06fba48..241cd0599 100644
--- a/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
+++ b/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
@@ -9,19 +9,17 @@
 
 <!-- START SNIPPET: treeExampleStaticJsp -->
 
-<script>
-    function treeNodeSelected(nodeId) {
+<script language="JavaScript" type="text/javascript">
+    dojo.event.topic.subscribe("treeSelected", function treeNodeSelected(node) {
         dojo.io.bind({
-            url: "<s:url value='/tags/ui/ajax/staticTreeSelectAction.action'/>?nodeId="+nodeId,
+            url: "<s:url value='/tags/ui/ajax/staticTreeSelectAction.action'/>?nodeId="+node.node.title,
             load: function(type, data, evt) {
                 var divDisplay = dojo.byId("displayIt");
                 divDisplay.innerHTML=data;
             },
             mimeType: "text/html"
         });
-    };
-
-    dojo.event.topic.subscribe("treeSelected", this, "treeNodeSelected");
+    });
 </script>
 
 
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
index 9babeeea3..acaa3fd82 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
@@ -38,7 +38,8 @@ import com.opensymphony.xwork2.util.ValueStack;
  * Renders a tree widget with AJAX support.<p/>
  *
  * The id attribute is normally specified, such that it could be looked up using
- * javascript if necessary.<p/>
+ * javascript if necessary. The id attribute is required, if the "treeSelectedTopic"
+ * is going to be used.<p/>
  *
  * <!-- END SNIPPET: javadoc -->
  *
diff --git a/plugins/dojo/src/main/resources/template/ajax/tree.ftl b/plugins/dojo/src/main/resources/template/ajax/tree.ftl
index e59e66548..d7c3e8c18 100644
--- a/plugins/dojo/src/main/resources/template/ajax/tree.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/tree.ftl
@@ -6,6 +6,10 @@
         // dojo.hostenv.writeIncludes();
         -->
  </script>
+ <#if parameters.treeSelectedTopic?exists>
+ <dojo:TreeSelector widgetId="treeSelector_${parameters.id?default("")}" eventNames="select:${parameters.treeSelectedTopic?html}">
+ </dojo:TreeSelector> 
+ </#if>
 <div dojoType="Tree"   
 	<#if parameters.blankIconSrc?exists>
 	gridIconSrcT="<@s.url value='${parameters.blankIconSrc}' encode="false" includeParams='none'/>"
@@ -59,7 +63,7 @@
     id="${parameters.id?html}"
     </#if>
     <#if parameters.treeSelectedTopic?exists>
-    publishSelectionTopic="${parameters.treeSelectedTopic?html}"
+    selector="treeSelector_${parameters.id?default("")}"
     </#if>
     <#if parameters.treeExpandedTopic?exists>
     publishExpandedTopic="${parameters.treeExpandedTopic?html}"