svn commit: r1170563 - in /wicket/trunk: wicket-core/src/main/java/org/apache/wicket/markup/html/tree/ wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/

[pete]

Author: pete
Date: Wed Sep 14 12:22:16 2011
New Revision: 1170563

URL: http://svn.apache.org/viewvc?rev=1170563&view=rev
Log:
WICKET-4053 AbstractTree#updateTree(AjaxRequestTarget target) is invoked even 
when request is non-ajax

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.java
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=1170563&r1=1170562&r2=1170563&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
 Wed Sep 14 12:22:16 2011
@@ -291,7 +291,11 @@ public abstract class BaseTree extends A
                                                getTreeState().expandNode(node);
                                        }
                                        onJunctionLinkClicked(target, node);
-                                       updateTree(target);
+
+                                       if (target != null)
+                                       {
+                                               updateTree(target);
+                                       }
                                }
                        });
                        junctionLink.add(new Behavior()

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.java?rev=1170563&r1=1170562&r2=1170563&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkIconPanel.java
 Wed Sep 14 12:22:16 2011
@@ -79,6 +79,10 @@ public class LinkIconPanel extends Label
        protected void onNodeLinkClicked(Object node, BaseTree tree, 
AjaxRequestTarget target)
        {
                tree.getTreeState().selectNode(node, 
!tree.getTreeState().isNodeSelected(node));
-               tree.updateTree(target);
+
+               if (target != null)
+               {
+                       tree.updateTree(target);
+               }
        }
 }

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=1170563&r1=1170562&r2=1170563&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
 Wed Sep 14 12:22:16 2011
@@ -517,7 +517,11 @@ public abstract class DefaultAbstractTre
                        {
                                getTreeState().selectNode(node, 
!getTreeState().isNodeSelected(node));
                                onNodeLinkClicked(target, node);
-                               updateTree(target);
+
+                               if (target != null)
+                               {
+                                       updateTree(target);
+                               }
                        }
                });
        }