[richfaces-svn-commits] JBoss Rich Faces SVN: r3301 - in trunk/ui/tree/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.
Author: pyaschenko
Date: 2007-10-09 11:57:50 -0400 (Tue, 09 Oct 2007)
New Revision: 3301
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
Log:
RF-881
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-10-09
13:44:33 UTC (rev 3300)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-10-09
15:57:50 UTC (rev 3301)
@@ -117,12 +117,12 @@
UITree tree = treeNode.getUITree();
if (tree.isShowConnectingLines()) {
- if (((Boolean) (treeNode.getAttributes().get("isLastElement")))
- .booleanValue()) {
- variables.setVariable("line", "dr-tree-h-ic-line-last");
- } else {
+ //if (((Boolean) (treeNode.getAttributes().get("isLastElement")))
+ // .booleanValue()) {
+ // variables.setVariable("line", "dr-tree-h-ic-line-last");
+ //} else {
variables.setVariable("line", "dr-tree-h-ic-line-node");
- }
+ //}
if (tree.isExpanded()) {
variables
.setVariable("lineFirst", "dr-tree-h-ic-line-exp");
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-10-09
13:44:33 UTC (rev 3300)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-10-09
15:57:50 UTC (rev 3301)
@@ -256,7 +256,7 @@
nodeFacet.getAttributes().put("isLastElement", new
Boolean(isLastElement));
nodeFacet.getAttributes().put("isAjaxUpdateRoot", new Boolean(floatingKey
!= null && floatingKey.equals(rowKey)));
ResponseWriter writer = context.getResponseWriter();
- if (isLastElement) {
+ if (isLastElement && this.navigator.showLines) {
writer.startElement("p", tree);
writer.writeAttribute("class", "dr-tree-last-node-marker",
null);
writer.endElement("p");
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-10-09
13:44:33 UTC (rev 3300)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-10-09
15:57:50 UTC (rev 3301)
@@ -121,7 +121,7 @@
<f:resource
f:key="org.richfaces.renderkit.html.images.TreeLineLastImage"/>
</u:style>
</u:selector>
-<u:selector name="p.dr-tree-last-node-marker+*
.rich-tree-node-handleicon">
+<u:selector name="p.dr-tree-last-node-marker+* .dr-tree-h-ic-line-node">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.TreeLineLastImage"/>
</u:style>