myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r413772 - in /myfaces/tomahawk/trunk: assembly/src/main/resources/ core/src/main/java/org/apache/myfaces/custom/tree2/ examples/simple/src/main/webapp/
Date Tue, 13 Jun 2006 00:08:25 GMT
Author: schof
Date: Mon Jun 12 17:08:25 2006
New Revision: 413772

URL: http://svn.apache.org/viewvc?rev=413772&view=rev
Log:
results of merge with tomahawk 1_1_3 branch (r409498 - r413709)

Added:
    myfaces/tomahawk/trunk/assembly/src/main/resources/RELEASE NOTES.txt
      - copied, changed from r413709, myfaces/tomahawk/branches/1_1_3/assembly/src/main/resources/RELEASE
NOTES.txt
Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java
    myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable.jsp
    myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable2.jsp
    myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortTable.jsp

Copied: myfaces/tomahawk/trunk/assembly/src/main/resources/RELEASE NOTES.txt (from r413709,
myfaces/tomahawk/branches/1_1_3/assembly/src/main/resources/RELEASE NOTES.txt)
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/src/main/resources/RELEASE%20NOTES.txt?p2=myfaces/tomahawk/trunk/assembly/src/main/resources/RELEASE%20NOTES.txt&p1=myfaces/tomahawk/branches/1_1_3/assembly/src/main/resources/RELEASE%20NOTES.txt&r1=413709&r2=413772&rev=413772&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_3/assembly/src/main/resources/RELEASE NOTES.txt (original)
+++ myfaces/tomahawk/trunk/assembly/src/main/resources/RELEASE NOTES.txt Mon Jun 12 17:08:25
2006
@@ -1,36 +1 @@
-Release Notes - MyFaces Tomahawk - Version 1.1.3
-
-** Bug
-    * [TOMAHAWK-5] - newspaperTable should be merged with dataTable.
-    * [TOMAHAWK-27] - Add a collapseAll() Method to the tree2 component
-    * [TOMAHAWK-47] - Tree2 is not compatible with facelets
-    * [TOMAHAWK-61] - InputHtml content disappear on IE and cover buttons below on Mozilla
-    * [TOMAHAWK-65] - inputHtml does not work properly in IE6.0
-    * [TOMAHAWK-134] - t:saveState only works with client-side state saving
-    * [TOMAHAWK-162] - Tree2: TreeWalker interface should be public
-    * [TOMAHAWK-178] - Change NewspaperTable to be able to use extended column properly
-    * [TOMAHAWK-190] - HtmlCommandLinkTag' has no setter method actionForPhase
-    * [TOMAHAWK-208] - inputSuggestAjax does not set content type of the response
-    * [TOMAHAWK-245] - 500 code in simple examples for tree
-    * [TOMAHAWK-246] - 500 code in simple examples for panelStack
-    * [TOMAHAWK-253] - Dummy form code must call StateManager.saveSerializedView() for server-side
state saving
-    * [TOMAHAWK-262] - Sandbox inputSuggestAjax doesn't work with client state saving
-    * [TOMAHAWK-401] - Schedule compact renderer row height bug
-    * [TOMAHAWK-414] - <t:messages> NPEs if the 'for' attribute on <h:outputLabel>
is missing
-    * [TOMAHAWK-431] - DocumentHead and DocumentBody define wrong default renderer types
-    * [TOMAHAWK-433] - '...HtmlColumnsTag' has no setter method corresponding to TLD declared
attribute 'groupBy'
-    * [TOMAHAWK-436] - tree2 expandAll method results in NPE
-
-** Improvement
-    * [TOMAHAWK-385] - Improvement to SortableModel to allow resolving of nested sort properties
-    * [TOMAHAWK-389] - XDoc patch for SubForm component from sandbox
-    * [TOMAHAWK-395] - Improvement to extended data table auto sort feature
-    * [TOMAHAWK-440] - Add orientation parameter to NewspaperTable
-
-** New Feature
-    * [TOMAHAWK-235] - A new attribute, activeOnViewIds, for UINavigationMenuItem and HtmlCommandNavigationItem
-    * [TOMAHAWK-265] - Automatic sort feature for extended data table
-    * [TOMAHAWK-386] - New attribute for extended dataTable, "sortedColumnVar"
-    * [TOMAHAWK-408] - Child combo box that will be reloaded via ajax call when the parent
combo box's value is changed
-
-
+Release Notes - MyFaces Tomahawk - Version 1.1.4
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java?rev=413772&r1=413771&r2=413772&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
(original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
Mon Jun 12 17:08:25 2006
@@ -217,9 +217,12 @@
             }
 
             // now encode each of the nodes in the level immediately below the root
-            if (walker.next())
+            for (int i=0; i < rootNode.getChildCount(); i++)
             {
-                encodeTree(context, out, tree, walker);
+                if (walker.next())
+                {
+                	encodeTree(context, out, tree, walker);
+                }
             }
         }
 
@@ -270,9 +273,14 @@
             }
         }
 
-        if (walker.next())
+        TreeNode node = tree.getNode();
+
+        for (int i=0; i < node.getChildCount(); i++)
         {
-            encodeTree(context, out, tree, walker);
+            if (walker.next())
+            {
+            	encodeTree(context, out, tree, walker);
+            }
         }
 
         if (clientSideToggle)

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java?rev=413772&r1=413771&r2=413772&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java
(original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java
Mon Jun 12 17:08:25 2006
@@ -154,27 +154,27 @@
 
         if (_showNav != null)
         {
-            ((HtmlTree)component).setShowNav(Boolean.getBoolean(_showNav));
+        	setBooleanProperty(component, "showNav", _showNav);
         }
 
         if (_showLines != null)
         {
-            ((HtmlTree)component).setShowLines(Boolean.getBoolean(_showLines));
+        	setBooleanProperty(component, "showLines", _showLines);
         }
 
         if (_clientSideToggle != null)
         {
-            ((HtmlTree)component).setClientSideToggle(Boolean.getBoolean(_clientSideToggle));
+        	setBooleanProperty(component, "clientSideToggle", _clientSideToggle);
         }
 
         if (_showRootNode != null)
         {
-            ((HtmlTree)component).setShowRootNode(Boolean.getBoolean(_showRootNode));
+        	setBooleanProperty(component, "showRootNode", _showRootNode);
         }
 
         if (_preserveToggle != null)
         {
-            ((HtmlTree)component).setPreserveToggle(Boolean.getBoolean(_preserveToggle));
+        	setBooleanProperty(component, "preserveToggle", _preserveToggle);
         }
 
         if (_javascriptLocation != null)

Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable.jsp?rev=413772&r1=413771&r2=413772&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable.jsp Mon Jun 12 17:08:25
2006
@@ -30,41 +30,43 @@
 
     <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
 
-    <t:dataTable id="data"
-            styleClass="standardTable"            
-            headerClass="standardTable_SortHeader"
-            footerClass="standardTable_Footer"
-            rowClasses="standardTable_Row1,standardTable_Row2"
-            var="car"                      
-            sortable="true"                       
-            value="#{autosortlist.cars}"                 
-            sortColumn="#{autosortlist.sortColumn}" 
-            sortAscending="#{autosortlist.sortAscending}"
-            preserveDataModel="true"
-            preserveSort="true">
-        
-        <t:column defaultSorted="true">
-            <f:facet name="header">  
-                <h:outputText value="ID" />                
-            </f:facet>
-            <h:outputText value="#{car.id}" />            
-        </t:column>
-        
-        <t:column>
-            <f:facet name="header">  
-                <h:outputText value="#{example_messages['sort_cartype']}" />      
         
-            </f:facet>
-            <h:outputText value="#{car.type}" />            
-        </t:column>
+    <h:form>    
+        <t:dataTable id="data"
+                styleClass="standardTable"            
+                headerClass="standardTable_SortHeader"
+                footerClass="standardTable_Footer"
+                rowClasses="standardTable_Row1,standardTable_Row2"
+                var="car"                      
+                sortable="true"                       
+                value="#{autosortlist.cars}"                 
+                sortColumn="#{autosortlist.sortColumn}" 
+                sortAscending="#{autosortlist.sortAscending}"
+                preserveDataModel="true"
+                preserveSort="true">
 
-        <t:column>
-            <f:facet name="header">
-                <h:outputText value="#{example_messages['sort_carcolor']}" />     
          
-            </f:facet>
-            <h:outputText value="#{car.color}" />            
-        </t:column>
+            <t:column defaultSorted="true">
+                <f:facet name="header">  
+                    <h:outputText value="ID" />                
+                </f:facet>
+                <h:outputText value="#{car.id}" />            
+            </t:column>
 
-    </t:dataTable>           
+            <t:column>
+                <f:facet name="header">  
+                    <h:outputText value="#{example_messages['sort_cartype']}" />  
             
+                </f:facet>
+                <h:outputText value="#{car.type}" />            
+            </t:column>
+
+            <t:column>
+                <f:facet name="header">
+                    <h:outputText value="#{example_messages['sort_carcolor']}" /> 
              
+                </f:facet>
+                <h:outputText value="#{car.color}" />            
+            </t:column>
+
+        </t:dataTable>           
+    </h:form>     
     
 </f:view>
 

Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable2.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable2.jsp?rev=413772&r1=413771&r2=413772&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable2.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortAutoTable2.jsp Mon Jun 12 17:08:25
2006
@@ -30,40 +30,42 @@
 
     <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
     
-    <t:dataTable id="data"
-            styleClass="standardTable"            
-            headerClass="standardTable_SortHeader"
-            footerClass="standardTable_Footer"
-            rowClasses="standardTable_Row1,standardTable_Row2"
-            var="car"                                                        
-            value="#{autosortlist.cars}"                 
-            sortColumn="#{autosortlist.sortColumn}" 
-            sortAscending="#{autosortlist.sortAscending}"
-            preserveDataModel="true"
-            preserveSort="true">
-        
-        <t:column sortable="true" defaultSorted="true">
-            <f:facet name="header">  
-                <h:outputText value="ID" />                
-            </f:facet>
-            <h:outputText value="#{car.id}" />            
-        </t:column>
-        
-        <t:column>
-            <f:facet name="header">  
-                <h:outputText value="#{example_messages['sort_cartype']}" />      
                         
-            </f:facet>
-            <h:outputText value="#{car.type}" />            
-        </t:column>
+    <h:form>
+        <t:dataTable id="data"
+                styleClass="standardTable"            
+                headerClass="standardTable_SortHeader"
+                footerClass="standardTable_Footer"
+                rowClasses="standardTable_Row1,standardTable_Row2"
+                var="car"                                                        
+                value="#{autosortlist.cars}"                 
+                sortColumn="#{autosortlist.sortColumn}" 
+                sortAscending="#{autosortlist.sortAscending}"
+                preserveDataModel="true"
+                preserveSort="true">
 
-        <t:column sortable="true">
-            <f:facet name="header">
-                <h:outputText value="#{example_messages['sort_carcolor']}" />     
          
-            </f:facet>
-            <h:outputText value="#{car.color}" />            
-        </t:column>
-        
-    </t:dataTable>      
+            <t:column sortable="true" defaultSorted="true">
+                <f:facet name="header">  
+                    <h:outputText value="ID" />                
+                </f:facet>
+                <h:outputText value="#{car.id}" />            
+            </t:column>
+
+            <t:column>
+                <f:facet name="header">  
+                    <h:outputText value="#{example_messages['sort_cartype']}" />  
                             
+                </f:facet>
+                <h:outputText value="#{car.type}" />            
+            </t:column>
+
+            <t:column sortable="true">
+                <f:facet name="header">
+                    <h:outputText value="#{example_messages['sort_carcolor']}" /> 
              
+                </f:facet>
+                <h:outputText value="#{car.color}" />            
+            </t:column>
+
+        </t:dataTable>      
+    </h:form>    
 </f:view>
 
 <%@include file="inc/page_footer.jsp" %>

Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortTable.jsp?rev=413772&r1=413771&r2=413772&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/sortTable.jsp Mon Jun 12 17:08:25
2006
@@ -30,50 +30,51 @@
 
     <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
 
-    <t:dataTable styleClass="standardTable"
-            headerClass="standardTable_SortHeader"
-            footerClass="standardTable_Footer"
-            rowClasses="standardTable_Row1,standardTable_Row2"
-            var="car"
-            value="#{list.cars}"
-            sortColumn="#{list.sort}"
-            sortAscending="#{list.ascending}"
-            preserveDataModel="true"
-            preserveSort="true">
+    <h:form>
+        <t:dataTable styleClass="standardTable"
+                headerClass="standardTable_SortHeader"
+                footerClass="standardTable_Footer"
+                rowClasses="standardTable_Row1,standardTable_Row2"
+                var="car"
+                value="#{list.cars}"
+                sortColumn="#{list.sort}"
+                sortAscending="#{list.ascending}"
+                preserveDataModel="true"
+                preserveSort="true">
 
-        <f:facet name="header">
-            <h:outputText value="(header table)"  />
-        </f:facet>
-        <f:facet name="footer">
-            <h:outputText value="(footer table)"  />
-        </f:facet>
-
-        <h:column>
             <f:facet name="header">
-                <t:commandSortHeader columnName="type" arrow="true">
-                    <h:outputText value="#{example_messages['sort_cartype']}" />
-                </t:commandSortHeader>
+                <h:outputText value="(header table)"  />
             </f:facet>
-            <h:outputText value="#{car.type}" />
             <f:facet name="footer">
-                <h:outputText id="ftr1" value="(footer col1)"  />
+                <h:outputText value="(footer table)"  />
             </f:facet>
-        </h:column>
 
-        <h:column>
-            <f:facet name="header">
-                <t:commandSortHeader columnName="color" arrow="true">
-                    <h:outputText value="#{example_messages['sort_carcolor']}" />
-                </t:commandSortHeader>
-            </f:facet>
-            <h:outputText value="#{car.color}" />
-            <f:facet name="footer">
-                <h:outputText id="ftr2" value="(footer col2)"  />
-            </f:facet>
-        </h:column>
+            <h:column>
+                <f:facet name="header">
+                    <t:commandSortHeader columnName="type" arrow="true">
+                        <h:outputText value="#{example_messages['sort_cartype']}" />
+                    </t:commandSortHeader>
+                </f:facet>
+                <h:outputText value="#{car.type}" />
+                <f:facet name="footer">
+                    <h:outputText id="ftr1" value="(footer col1)"  />
+                </f:facet>
+            </h:column>
 
-    </t:dataTable>
+            <h:column>
+                <f:facet name="header">
+                    <t:commandSortHeader columnName="color" arrow="true">
+                        <h:outputText value="#{example_messages['sort_carcolor']}" />
+                    </t:commandSortHeader>
+                </f:facet>
+                <h:outputText value="#{car.color}" />
+                <f:facet name="footer">
+                    <h:outputText id="ftr2" value="(footer col2)"  />
+                </f:facet>
+            </h:column>
 
+        </t:dataTable>
+    </h:form>
 </f:view>
 
 <%@include file="inc/page_footer.jsp" %>



Mime
View raw message