Author: jkuhnert
Date: Thu Mar 30 18:44:18 2006
New Revision: 390307
URL: http://svn.apache.org/viewcvs?rev=390307&view=rev
Log:
Getting release ready
Modified:
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/Tree.xml
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeDataView.xml
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeNodeView.xml
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeTable.xml
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
jakarta/tapestry/branches/4.0/status.xml
Modified:
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/Tree.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/Tree.xml?rev=390307&r1=390306&r2=390307&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/Tree.xml
(original)
+++
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/Tree.xml
Thu Mar 30 18:44:18 2006
@@ -28,7 +28,7 @@
<body>
-<p> <strong>THIS PAGE UNDER CONSTRUCTION</strong>
+<p> Renders hierarchical data as a tree.
</p>
<p>
@@ -42,20 +42,120 @@
<tr>
<th>Name</th>
<th>Type</th>
- <th>Direction</th>
+ <th>Direction</th>
<th>Required</th>
<th>Default</th>
<th>Description</th>
</tr>
+
+ <tr>
+ <td>sessionStateManager</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/model/ITreeSessionStateManager.html">ITreeSessionStateManager</link>
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Manages the state of the tree (i.e. which nodes are open, closed or
selected).
+ </td>
+ </tr>
+
+ <tr>
+ <td>sessionStoreManager</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/model/ISessionStoreManager.html">ISessionStoreManager</link>
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Allows storing the tree (or parts of it) to the session.
+ </td>
+ </tr>
+
+ <tr>
+ <td>treeModel</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/model/ITreeModel.html">ITreeModel</link>
+ </td>
+ <td>custom</td>
+ <td>yes</td>
+ <td> </td>
+ <td>
+ Defines a model that can provide the nodes of the tree.
+ </td>
+ </tr>
+
+ <tr>
+ <td>treeStateListener</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/model/ITreeStateListener.html">ITreeStateListener</link>
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ If specified, this object will receive events generated by the tree.
+ Such events are: SELECTED_NODE_CHANGED, NODE_EXPANDED and
NODE_COLLAPSED.
+ </td>
+ </tr>
+
+ <tr>
+ <td>nodeRenderFactory</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/components/INodeRenderFactory.html">INodeRenderFactory</link>
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Allows custom rendering of each node.
+ </td>
+ </tr>
+
+ <tr>
+ <td>showNodeImages</td>
+ <td>boolean</td>
+ <td>custom</td>
+ <td>no</td>
+ <td>true</td>
+ <td>
+ If node images are shown.
+ </td>
+ </tr>
+
+ <tr>
+ <td>makeNodeDirect</td>
+ <td>boolean</td>
+ <td>custom</td>
+ <td>no</td>
+ <td>true</td>
+ <td>
+ If true, renders a link around nodes that contain children. This
allows
+ expanding and collapsing the node.
+ </td>
+ </tr>
+
+ <tr>
+ <td>showRootNode</td>
+ <td>boolean</td>
+ <td>custom</td>
+ <td>no</td>
+ <td>true</td>
+ <td>
+ If root node should be visible.
+ </td>
+ </tr>
</table>
<p>
- Body: <strong>removed / allowed</strong>
+ Body: <strong>allowed</strong>
</p>
<p>
- Informal parameters: <strong>allowed / forbidden</strong>
+ Informal parameters: <strong>allowed</strong>
</p>
<p>
@@ -66,7 +166,62 @@
<section>
<title>Examples</title>
-
+ <p>
+ The following sample code shows how to create and render a simple tree.
+ </p>
+
+<source><![CDATA[
+<span jwcid="@contrib:Tree" treeModel="ognl:treeModel"/>
+
+public abstract class TreePage extends BasePage {
+ private ITreeModel model;
+
+ public ITreeModel getTreeModel() {
+ if (model == null) {
+ TreeNode root = new MyNode("root");
+ TreeNode child1 = new MyNode("child1");
+ TreeNode child2 = new MyNode("child2");
+ TreeNode child1of1 = new MyNode("child1of1");
+ TreeNode child2of1 = new MyNode("child2of1");
+ root.insert(child1);
+ root.insert(child2);
+ child1.insert(child1of1);
+ child1.insert(child2of1);
+
+ SimpleTreeDataModel dataModel = new SimpleTreeDataModel(root);
+ model = new SimpleTreeModel(dataModel);
+ }
+ return model;
+ }
+}
+
+class MyNode extends TreeNode {
+ protected String value;
+
+ MyNode(String val) {
+ super(null);
+ value = val;
+ }
+
+ public String toString() {
+ return value;
+ }
+
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ public boolean equals(Object objTarget) {
+ if(objTarget == this)
+ return true;
+ if(! (objTarget instanceof MyNode))
+ return false;
+
+ MyNode objTargetNode = (MyNode)objTarget;
+ return value.equals(objTargetNode.value);
+ }
+}
+]]></source>
</section>
</body>
</document>
Modified:
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeDataView.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeDataView.xml?rev=390307&r1=390306&r2=390307&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeDataView.xml
(original)
+++
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeDataView.xml
Thu Mar 30 18:44:18 2006
@@ -47,15 +47,52 @@
<th>Default</th>
<th>Description</th>
</tr>
+
+ <tr>
+ <td>treeView</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/components/TreeView.html">TreeView</link>
+ </td>
+ <td>in</td>
+ <td>yes</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <!-- TODO: parameter value is defined in jwc but used nowhere else
+ <tr>
+ <td>value</td>
+ <td>?</td>
+ <td>in</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+ -->
+
+ <tr>
+ <td>showRootNode</td>
+ <td>boolean</td>
+ <td>in</td>
+ <td>no</td>
+ <td>true</td>
+ <td>
+ Desc...
+ </td>
+ </tr>
</table>
<p>
- Body: <strong>removed / allowed</strong>
+ Body: <strong>allowed</strong>
</p>
<p>
- Informal parameters: <strong>allowed / forbidden</strong>
+ Informal parameters: <strong>allowed</strong>
</p>
<p>
Modified:
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeNodeView.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeNodeView.xml?rev=390307&r1=390306&r2=390307&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeNodeView.xml
(original)
+++
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeNodeView.xml
Thu Mar 30 18:44:18 2006
@@ -48,18 +48,53 @@
<th>Description</th>
</tr>
+ <tr>
+ <td>showNodeImages</td>
+ <td>boolean</td>
+ <td>in</td>
+ <td>no</td>
+ <td>true</td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>makeNodeDirect</td>
+ <td>boolean</td>
+ <td>in</td>
+ <td>no</td>
+ <td>true</td>
+ <td>
+ Desc...
+ </td>
+ </tr>
</table>
+
+ <tr>
+ <td>nodeRenderFactory</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/components/INodeRenderFactory.html">INodeRenderFactory</link>
+ </td>
+ <td>in</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+ </table>
<p>
- Body: <strong>removed / allowed</strong>
+ Body: <strong>allowed</strong>
</p>
<p>
- Informal parameters: <strong>allowed / forbidden</strong>
+ Informal parameters: <strong>allowed</strong>
</p>
<p>
- Reserved parameters: <em>none</em>
+ Reserved parameters: <em>treedataview, nodeviewdirect</em>
</p>
</section>
Modified:
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeTable.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeTable.xml?rev=390307&r1=390306&r2=390307&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeTable.xml
(original)
+++
jakarta/tapestry/branches/4.0/contrib/src/documentation/content/xdocs/tapestry-contrib/ComponentReference/TreeTable.xml
Thu Mar 30 18:44:18 2006
@@ -48,14 +48,125 @@
<th>Description</th>
</tr>
+ <tr>
+ <td>sessionStateManager</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/model/ITreeSessionStateManager.html">ITreeSessionStateManager</link>
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>sessionStoreManager</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/model/ISessionStoreManager.html">ISessionStoreManager</link>
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>treeModel</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/model/ITreeModel.html">ITreeModel</link>
+ </td>
+ <td>custom</td>
+ <td>yes</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>treeStateListener</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/model/ITreeStateListener.html">ITreeStateListener</link>
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>nodeRenderFactory</td>
+ <td>
+ <link
href="&apicontrib;/contrib/tree/components/INodeRenderFactory.html">INodeRenderFactory</link>
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>nodeViewComponentAddress</td>
+ <td>
+ org.apache.tapestry.util.ComponentAddress
+ </td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>tableColumns</td>
+ <td>java.util.ArrayList</td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>entriesPerTablePage</td>
+ <td>int</td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
+ <tr>
+ <td>showRootNode</td>
+ <td>boolean</td>
+ <td>custom</td>
+ <td>no</td>
+ <td> </td>
+ <td>
+ Desc...
+ </td>
+ </tr>
+
</table>
<p>
- Body: <strong>removed / allowed</strong>
+ Body: <strong>allowed</strong>
</p>
<p>
- Informal parameters: <strong>allowed / forbidden</strong>
+ Informal parameters: <strong>forbidden</strong>
</p>
<p>
Modified:
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java?rev=390307&r1=390306&r2=390307&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java
(original)
+++
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/common/AbstractTableColumn.java
Thu Mar 30 18:44:18 2006
@@ -222,13 +222,16 @@
*/
public void loadSettings(IComponent objSettingsContainer)
{
- IComponent objColumnRendererSource = (IComponent)
objSettingsContainer.getComponents().get(getColumnName() +
COLUMN_RENDERER_BLOCK_SUFFIX);
+ // Replace any periods in the column name with underscores so columns
can be referenced in a @Block
+ String columnName = getColumnName().replace('.', '_');
+
+ IComponent objColumnRendererSource = (IComponent)
objSettingsContainer.getComponents().get(columnName +
COLUMN_RENDERER_BLOCK_SUFFIX);
if (objColumnRendererSource == null)
objColumnRendererSource = (IComponent)
objSettingsContainer.getComponents().get(COLUMN_RENDERER_BLOCK_SUFFIX);
if (objColumnRendererSource != null && objColumnRendererSource
instanceof Block)
setColumnRendererSource(new BlockTableRendererSource((Block)
objColumnRendererSource));
- IComponent objValueRendererSource = (IComponent)
objSettingsContainer.getComponents().get(getColumnName() +
VALUE_RENDERER_BLOCK_SUFFIX);
+ IComponent objValueRendererSource = (IComponent)
objSettingsContainer.getComponents().get(columnName +
VALUE_RENDERER_BLOCK_SUFFIX);
if (objValueRendererSource == null)
objValueRendererSource = (IComponent)
objSettingsContainer.getComponents().get(VALUE_RENDERER_BLOCK_SUFFIX);
if (objValueRendererSource != null && objValueRendererSource
instanceof Block)
Modified:
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java?rev=390307&r1=390306&r2=390307&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
(original)
+++
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
Thu Mar 30 18:44:18 2006
@@ -144,7 +144,6 @@
*/
public String getDisplayName()
{
- m_strDisplayName.replace('.', '_'); //added from patch
return m_strDisplayName;
}
Modified: jakarta/tapestry/branches/4.0/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/status.xml?rev=390307&r1=390306&r2=390307&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/status.xml (original)
+++ jakarta/tapestry/branches/4.0/status.xml Thu Mar 30 18:44:18 2006
@@ -931,6 +931,15 @@
</release>
</changes>
<votes>
+ <vote title="4.0.1 Release" date="Mar 27 2006" dev="JK">
+ <motion>
+ Going with the notion that releasing early/often is a good thing,
+ and we can pretty much release things as often as we want I'd say
+ we're doing more harm than good by not releasing all of the excellent
+ work that Brian's been putting into these two releases.
+ </motion>
+ <response>JK: HK, KT, PF, DS, BW: +1</response>
+ </vote>
<vote title="4.0 Final Release" date="Dec 30 2005" dev="HLS">
<motion>
I think 4.0 is ready for a wider release and a new release
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
