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 2011/11/22 14:22:02 UTC
svn commit: r1204979 - in /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component: TreeMenuTagDeclaration.java TreeNodeTagDeclaration.java TreeTagDeclaration.java

Author: lofwyr
Date: Tue Nov 22 13:22:00 2011
New Revision: 1204979

URL: http://svn.apache.org/viewvc?rev=1204979&view=rev
Log:
TOBAGO-377: Improved Tree
 - fix tag description: building tree model with tags is not supported in the moment

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java?rev=1204979&r1=1204978&r2=1204979&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java Tue Nov 22 13:22:00 2011
@@ -34,7 +34,7 @@ import org.apache.myfaces.tobago.interna
  * This menu is often used for navigation on the left side of an application.
  */
 @Tag(name = "treeMenu")
-@BodyContentDescription(anyTagOf = "<tc:treeNode>|<tc:treeData>")
+@BodyContentDescription(anyTagOf = "<tc:treeData>")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UITreeMenu",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUITree",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java?rev=1204979&r1=1204978&r2=1204979&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java Tue Nov 22 13:22:00 2011
@@ -36,7 +36,7 @@ import org.apache.myfaces.tobago.interna
  */
 @SuppressWarnings("ALL")
 @Tag(name = "treeNode")
-@BodyContentDescription(anyTagOf = "<tc:treeNode>* <tc:treeData>*")
+@BodyContentDescription(anyTagOf = "<tc:treeIndent>|<tc:treeIcon>|<tc:treeSelect>|<tc:treeLabel>|<tc:treeCommand>")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUITreeNode",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java?rev=1204979&r1=1204978&r2=1204979&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java Tue Nov 22 13:22:00 2011
@@ -35,7 +35,7 @@ import org.apache.myfaces.tobago.interna
  * Usually used with icons and junction lines to open folder, etc.
  */
 @Tag(name = "tree")
-@BodyContentDescription(anyTagOf = "<tc:treeNode>|<tc:treeData>")
+@BodyContentDescription(anyTagOf = "<tc:treeData>")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UITree",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUITree",