Author: mvitenkov Date: 2008-07-10 04:17:30 -0400 (Thu, 10 Jul 2008) New Revision: 9500 Modified: trunk/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java trunk/test-applications/facelets/src/main/java/dataTable/DataTable.java trunk/test-applications/facelets/src/main/java/dfs/DemoInventoryList.java trunk/test-applications/facelets/src/main/java/dnd/DndBean.java trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml Log: new test Modified: trunk/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/java/dataOrderedList/DataOrderedList.java 2008-07-10 08:17:30 UTC (rev 9500) @@ -4,6 +4,8 @@ import org.richfaces.component.html.HtmlDataOrderedList; import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; + +import util.componentInfo.ComponentInfo; import util.data.Data; public class DataOrderedList @@ -27,7 +29,11 @@ public void setMyOrderedList(HtmlDataOrderedList myOrderedList) { this.myOrderedList = myOrderedList; } - + public String add(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(myOrderedList); + return null; + } public String getBindLabel() { return bindLabel; } Modified: trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/java/dataScroller/DataScroller.java 2008-07-10 08:17:30 UTC (rev 9500) @@ -4,9 +4,12 @@ import javax.faces.event.ActionEvent; +import org.richfaces.component.html.HtmlDatascroller; import org.richfaces.event.DataScrollerEvent; import org.richfaces.model.Ordering; +import util.componentInfo.ComponentInfo; + public class DataScroller { private ArrayList dataTable; @@ -25,8 +28,21 @@ private Ordering sortOrder; private String filterValue; private String currentSortOrder; + private HtmlDatascroller htmlDataScroller = null; - public String getSortMode() { + public HtmlDatascroller getHtmlDataScroller() { + return htmlDataScroller; + } + + public void setHtmlDataScroller(HtmlDatascroller htmlDataScroller) { + this.htmlDataScroller = htmlDataScroller; + } + public String add(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlDataScroller); + return null; + } + public String getSortMode() { return sortMode; } Modified: trunk/test-applications/facelets/src/main/java/dataTable/DataTable.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dataTable/DataTable.java 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/java/dataTable/DataTable.java 2008-07-10 08:17:30 UTC (rev 9500) @@ -5,6 +5,10 @@ import java.util.List; import java.util.Properties; +import org.richfaces.component.html.HtmlDataTable; + +import util.componentInfo.ComponentInfo; + public class DataTable { private static final String [] mNames={"Jan","Feb","Mar","Apr","May", "Jun", "Jul"}; @@ -22,7 +26,22 @@ private String rows; private boolean r2rendered; private boolean rendered; + private HtmlDataTable htmlDataTable = null; + public HtmlDataTable getHtmlDataTable() { + return htmlDataTable; + } + + public void setHtmlDataTable(HtmlDataTable htmlDataTable) { + this.htmlDataTable = htmlDataTable; + } + + public String add(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlDataTable); + return null; + } + public DataTable() { columns = "2"; cellpadding = "0"; Modified: trunk/test-applications/facelets/src/main/java/dfs/DemoInventoryList.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dfs/DemoInventoryList.java 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/java/dfs/DemoInventoryList.java 2008-07-10 08:17:30 UTC (rev 9500) @@ -23,6 +23,8 @@ import org.richfaces.component.UIDataFltrSlider; +import util.componentInfo.ComponentInfo; + import javax.faces.component.UIData; import javax.faces.event.ActionEvent; import java.util.ArrayList; @@ -248,7 +250,11 @@ public void setDataFilterSlider(UIDataFltrSlider dataFilterSlider) { this.dataFilterSlider = dataFilterSlider; } - + public String add(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(dataFilterSlider); + return null; + } public void filterCarList(ActionEvent event) { UIDataFltrSlider slider = getDataFilterSlider(); Modified: trunk/test-applications/facelets/src/main/java/dnd/DndBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dnd/DndBean.java 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/java/dnd/DndBean.java 2008-07-10 08:17:30 UTC (rev 9500) @@ -6,11 +6,15 @@ import javax.faces.event.ActionEvent; +import org.richfaces.component.html.HtmlDragSupport; +import org.richfaces.component.html.HtmlDropSupport; import org.richfaces.event.DragEvent; import org.richfaces.event.DropEvent; +import util.componentInfo.ComponentInfo; + public class DndBean { private List types = new ArrayList(); @@ -20,6 +24,8 @@ private String actionListenerDrop; private String actionDrag; private String actionListenerDrag; + private HtmlDragSupport htmlDrag = null; + private HtmlDropSupport htmlDrop = null; public DndBean() { super(); @@ -112,4 +118,32 @@ public void setActionListenerDrag(String actionListenerDrag) { this.actionListenerDrag = actionListenerDrag; } + + public HtmlDragSupport getHtmlDrag() { + return htmlDrag; + } + + public void setHtmlDrag(HtmlDragSupport htmlDrag) { + this.htmlDrag = htmlDrag; + } + + public HtmlDropSupport getHtmlDrop() { + return htmlDrop; + } + + public void setHtmlDrop(HtmlDropSupport htmlDrop) { + this.htmlDrop = htmlDrop; + } + + public String add1(){ + ComponentInfo info1 = ComponentInfo.getInstance(); + info1.addField(htmlDrag); + return null; + } + + public String add2(){ + ComponentInfo info1 = ComponentInfo.getInstance(); + info1.addField(htmlDrop); + return null; + } } \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSlider.xhtml 2008-07-10 08:17:30 UTC (rev 9500) @@ -75,6 +75,7 @@ <h:commandButton value="reRender" /> <h:panelGrid columns="2"> + <a4j:commandButton style="" value="" rendered=""/> <a4j:commandButton value="action" rendered="actionDFSID" style=" width : 95px;"></a4j:commandButton> /> <h:outputText id="actionDFSID" value="#{dfs.action}" /> Modified: trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.xhtml 2008-07-10 08:17:30 UTC (rev 9500) @@ -5,6 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataFilterSliderPropertySubviewID"> + <h:commandButton action="#{inventoryList.add}" value="add test" /> <h:panelGrid columns="2"> <h:outputText value="Rendered:" /> <h:selectBooleanCheckbox value="#{dfs.rendered}"> Modified: trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/webapp/DataOrderedList/DataOrderedListProperty.xhtml 2008-07-10 08:17:30 UTC (rev 9500) @@ -5,6 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataOrderedListPropertySubviewID"> + <h:commandButton action="#{dataOrderedList.add}" value="add test" /> <h:panelGrid columns="2"> <h:outputText value="title" /> <h:inputText value="#{dataOrderedList.title}"> Modified: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScroller.xhtml 2008-07-10 08:17:30 UTC (rev 9500) @@ -17,7 +17,8 @@ onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" - onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" id="dsID"> + onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" id="dsID" + binding="#{dataScroller.htmlDataScroller}"> </rich:datascroller> </f:facet> <rich:column sortBy="#{dT.data0}" filterBy="#{dT.data0}" filterEvent="onchange" Modified: trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/webapp/DataScroller/DataScrollerProperty.xhtml 2008-07-10 08:17:30 UTC (rev 9500) @@ -7,9 +7,8 @@ id="datascrollerPropertySubviewID"> <h:commandButton action="#{dataScroller.CutArray}" value="CutArray" /> - <h:commandButton action="#{dataScroller.RestoreArray}" - value="RestoreArray" /> - + <h:commandButton action="#{dataScroller.RestoreArray}" value="RestoreArray" /> + <h:commandButton action="#{dataScroller.add}" value="add test" /> <h:panelGrid columns="2"> <h:outputText value="maxPages" /> <h:inputText value="#{dataScroller.maxPages}"> Modified: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-07-10 08:17:30 UTC (rev 9500) @@ -9,7 +9,7 @@ onRowMouseUp="#{event.onRowMouseUp}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" - onmouseup="#{event.onmouseup}"> + onmouseup="#{event.onmouseup}" binding="#{dataTable.htmlDataTable}"> <f:facet name="caption"> <h:outputText value="caption facet" /> </f:facet> Modified: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml 2008-07-10 08:17:30 UTC (rev 9500) @@ -4,6 +4,7 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="dataTablePropertySubviewID"> + <h:commandButton action="#{dataTable.add}" value="add test" /> <h:panelGrid columns="2" style="top"> <h:outputText value="Align:"></h:outputText> <h:selectOneMenu value="#{dataTable.align}"> Modified: trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-07-09 17:50:32 UTC (rev 9499) +++ trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-07-10 08:17:30 UTC (rev 9500) @@ -30,7 +30,7 @@ ondragstart="#{event.ondragstart}" onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" - id="dragSupportID"> + id="dragSupportID" binding="#{dndBean.htmlDrag}"> </rich:dragSupport> </h:panelGrid> </h:column> @@ -48,12 +48,15 @@ ondragexit="#{event.ondragexit}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" - onbeforedomupdate="#{event.onbeforedomupdate}"> + onbeforedomupdate="#{event.onbeforedomupdate}" binding="#{dndBean.htmlDrop}"> </rich:dropSupport> </h:panelGrid> </h:column> </h:dataTable> + <h:panelGrid id="dndActionID" columns="1"> + <h:commandButton action="#{dndBean.add1}" value="add Drag test" /> + <h:commandButton action="#{dndBean.add2}" value="add Drop test" /> <a4j:commandButton value="Show action" reRender="dndActionID" style=" width : 95px;"></a4j:commandButton> <h:outputText value="#{dndBean.actionDrag}" />