You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/02/21 09:40:44 UTC
svn commit: r629718 - in /myfaces/trinidad/trunk_1.2.x: src/site/xdoc/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
Author: matzew
Date: Thu Feb 21 00:40:38 2008
New Revision: 629718
URL: http://svn.apache.org/viewvc?rev=629718&view=rev
Log:
TRINIDAD-945
Thanks to Cristi Toth for his patch
Modified:
myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
Modified: myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml?rev=629718&r1=629717&r2=629718&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml Thu Feb 21 00:40:38 2008
@@ -4266,6 +4266,12 @@
<td>This icon is displayed before the collapsed tree node.</td>
</tr>
<tr>
+ <td>af|tree::no-children-icon</td>
+ <td>This icon is displayed instead of the expanded/collapsed icon,
+ when the node has no children
+ </td>
+ </tr>
+ <tr>
<td>af|tree::line-icon</td>
<td>This icon is used as a vertical line between the nodes.
</td>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?rev=629718&r1=629717&r2=629718&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Thu Feb 21 00:40:38 2008
@@ -1506,6 +1506,8 @@
"af|tree::expanded-icon";
public static final String AF_TREE_COLLAPSED_ICON =
"af|tree::collapsed-icon";
+ public static final String AF_TREE_NO_CHILDREN_ICON =
+ "af|tree::no-children-icon";
public static final String AF_TREE_NODE_ICON =
"af|tree::node-icon";
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java?rev=629718&r1=629717&r2=629718&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java Thu Feb 21 00:40:38 2008
@@ -267,7 +267,7 @@
* @param context the FacesContext
* @param rc the RenderingContext
* @param isLine if there is need for a vertical line
- * @param leftToRight reft to right
+ * @param leftToRight left to right
* @return the URI of the icon
*/
protected String getConnectingBackgroundIcon(
@@ -287,6 +287,15 @@
return (icon == null) ? null : icon.getImageURI(context, rc).toString();
}
+ /**
+ * Returns the URI of the expanded-icon's background icon
+ * Usually the lines connecting a node
+ * @param context the FacesContext
+ * @param rc the RenderingContext
+ * @param isLastSibling true if the node is the last child of its parent node
+ * @param isLeftToRight left to right
+ * @return the URI of the icon
+ */
protected String getIconBackgroundIcon(
FacesContext context,
RenderingContext rc,
@@ -335,9 +344,13 @@
switch (expanded)
{
case NO_CHILDREN:
- iconURI = TRANSPARENT_GIF;
- iconHeight = _ICON_HEIGHT;
- isAbsoluteImageURI = false;
+ icon = rc.getIcon(SkinSelectors.AF_TREE_NO_CHILDREN_ICON);
+ if (icon == null || icon.getImageURI(context, rc) == null)
+ {
+ iconURI = TRANSPARENT_GIF;
+ iconHeight = _ICON_HEIGHT;
+ isAbsoluteImageURI = false;
+ }
break;
case EXPAND_CLOSED:
// "\u21D2"; // Double Arrow right