You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2005/03/16 20:32:02 UTC
cvs commit: incubator-myfaces/src/components/org/apache/myfaces/custom/tree2 HtmlTreeRenderer.java TreeNodeBase.java TreeTag.java HtmlTree.java TreeNode.java
matzew 2005/03/16 11:32:02
Modified: src/components/org/apache/myfaces/custom/tree2
HtmlTreeRenderer.java TreeNodeBase.java
TreeTag.java HtmlTree.java TreeNode.java
Log:
tree2 by Sean Schofield
Revision Changes Path
1.13 +3 -4 incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
Index: HtmlTreeRenderer.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HtmlTreeRenderer.java 10 Mar 2005 15:59:05 -0000 1.12
+++ HtmlTreeRenderer.java 16 Mar 2005 19:32:01 -0000 1.13
@@ -44,7 +44,6 @@
/**
* @author Sean Schofield
* @author Chris Barlow
- * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller </a>
* @author Hans Bergsten (Some code taken from an example in his O'Reilly JavaServer Faces book. Copied with permission)
* @version $Revision$ $Date$
*/
@@ -219,7 +218,7 @@
boolean clientSideToggle = getBoolean(tree, JSFAttr.CLIENT_SIDE_TOGGLE, true);
String nodeId = (parentId != null) ? parentId + NamingContainer.SEPARATOR_CHAR + childCount : ROOT_NODE_ID;
- String spanId = TOGGLE_SPAN + nodeId;
+ String spanId = TOGGLE_SPAN + ":" + tree.getId() + ":" + nodeId;
tree.setNodeId(nodeId);
TreeNode node = tree.getNode();
@@ -369,7 +368,7 @@
{
TreeNode node = tree.getNode();
String nodeId = tree.getNodeId();
- String spanId = TOGGLE_SPAN + nodeId;
+ String spanId = TOGGLE_SPAN + ":" + tree.getId() + ":" + nodeId;//TOGGLE_SPAN + nodeId;
boolean showLines = getBoolean(tree, JSFAttr.SHOW_LINES, true);
boolean clientSideToggle = getBoolean(tree, JSFAttr.CLIENT_SIDE_TOGGLE, true);
UIComponent nodeTypeFacet = tree.getFacet(node.getType());
1.4 +16 -0 incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/TreeNodeBase.java
Index: TreeNodeBase.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/TreeNodeBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TreeNodeBase.java 19 Feb 2005 09:03:02 -0000 1.3
+++ TreeNodeBase.java 16 Mar 2005 19:32:01 -0000 1.4
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.myfaces.custom.tree2;
import java.util.List;
1.7 +1 -2 incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/TreeTag.java
Index: TreeTag.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/TreeTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TreeTag.java 7 Mar 2005 16:17:20 -0000 1.6
+++ TreeTag.java 16 Mar 2005 19:32:01 -0000 1.7
@@ -23,7 +23,6 @@
import org.apache.myfaces.renderkit.JSFAttr;
/**
- * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller </a>
* @author Sean Schofield
* @version $Revision$ $Date$
*/
1.9 +1 -2 incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/HtmlTree.java
Index: HtmlTree.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/HtmlTree.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HtmlTree.java 15 Mar 2005 09:09:04 -0000 1.8
+++ HtmlTree.java 16 Mar 2005 19:32:01 -0000 1.9
@@ -31,7 +31,6 @@
* state of the nodes in the tree.
*
* @author Sean Schofield
- * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller </a>
* @version $Revision$ $Date$
*/
public class HtmlTree extends UITreeData
1.4 +2 -3 incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/TreeNode.java
Index: TreeNode.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree2/TreeNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TreeNode.java 19 Feb 2005 09:03:02 -0000 1.3
+++ TreeNode.java 16 Mar 2005 19:32:01 -0000 1.4
@@ -23,7 +23,6 @@
* Defines the requirements for an object that can be used as a tree node for
* use in a {@link UITreeData} component. (inspired by javax.swing.tree.TreeNode).
*
- * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller </a>
* @author Sean Schofield
* @version $Revision$ $Date$
*/
@@ -76,4 +75,4 @@
*/
public int getChildCount();
-}
\ No newline at end of file
+}