Author: jkuhnert Date: Tue Mar 21 15:31:13 2006 New Revision: 387666 URL: http://svn.apache.org/viewcvs?rev=387666&view=rev Log: Applied more Brian patches. Curse ye brian! ! ;)
Modified: jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.jwc jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.jwc jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/ExternalService.java jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/template.xml jakarta/tapestry/branches/4.0/status.xml Modified: jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.jwc URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.jwc?rev=387666&r1=387665&r2=387666&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.jwc (original) +++ jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.jwc Tue Mar 21 15:31:13 2006 @@ -49,7 +49,7 @@ type="org.apache.tapestry.util.ComponentAddress" required="no" direction="custom"/> - <parameter name="tableColunms" + <parameter name="tableColumns" type="java.util.ArrayList" required="no" direction="custom"/> @@ -71,7 +71,7 @@ <binding name="treeView" expression='components.treeView'/> <inherited-binding name="nodeViewComponentAddress" parameter-name="nodeViewComponentAddress"/> <inherited-binding name="entriesPerTablePage" parameter-name="entriesPerTablePage"/> - <inherited-binding name="tableColunms" parameter-name="tableColunms"/> + <inherited-binding name="tableColumns" parameter-name="tableColumns"/> <inherited-binding name="showRootNode" parameter-name="showRootNode"/> </component> Modified: jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java?rev=387666&r1=387665&r2=387666&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java (original) +++ jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java Tue Mar 21 15:31:13 2006 @@ -216,20 +216,20 @@ arrAllNodes.toArray(arrAllExpandedNodes); SimpleTableModel objTableModel = new SimpleTableModel(arrAllExpandedNodes, - getTableColunms()); + getTableColumns()); objTableModel.getPagingState().setPageSize(getEntriesPerTablePage()); return objTableModel; } - public ITableColumn[] getTableColunms() + public ITableColumn[] getTableColumns() { ArrayList arrColumnsList = new ArrayList(); arrColumnsList.add(new TreeTableColumn("Name", false, null)); - List arrTableColunms = getTableColumnsParameter(); - if (arrTableColunms != null) - arrColumnsList.addAll(arrTableColunms); + List arrTableColumns = getTableColumnsParameter(); + if (arrTableColumns != null) + arrColumnsList.addAll(arrTableColumns); ITableColumn[] arrColumns = new ITableColumn[arrColumnsList.size()]; arrColumnsList.toArray(arrColumns); @@ -252,7 +252,7 @@ public ITableSessionStateManager getTableSessionStateManager() { SimpleListTableDataModel objDataModel = new SimpleListTableDataModel(generateNodeList()); - SimpleTableColumnModel objColumnModel = new SimpleTableColumnModel(getTableColunms()); + SimpleTableColumnModel objColumnModel = new SimpleTableColumnModel(getTableColumns()); SimpleTableSessionStateManager objStateManager = new SimpleTableSessionStateManager( objDataModel, objColumnModel); return objStateManager; Modified: jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.jwc URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.jwc?rev=387666&r1=387665&r2=387666&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.jwc (original) +++ jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.jwc Tue Mar 21 15:31:13 2006 @@ -25,7 +25,7 @@ <parameter name="nodeRenderFactory" required="no"/> <parameter name="entriesPerTablePage" required="no"/> <parameter name="showRootNode" required="no"/> - <parameter name="tableColunms" property="tableColumnsParameter" required="no"/> + <parameter name="tableColumns" property="tableColumnsParameter" required="no"/> <bean name="tableClass" class="org.apache.tapestry.bean.EvenOdd" lifecycle="request"/> <component id="table" type="Table"> <binding name="tableModel" value="tableModel"/> Modified: jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml?rev=387666&r1=387665&r2=387666&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml (original) +++ jakarta/tapestry/branches/4.0/framework/src/documentation/content/xdocs/tapestry/ComponentReference/Insert.xml Tue Mar 21 15:31:13 2006 @@ -63,7 +63,7 @@ <tr> <td>format</td> <td> - <link href="http://java.sun.com/products/jdk/1.2/docs/api/java/text/Format.html">Format</link> + <link href="http://java.sun.com/j2se/1.5.0/docs/api/java/text/Format.html">Format</link> </td> <td>in</td> <td>no</td> Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/ExternalService.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/ExternalService.java?rev=387666&r1=387665&r2=387666&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/ExternalService.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/ExternalService.java Tue Mar 21 15:31:13 2006 @@ -119,6 +119,11 @@ /** @since 4.0 */ private LinkFactory _linkFactory; + /** + * [EMAIL PROTECTED] + * + * @return The URL for the service. The URL will always be encoded when it is returned. + */ public ILink getLink(boolean post, Object parameter) { Defense.isAssignable(parameter, ExternalServiceParameter.class, "parameter"); Modified: jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/template.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/template.xml?rev=387666&r1=387665&r2=387666&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/template.xml (original) +++ jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/template.xml Tue Mar 21 15:31:13 2006 @@ -534,7 +534,7 @@ filtered, so that any reserved HTML characters in a message string are expanded to HTML entities. For example, a < will be expanded to &lt; If this is not desired, -add the attribute value <code>raw="yes"</code> to the &span;. +add the attribute value <code>raw="true"</code> to the &span;. This defeats the filtering, and text in the message is passed through as-is. </p> Modified: jakarta/tapestry/branches/4.0/status.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/status.xml?rev=387666&r1=387665&r2=387666&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/status.xml (original) +++ jakarta/tapestry/branches/4.0/status.xml Tue Mar 21 15:31:13 2006 @@ -143,6 +143,18 @@ around characters, which were causing problems for JS parsing. Changed these to use single quotes. </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-782" due-to="Brian K. Wallace"> + Fixed typo's in TreeTable.jwc, TreeTableDataView.jwc and TreeTableDataView.java (Colunms to Columns) + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-705" due-to="Brian K. Wallace" > + Insert components javadoc reference linked to old docs, now links to current. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-646" due-to="Brian K. Wallace" > + Modified text raw="yes" to raw="true" for users guide discussion of Insert component. + </action> + <action type="fix" dev="JK" fixes-bug="TAPESTRY-422" due-to="Brian K. Wallace" > + Patches to Javadoc to explicitly state that URLs returned from ExternalService will already be encoded. + </action> </release> <release version="4.0" date="Jan 6 2006"> <action type="update" dev="HLS">Add link to DeveloperWorks Tapestry article</action> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]