You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2006/12/01 00:13:21 UTC

svn commit: r481104 - in /myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago: component/UITreeNode.java renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java

Author: lofwyr
Date: Thu Nov 30 15:13:20 2006
New Revision: 481104

URL: http://svn.apache.org/viewvc?view=rev&rev=481104
Log:
working on TOBAGO-18
action of treeNode inside of treeNodes is working now

Modified:
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java?view=diff&rev=481104&r1=481103&r2=481104
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java Thu Nov 30 15:13:20 2006
@@ -22,8 +22,6 @@
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
-
-
 public class UITreeNode extends UICommand {
 
   private static final Log LOG = LogFactory.getLog(UITreeNode.class);

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?view=diff&rev=481104&r1=481103&r2=481104
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Thu Nov 30 15:13:20 2006
@@ -165,7 +165,6 @@
     UITreeNode treeNode = (UITreeNode) component;
 
     UIComponent parent = treeNode.getParent();
-    String pos = null;
 
     boolean isFolder = treeNode.getChildCount() > 0;
 
@@ -173,13 +172,13 @@
     if (parent != null && parent instanceof UITreeNode) { // if not the root node
       parentClientId = treeNode.getParent().getClientId(facesContext);
     } else if (parent != null && parent instanceof UITreeNodes) {
-      pos = ((UITreeNodes) parent).getCurrentNodeId();
-      if ("_0".equals(pos)) {
+      String pci = parent.getClientId(facesContext);
+      if (pci.endsWith(":_0")) {
         UIComponent superParent = parent.getParent();
         parentClientId = superParent.getClientId(facesContext);
       } else {
-        parentClientId = treeNode.getClientId(facesContext);
-        parentClientId += ((UITreeNodes) parent).getCurrentParentNodeId();
+        parentClientId = pci.substring(0, pci.length() - 2) // fixme 2 is not correct for bitter trees
+             + NamingContainer.SEPARATOR_CHAR + treeNode.getId();
       }
       DefaultMutableTreeNode currentNode =
           ((UITreeNodes) parent).getCurrentNode();