Author: nbelaevski Date: 2007-05-25 09:17:15 -0400 (Fri, 25 May 2007) New Revision: 883 Modified: trunk/richfaces/tree/src/main/java/org/richfaces/component/UITreeNode.java trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx Log: "leaf" facet renamed to "iconLeaf" Modified: trunk/richfaces/tree/src/main/java/org/richfaces/component/UITreeNode.java =================================================================== --- trunk/richfaces/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-05-25 13:17:01 UTC (rev 882) +++ trunk/richfaces/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-05-25 13:17:15 UTC (rev 883) @@ -47,7 +47,7 @@ */ protected final static String DEFAULT_NODE_FACE_ATTRIBUTE_NAME = "#defaultNodeFace"; - private final static String LEAF_FACET_NAME = "leaf"; + private final static String ICON_LEAF_FACET_NAME = "iconLeaf"; private final static String ICON_FACET_NAME = "icon"; private final static String ICON_EXPANDED_FACET_NAME = "iconExpanded"; private final static String ICON_COLLAPSED_FACET_NAME = "iconCollapsed"; @@ -289,8 +289,8 @@ return getTreeFacet(ICON_FACET_NAME); } - public UIComponent getLeafFacet() { - return getTreeFacet(LEAF_FACET_NAME); + public UIComponent getIconLeafFacet() { + return getTreeFacet(ICON_LEAF_FACET_NAME); } public UIComponent getIconExpandedFacet() { Modified: trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx =================================================================== --- trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-05-25 13:17:01 UTC (rev 882) +++ trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-05-25 13:17:15 UTC (rev 883) @@ -131,7 +131,7 @@ <jsp:scriptlet> <![CDATA[ if (component.getUITree().isLeaf()) { - UIComponent leafFacet = component.getLeafFacet(); + UIComponent leafFacet = component.getIconLeafFacet(); if (leafFacet != null && leafFacet.isRendered()) { ]]>