Author: woonsan
Date: Fri Mar 26 18:40:36 2010
New Revision: 928011

URL: http://svn.apache.org/viewvc?rev=928011&view=rev
Log:
JS2-1160: Enabling single mouse click on site menu to change the state of the 
right panel.

Modified:
    
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java

Modified: 
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?rev=928011&r1=928010&r2=928011&view=diff
==============================================================================
--- 
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
 (original)
+++ 
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
 Fri Mar 26 18:40:36 2010
@@ -312,24 +312,27 @@ public class PortalSiteManager extends A
                 {
                     super.onNodeLinkClicked(node, tree, target);
                     DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) 
node;
-                    SiteTreeNode siteNode = (SiteTreeNode) treeNode
-                            .getUserObject();
+                    SiteTreeNode siteNode = (SiteTreeNode) 
treeNode.getUserObject();
+                    
+                    populateDocument(siteNode);
+                    if (siteNode.getDocType() == SiteTreeNode.FileType.Folder 
&& !siteNode.isLoaded())
+                    {
+                        retrieveFolders(siteNode.getNodePath(), treeNode);
+                        siteNode.setLoaded(true);
+                        tree.updateTree();
+                    }
+                    
                     if (!tree.getTreeState().isNodeExpanded(treeNode))
                     {
-                        populateDocument(siteNode);
-                        if (siteNode.getDocType() == 
SiteTreeNode.FileType.Folder
-                                && !siteNode.isLoaded())
-                        {
-                            retrieveFolders(siteNode.getNodePath(), treeNode);
-                            siteNode.setLoaded(true);
-                            tree.updateTree();
-                        }
                         tree.getTreeState().expandNode(treeNode);
-                        controlTabs();
-                    } else
+                    }
+                    else
                     {
                         tree.getTreeState().collapseNode(treeNode);
                     }
+                    
+                    controlTabs();
+                    
                     target.addComponent(tabPanel);
                 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to