svn commit: r1649083 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree: MacroTreeRenderer.java ModelTree.java

[adrianc]

Author: adrianc
Date: Fri Jan  2 17:49:49 2015
New Revision: 1649083

URL: http://svn.apache.org/r1649083
Log:
Reverting rev 1646969 because it breaks tree rendering.

I need this fixed so I can begin working on tree widget refactoring. During 
refactoring I will most likely solve the problem rev 1646969 was trying to fix.

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/MacroTreeRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/MacroTreeRenderer.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/MacroTreeRenderer.java?rev=1649083&r1=1649082&r2=1649083&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/MacroTreeRenderer.java 
(original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/MacroTreeRenderer.java 
Fri Jan  2 17:49:49 2015
@@ -162,19 +162,9 @@ public class MacroTreeRenderer implement
         }
         boolean hasChildren = node.hasChildren(context);
 
-        ModelTree.ModelNode.Link expandCollapseLink;
-        if (node.link == null) {
-            expandCollapseLink = new ModelTree.ModelNode.Link();
-        } else {
-            expandCollapseLink = new ModelTree.ModelNode.Link(node.link);
-        }
-        if (expandCollapseLink.getName(context).isEmpty()) {
-            String linkName = currentNodeTrail.get(currentNodeTrail.size()-1);
-            expandCollapseLink.setName(linkName);
-            expandCollapseLink.setText(linkName);
-        }
+        ModelTree.ModelNode.Link expandCollapseLink = new 
ModelTree.ModelNode.Link();
         // check to see if this node needs to be expanded.
-        if (hasChildren) {
+        if (hasChildren && node.isExpandCollapse()) {
             String targetEntityId = null;
             List<String> targetNodeTrail = 
UtilGenerics.toList(context.get("targetNodeTrail"));
             if (depth < targetNodeTrail.size()) {

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1649083&r1=1649082&r2=1649083&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java 
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Fri 
Jan  2 17:49:49 2015
@@ -856,24 +856,6 @@ public class ModelTree extends ModelWidg
                 }
             }
 
-            public Link(ModelTree.ModelNode.Link linkElement) {
-                this.textExdr = linkElement.textExdr;
-                this.idExdr = linkElement.idExdr;
-                this.styleExdr = linkElement.styleExdr;
-                this.targetExdr = linkElement.targetExdr;
-                this.targetWindowExdr = linkElement.targetWindowExdr;
-                this.prefixExdr = linkElement.prefixExdr;
-                this.urlMode = linkElement.urlMode;
-                this.fullPath = linkElement.fullPath;
-                this.secure = linkElement.secure;
-                this.encode = linkElement.encode;
-                this.nameExdr = linkElement.nameExdr;
-                this.titleExdr = linkElement.titleExdr;
-                this.linkType = linkElement.linkType;
-                this.parameterList = new 
ArrayList<WidgetWorker.Parameter>(linkElement.parameterList.size());
-                Collections.copy(this.parameterList, 
linkElement.parameterList);
-            }
-
             public void renderLinkString(Appendable writer, Map<String, 
Object> context, TreeStringRenderer treeStringRenderer) {
                 try {
                     treeStringRenderer.renderLink(writer, context, this);