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 2007/08/20 10:46:25 UTC
svn commit: r567601 - in /myfaces/tobago/trunk:
example/sandbox/src/main/webapp/
sandbox/src/main/java/org/apache/myfaces/tobago/component/
sandbox/src/main/java/org/apache/myfaces/tobago/model/
sandbox/src/main/java/org/apache/myfaces/tobago/renderkit...
Author: lofwyr
Date: Mon Aug 20 01:46:24 2007
New Revision: 567601
URL: http://svn.apache.org/viewvc?rev=567601&view=rev
Log:
TOBAGO-377: Renaming treeNodeData -> treeData
Added:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java (contents, props changed)
- copied, changed from r566787, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodeData.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeDataRenderer.java (contents, props changed)
- copied, changed from r566787, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeDataRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTag.java (contents, props changed)
- copied, changed from r566787, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java (contents, props changed)
- copied, changed from r566787, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTagDeclaration.java
Removed:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodeData.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeDataRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTagDeclaration.java
Modified:
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-ajax.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-editor.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-normal.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-select.jsp
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-ajax.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-ajax.jsp?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-ajax.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-ajax.jsp Mon Aug 20 01:46:24 2007
@@ -42,7 +42,7 @@
showRoot="true"
>
<tcs:treeNode label="Root" id="root" expanded="true">
- <tcs:treeNodeData value="#{controller.tree}" var="node" id="data">
+ <tcs:treeData value="#{controller.tree}" var="node" id="data">
<tcs:treeNode label="#{node.userObject.name}"
id="template"
expanded="#{node.userObject.expanded}"
@@ -51,7 +51,7 @@
action="#{node.userObject.action}"
disabled="#{node.userObject.disabled}"
value="#{node}"/>
- </tcs:treeNodeData>
+ </tcs:treeData>
<tcs:treeNode label="2 Action 1" action="#{controller.action1}" id="action1"/>
<tcs:treeNode label="3 Action 2" action="#{controller.action2}" id="action2"/>
<tcs:treeNode label="4 Action 3" action="#{controller.action3}" id="action3">
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-editor.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-editor.jsp?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-editor.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-editor.jsp Mon Aug 20 01:46:24 2007
@@ -38,12 +38,12 @@
fixme: The helping-node "Root" is required in the moment, has to be removed!
-->
<tcs:treeNode label="Root">
- <tcs:treeNodeData value="#{controller.tree}" var="node" id="data">
+ <tcs:treeData value="#{controller.tree}" var="node" id="data">
<tcs:treeNode label="#{node.userObject.name}" id="template"
markup="#{node.userObject.markup}"
tip="#{node.userObject.tip}"
action="#{node.userObject.action}" value="#{node}"/>
- </tcs:treeNodeData>
+ </tcs:treeData>
</tcs:treeNode>
</tcs:tree>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-menu.jsp Mon Aug 20 01:46:24 2007
@@ -35,7 +35,7 @@
showRoot="true"
mode="menu">
<tcs:treeNode label="Root" id="root" expanded="true">
- <tcs:treeNodeData value="#{controller.tree}" var="node" id="data">
+ <tcs:treeData value="#{controller.tree}" var="node" id="data">
<tcs:treeNode label="#{node.userObject.name}"
id="template"
expanded="#{node.userObject.expanded}"
@@ -44,7 +44,7 @@
action="#{node.userObject.action}"
disabled="#{node.userObject.disabled}"
value="#{node}"/>
- </tcs:treeNodeData>
+ </tcs:treeData>
<tcs:treeNode label="2 Action 1" action="#{controller.action1}" id="action1"/>
<tcs:treeNode label="3 Action 2" action="#{controller.action2}" id="action2"/>
<tcs:treeNode label="4 Action 3" action="#{controller.action3}" id="action3">
@@ -59,7 +59,7 @@
</tcs:tree>
<tcs:tree state="#{controller.state}" mode="menu">
- <tcs:treeNodeData value="#{controller.tree}" var="node" id="data">
+ <tcs:treeData value="#{controller.tree}" var="node" id="data">
<tcs:treeNode label="#{node.userObject.name}"
id="template"
expanded="#{node.userObject.expanded}"
@@ -68,7 +68,7 @@
action="#{node.userObject.action}"
disabled="#{node.userObject.disabled}"
value="#{node}"/>
- </tcs:treeNodeData>
+ </tcs:treeData>
</tcs:tree>
<tcs:tree state="#{controller.state}" mode="menu">
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-normal.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-normal.jsp?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-normal.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-normal.jsp Mon Aug 20 01:46:24 2007
@@ -35,7 +35,7 @@
showRoot="true"
>
<tcs:treeNode label="Root" id="root" expanded="true">
- <tcs:treeNodeData value="#{controller.tree}" var="node" id="data">
+ <tcs:treeData value="#{controller.tree}" var="node" id="data">
<tcs:treeNode label="#{node.userObject.name}"
id="template"
expanded="#{node.userObject.expanded}"
@@ -44,7 +44,7 @@
action="#{node.userObject.action}"
disabled="#{node.userObject.disabled}"
value="#{node}"/>
- </tcs:treeNodeData>
+ </tcs:treeData>
<tcs:treeNode label="2 Action 1" action="#{controller.action1}" id="action1"/>
<tcs:treeNode label="3 Action 2" action="#{controller.action2}" id="action2"/>
<tcs:treeNode label="4 Action 3" action="#{controller.action3}" id="action3">
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-select.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-select.jsp?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-select.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree-select.jsp Mon Aug 20 01:46:24 2007
@@ -35,12 +35,12 @@
showRoot="true"
selectable="single">
<tcs:treeNode label="Root">
- <tcs:treeNodeData value="#{controller.tree}" var="node">
+ <tcs:treeData value="#{controller.tree}" var="node">
<tcs:treeNode label="#{node.userObject.name}"
markup="#{node.userObject.markup}"
tip="#{node.userObject.tip}"
/>
- </tcs:treeNodeData>
+ </tcs:treeData>
<tcs:treeNode label="Sub 1"/>
<tcs:treeNode label="Sub 2"/>
<tcs:treeNode label="Sub 3">
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java Mon Aug 20 01:46:24 2007
@@ -93,7 +93,7 @@
if (child instanceof UITreeNode) {
return child;
}
- if (child instanceof UITreeNodeData) {
+ if (child instanceof UITreeData) {
return child;
}
}
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java (from r566787, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodeData.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodeData.java&r1=566787&r2=567601&rev=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodeData.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java Mon Aug 20 01:46:24 2007
@@ -20,8 +20,8 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.model.TreeModel;
import org.apache.myfaces.tobago.model.MixedTreeModel;
+import org.apache.myfaces.tobago.model.TreeModel;
import javax.faces.component.NamingContainer;
import javax.faces.context.FacesContext;
@@ -32,12 +32,12 @@
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.IOException;
-public class UITreeNodeData extends javax.faces.component.UIInput
+public class UITreeData extends javax.faces.component.UIInput
implements NamingContainer, TreeModelBuilder {
- private static final Log LOG = LogFactory.getLog(UITreeNodeData.class);
+ private static final Log LOG = LogFactory.getLog(UITreeData.class);
- public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.TreeNodeData";
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.TreeData";
private String var;
@@ -258,7 +258,7 @@
private String pathIndex;
FacesEventWrapper(FacesEvent facesEvent, String pathIndex,
- UITreeNodeData redirectComponent) {
+ UITreeData redirectComponent) {
super(redirectComponent);
wrappedFacesEvent = facesEvent;
this.pathIndex = pathIndex;
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java Mon Aug 20 01:46:24 2007
@@ -20,8 +20,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
+import org.apache.myfaces.tobago.component.UITreeData;
import org.apache.myfaces.tobago.component.UITreeNode;
-import org.apache.myfaces.tobago.component.UITreeNodeData;
import javax.swing.tree.DefaultMutableTreeNode;
import java.util.ArrayList;
@@ -68,7 +68,7 @@
}
}
- public void beginBuildNodeData(UITreeNodeData data) {
+ public void beginBuildNodeData(UITreeData data) {
if (LOG.isDebugEnabled()) {
LOG.debug("var=" + data.getVar());
}
@@ -81,7 +81,7 @@
isInData = true;
}
- public void endBuildNodeData(UITreeNodeData data) {
+ public void endBuildNodeData(UITreeData data) {
if (LOG.isDebugEnabled()) {
LOG.debug("var=" + data.getVar());
}
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeDataRenderer.java (from r566787, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeDataRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeDataRenderer.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeDataRenderer.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeDataRenderer.java&r1=566787&r2=567601&rev=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeDataRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeDataRenderer.java Mon Aug 20 01:46:24 2007
@@ -23,7 +23,7 @@
import javax.faces.context.FacesContext;
import java.io.IOException;
-public class TreeNodeDataRenderer extends LayoutableRendererBase {
+public class TreeDataRenderer extends LayoutableRendererBase {
@Override
public void decode(FacesContext facesContext, UIComponent component) {
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeDataRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeDataRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTag.java (from r566787, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTag.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTag.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTag.java&r1=566787&r2=567601&rev=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTag.java Mon Aug 20 01:46:24 2007
@@ -20,19 +20,19 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VAR;
import org.apache.myfaces.tobago.component.ComponentUtil;
-import org.apache.myfaces.tobago.component.UITreeNodeData;
+import org.apache.myfaces.tobago.component.UITreeData;
import org.apache.myfaces.tobago.taglib.component.TobagoTag;
import javax.faces.component.UIComponent;
-public class TreeNodeDataTag extends TobagoTag implements TreeNodeDataTagDeclaration {
+public class TreeDataTag extends TobagoTag implements TreeDataTagDeclaration {
private String value;
private String var;
@Override
public String getComponentType() {
- return UITreeNodeData.COMPONENT_TYPE;
+ return UITreeData.COMPONENT_TYPE;
}
@Override
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java (from r566787, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTagDeclaration.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTagDeclaration.java&r1=566787&r2=567601&rev=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeDataTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java Mon Aug 20 01:46:24 2007
@@ -20,20 +20,20 @@
import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+import org.apache.myfaces.tobago.taglib.component.TobagoTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasTreeNodeValue;
import org.apache.myfaces.tobago.taglib.decl.HasVar;
-import org.apache.myfaces.tobago.taglib.component.TobagoTagDeclaration;
/**
* Describes a subtree of nodes.
*/
-@Tag(name = "treeNodeData")
+@Tag(name = "treeData")
@BodyContentDescription(anyTagOf = "<tcs:treeNode>")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UITreeNodeData",
- rendererType = "TreeNodeData")
-public interface TreeNodeDataTagDeclaration extends TobagoTagDeclaration,
+ uiComponent = "org.apache.myfaces.tobago.component.UITreeData",
+ rendererType = "TreeData")
+public interface TreeDataTagDeclaration extends TobagoTagDeclaration,
HasIdBindingAndRendered, HasTreeNodeValue, HasVar {
}
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java Mon Aug 20 01:46:24 2007
@@ -19,24 +19,24 @@
import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.taglib.component.AbstractCommandTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
-import org.apache.myfaces.tobago.taglib.decl.HasValue;
import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
-import org.apache.myfaces.tobago.taglib.decl.HasTip;
import org.apache.myfaces.tobago.taglib.decl.HasTarget;
+import org.apache.myfaces.tobago.taglib.decl.HasTip;
+import org.apache.myfaces.tobago.taglib.decl.HasValue;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
-import org.apache.myfaces.tobago.taglib.component.AbstractCommandTagDeclaration;
/**
* Creates a tree node.
*/
@SuppressWarnings({"ALL"})
@Tag(name = "treeNode")
-@BodyContentDescription(anyTagOf = "<tcs:treeNode>* <tcs:treeNodeData>*")
+@BodyContentDescription(anyTagOf = "<tcs:treeNode>* <tcs:treeData>*")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
rendererType = "TreeNode")
Modified: myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java?rev=567601&r1=567600&r2=567601&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java (original)
+++ myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java Mon Aug 20 01:46:24 2007
@@ -18,8 +18,8 @@
*/
import junit.framework.TestCase;
+import org.apache.myfaces.tobago.component.UITreeData;
import org.apache.myfaces.tobago.component.UITreeNode;
-import org.apache.myfaces.tobago.component.UITreeNodeData;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -68,7 +68,7 @@
tree.add(new DefaultMutableTreeNode());
tree.add(new DefaultMutableTreeNode());
- UITreeNodeData data = new UITreeNodeData();
+ UITreeData data = new UITreeData();
data.setValue(tree);
UITreeNode node = new UITreeNode();
@@ -92,7 +92,7 @@
tree.add(new DefaultMutableTreeNode());
tree.add(new DefaultMutableTreeNode());
- UITreeNodeData data = new UITreeNodeData();
+ UITreeData data = new UITreeData();
data.setValue(tree);
UITreeNode node = new UITreeNode();