You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/11/18 12:14:16 UTC
svn commit: r1203599 - in /myfaces/tobago/trunk/tobago-core/src:
main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
main/java/org/apache/myfaces/tobago/model/Node.java
test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java
Author: lofwyr
Date: Fri Nov 18 11:14:16 2011
New Revision: 1203599
URL: http://svn.apache.org/viewvc?rev=1203599&view=rev
Log:
TOBAGO-377: Improve Tree
- cleanup
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Node.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java?rev=1203599&r1=1203598&r2=1203599&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java Fri Nov 18 11:14:16 2011
@@ -19,8 +19,6 @@ package org.apache.myfaces.tobago.model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.internal.component.AbstractUITreeNode;
import java.util.ArrayList;
import java.util.List;
@@ -38,12 +36,8 @@ public class MixedTreeModel {
private Integer nextChildIndex;
private Stack<Boolean> junctions = new Stack<Boolean>();
- public void beginBuildNode(AbstractUITreeNode node) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("{}", node.getAttributes().get(Attributes.LABEL));
- }
+ public void beginBuildNode() {
Node newNode = new Node();
- newNode.setLabel((String) node.getAttributes().get(Attributes.LABEL));
if (root == null) {
root = newNode;
current = root;
@@ -53,10 +47,7 @@ public class MixedTreeModel {
}
}
- public void endBuildNode(AbstractUITreeNode node) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("{}", node.getAttributes().get(Attributes.LABEL));
- }
+ public void endBuildNode() {
current = current.getParent();
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Node.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Node.java?rev=1203599&r1=1203598&r2=1203599&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Node.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Node.java Fri Nov 18 11:14:16 2011
@@ -28,9 +28,6 @@ public class Node {
private Node parent;
- // XXX is this okay?
- private String label;
-
public void add(Node node) {
initChildren();
children.add(node);
@@ -97,12 +94,4 @@ public class Node {
public void setParent(Node parent) {
this.parent = parent;
}
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java?rev=1203599&r1=1203598&r2=1203599&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java Fri Nov 18 11:14:16 2011
@@ -31,10 +31,8 @@ public class MixedTreeModelUnitTest {
MixedTreeModel model = new MixedTreeModel();
- UITreeNode n1 = new UITreeNode();
-
- model.beginBuildNode(n1);
- model.endBuildNode(n1);
+ model.beginBuildNode();
+ model.endBuildNode();
model.onEncodeBegin();
Assert.assertEquals(new TreePath(0), model.getPath());
@@ -46,16 +44,12 @@ public class MixedTreeModelUnitTest {
MixedTreeModel model = new MixedTreeModel();
- UITreeNode n1 = new UITreeNode();
- UITreeNode n2 = new UITreeNode();
- UITreeNode n3 = new UITreeNode();
-
- model.beginBuildNode(n1);
- model.beginBuildNode(n2);
- model.endBuildNode(n2);
- model.beginBuildNode(n3);
- model.endBuildNode(n3);
- model.endBuildNode(n1);
+ model.beginBuildNode();
+ model.beginBuildNode();
+ model.endBuildNode();
+ model.beginBuildNode();
+ model.endBuildNode();
+ model.endBuildNode();
model.onEncodeBegin();
model.onEncodeBegin();
@@ -78,12 +72,12 @@ public class MixedTreeModelUnitTest {
UITreeNode node = new UITreeNode();
// model.beginBuildNodeData(data);
- model.beginBuildNode(node);
- model.beginBuildNode(node);
- model.endBuildNode(node);
- model.beginBuildNode(node);
- model.endBuildNode(node);
- model.endBuildNode(node);
+ model.beginBuildNode();
+ model.beginBuildNode();
+ model.endBuildNode();
+ model.beginBuildNode();
+ model.endBuildNode();
+ model.endBuildNode();
// model.endBuildNodeData(data);
model.onEncodeBegin();
@@ -126,20 +120,20 @@ public class MixedTreeModelUnitTest {
UITreeNode individual = new UITreeNode();
UITreeNode node = new UITreeNode();
- model.beginBuildNode(root);
- model.beginBuildNode(individual);
- model.endBuildNode(individual);
+ model.beginBuildNode();
+ model.beginBuildNode();
+ model.endBuildNode();
// model.beginBuildNodeData(data);
- model.beginBuildNode(node);
- model.beginBuildNode(node);
- model.endBuildNode(node);
- model.beginBuildNode(node);
- model.beginBuildNode(node);
- model.endBuildNode(node);
- model.endBuildNode(node);
- model.endBuildNode(node);
+ model.beginBuildNode();
+ model.beginBuildNode();
+ model.endBuildNode();
+ model.beginBuildNode();
+ model.beginBuildNode();
+ model.endBuildNode();
+ model.endBuildNode();
+ model.endBuildNode();
// model.endBuildNodeData(data);
- model.endBuildNode(root);
+ model.endBuildNode();
model.onEncodeBegin(); // root
Assert.assertEquals(new TreePath(0), model.getPath());