svn commit: r704926 - /myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java

[lo...@apache.org]

Author: lofwyr
Date: Wed Oct 15 07:24:04 2008
New Revision: 704926

URL: http://svn.apache.org/viewvc?rev=704926&view=rev
Log:
TOBAGO-377: Fix: TreeNodes sometimes get a wrong icon for the path.

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

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=704926&r1=704925&r2=704926&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Wed Oct 15 07:24:04 2008
@@ -115,7 +115,7 @@
 
     DefaultMutableTreeNode modelNode = (DefaultMutableTreeNode) node.getValue();
 
-    boolean isFolder = mixedModel.isFolder();
+    boolean folder = mixedModel.isFolder();
 
     boolean marked = node.isMarked();
     String id = node.getClientId(facesContext);
@@ -143,7 +143,7 @@
 
       // div id
       writer.writeIdAttribute(id);
-      if (!isFolder) {
+      if (!folder) {
         HtmlRendererUtil.renderDojoDndItem(node, writer, true);
       }
 
@@ -173,20 +173,20 @@
       }
       writer.writeStyleAttribute(widthString);
 
-      if (isFolder) {
+      if (folder) {
         encodeExpandedHidden(writer, node, id, expanded);
       }
 
-      if (isFolder && menuMode) {
+      if (folder && menuMode) {
         encodeMenuIcon(facesContext, writer, treeId, id, expanded, node);
       }
 
       encodeIndent(facesContext, writer, menuMode, junctions);
 
       encodeTreeJunction(facesContext, writer, id, treeId, showJunctions, showRootJunction, showRoot, expanded,
-          isFolder, depth, hasNextSibling, image);
+          folder, depth, hasNextSibling, image);
 
-      encodeTreeIcons(facesContext, writer, id, treeId, showIcons, expanded, isFolder, image);
+      encodeTreeIcons(facesContext, writer, id, treeId, showIcons, expanded, folder, image);
 
       encodeLabel(writer, helper, node, marked, treeId);
 
@@ -198,7 +198,7 @@
       writer.endElement(DIV);
     }
 
-    if (isFolder) {
+    if (folder) {
       String contentStyle = "display: " + (expanded ? "block" : "none") + ";";
       writer.startElement(DIV, null);
       writer.writeIdAttribute(id + "-cont");
@@ -269,7 +269,7 @@
   private void encodeTreeJunction(
       FacesContext facesContext, TobagoResponseWriter writer, String id, String treeId,
       boolean showJunctions, boolean showRootJunction, boolean showRoot,
-      boolean expanded, boolean isFolder, int depth, boolean hasNextSibling, String image) throws IOException {
+      boolean expanded, boolean folder, int depth, boolean hasNextSibling, String image) throws IOException {
     if (!(!showJunctions
         || !showRootJunction && depth == 0
         || !showRootJunction && !showRoot && depth == 1)) {
@@ -277,20 +277,20 @@
       writer.writeClassAttribute("tree-junction");
       writer.writeIdAttribute(id + "-junction");
 
-      String gif = expanded
+      String gif = folder && expanded
           ? (depth == 0
           ? "Rminus.gif"
           : (hasNextSibling ? "Tminus.gif" : "Lminus.gif"))
           : ((depth == 0)
           ? "Rplus.gif"
           : (hasNextSibling)
-          ? (isFolder ? "Tplus.gif" : "T.gif")
-          : (isFolder ? "Lplus.gif" : "L.gif")
+          ? (folder ? "Tplus.gif" : "T.gif")
+          : (folder ? "Lplus.gif" : "L.gif")
       );
 
       String src = ResourceManagerUtil.getImageWithPath(facesContext, "image/" + gif);
       writer.writeAttribute("src", src, true); // xxx is escaping required
-      if (isFolder) {
+      if (folder) {
         // xxx is escaping required
         writer.writeAttribute("onclick", createOnclickForToggle(facesContext, treeId, image), true);
       }
@@ -395,7 +395,7 @@
     UITreeNode node = (UITreeNode) component;
     UITree root = (UITree) node.findTree();
     MixedTreeModel mixedModel = root.getModel();
-    boolean isFolder = mixedModel.isFolder();
+    boolean folder = mixedModel.isFolder();
 
     mixedModel.onEncodeEnd();
 
@@ -403,7 +403,7 @@
 
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 
-    if (isFolder) {
+    if (folder) {
       writer.endElement(DIV);
       writer.writeComment("\nend of " + id + "-cont ");
     }