Author: adubovsky Date: 2008-07-21 04:36:40 -0400 (Mon, 21 Jul 2008) New Revision: 9697 Removed: trunk/test-applications/facelets/src/main/java/dataTable/Cell.java trunk/test-applications/facelets/src/main/java/dataTable/Table.java trunk/test-applications/facelets/src/main/java/dataTable/TestBean.java Modified: trunk/test-applications/facelets/src/main/java/gmap/Gmap.java trunk/test-applications/facelets/src/main/java/rich/RichBean.java 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 trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml Log: 1) Add page for dataGrid 2) Modify dataTable 3) Changes in Gmap, VirtualEarth, DnD Deleted: trunk/test-applications/facelets/src/main/java/dataTable/Cell.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dataTable/Cell.java 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/java/dataTable/Cell.java 2008-07-21 08:36:40 UTC (rev 9697) @@ -1,13 +0,0 @@ -package dataTable; -public class Cell { - private Integer value; - - public Integer getValue() { - return value; - } - - public void setValue(Integer value) { - this.value = value; - } - -} Deleted: trunk/test-applications/facelets/src/main/java/dataTable/Table.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dataTable/Table.java 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/java/dataTable/Table.java 2008-07-21 08:36:40 UTC (rev 9697) @@ -1,15 +0,0 @@ -package dataTable; -import java.util.ArrayList; -import java.util.List; - -public class Table { - private List<Cell> cells = new ArrayList<Cell>(); - - public List<Cell> getCells() { - return cells; - } - - public void setCells(List<Cell> cells) { - this.cells = cells; - } -} Deleted: trunk/test-applications/facelets/src/main/java/dataTable/TestBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/dataTable/TestBean.java 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/java/dataTable/TestBean.java 2008-07-21 08:36:40 UTC (rev 9697) @@ -1,73 +0,0 @@ -package dataTable; -import java.util.ArrayList; -import java.util.List; -import org.richfaces.component.html.HtmlDataGrid; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; - -public class TestBean { - - private List<Table> tables = new ArrayList<Table>(); - private HtmlDataGrid myDataGrid = null; - private String bindLabel; - private String elements; - - public String getElements() { - return elements; - } - - public void setElements(String elements) { - this.elements = elements; - } - - public TestBean() { - Table t1 = new Table(); - tables.add(t1); - t1.getCells().add(new Cell()); - t1.getCells().add(new Cell()); - - Table t2 = new Table(); - tables.add(t2); - t2.getCells().add(new Cell()); - t2.getCells().add(new Cell()); - bindLabel = "not ready"; - elements = "0"; - } - - public String submit() { - return null; - } - - public void submitAjax() { - - } - - public void checkBinding(ActionEvent actionEvent){ - FacesContext context = FacesContext.getCurrentInstance(); - bindLabel = myDataGrid.getBaseClientId(context); - } - - public List<Table> getTables() { - return tables; - } - - public void setTables(List<Table> tables) { - this.tables = tables; - } - - public HtmlDataGrid getMyDataGrid() { - return myDataGrid; - } - - public void setMyDataGrid(HtmlDataGrid myDataGrid) { - this.myDataGrid = myDataGrid; - } - - public String getBindLabel() { - return bindLabel; - } - - public void setBindLabel(String bindLabel) { - this.bindLabel = bindLabel; - } -} Modified: trunk/test-applications/facelets/src/main/java/gmap/Gmap.java =================================================================== --- trunk/test-applications/facelets/src/main/java/gmap/Gmap.java 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/java/gmap/Gmap.java 2008-07-21 08:36:40 UTC (rev 9697) @@ -24,7 +24,16 @@ private String zoom; private boolean rendered; private HtmlGmap htmlGMap = null; + private String locale; + public String getLocale() { + return locale; + } + + public void setLocale(String locale) { + this.locale = locale; + } + public HtmlGmap getHtmlGMap() { return htmlGMap; } @@ -40,6 +49,7 @@ } public Gmap() { + locale = "en"; zoom = "17"; mapType ="G_NORMAL_MAP"; lng = "44.44"; Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-07-21 08:36:40 UTC (rev 9697) @@ -72,6 +72,7 @@ map.add("Skinning", add("/Skinning/Skinning", new boolean [] {false, false, false})); map.add("HotKey", add("/HotKey/HotKey", new boolean [] {false, false, false})); map.add("Validator", add("/Validator/Validator", new boolean [] {true, true, true})); + map.add("DataGrid", add("/DataGrid/DataGrid", new boolean [] {false, true, false})); Iterator<String> iterator = map.getSet().iterator(); while(iterator.hasNext()){ list.add(new SelectItem(iterator.next())); Modified: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/DataTable/DataTable.xhtml 2008-07-21 08:36:40 UTC (rev 9697) @@ -1,8 +1,9 @@ <f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="DataTableSubviewID"> + <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" captionClass="#{style.captionClass}" rowClasses="#{style.rowClasses}" headerClass="#{style.headerClass}" footerClass="#{style.footerClass}" styleClass="#{style.styleClass}" captionStyle="#{style.captionStyle}" columnClasses="#{style.columnClasses}" - onRowClick="#{event.onRowClick};alert('row #{key}');" rendered="#{dataTable.rendered}" + onRowClick="#{event.onRowClick};" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" onRowDblClick="#{event.onRowDblClick}" onRowMouseDown="#{event.onRowMouseDown}" onRowMouseMove="#{event.onRowMouseMove}" onRowMouseOut="#{event.onRowMouseOut}" onRowMouseOver="#{event.onRowMouseOver}" @@ -72,22 +73,4 @@ </rich:column> </rich:dataTable> - <h1>Test page</h1> - <a4j:outputPanel id="panel"> - <h:dataTable id="c1" border="1" value="#{testBean.tables}" - var="table"> - <h:column> - <rich:dataGrid id="c2" columns="2" value="#{table.cells}" - var="cell" binding="#{testBean.myDataGrid}" border="12px" dir="RTL" - elements="#{testBean.elements}"> - <h:outputLabel value="Value:" for="field" /> - <h:inputText id="field" value="#{cell.value}"/> - </rich:dataGrid> - </h:column> - </h:dataTable> - <h:messages /> - </a4j:outputPanel> - <h:commandButton action="#{testBean.submit}" value="Submit" /> - <a4j:commandButton action="#{testBean.submitAjax}" value="Submit Ajax" reRender="panel"/> - </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/DataTable/DataTableProperty.xhtml 2008-07-21 08:36:40 UTC (rev 9697) @@ -37,22 +37,6 @@ <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" onclick="submit();" /> - <h:commandButton actionListener="#{testBean.checkBinding}" - value="DG_binding"></h:commandButton> - <h:outputText value="#{testBean.bindLabel}"></h:outputText> - - <h:outputText value="elements:"></h:outputText> - <h:outputText value="#{testBean.elements}"></h:outputText> </h:panelGrid> <br /> - <br /> - <div style="FONT-WEIGHT: bold;">rich:findComponent</div> - <h:panelGrid columns="2"> - <rich:column> - <a4j:commandLink value="getRowCount" reRender="findID"></a4j:commandLink> - </rich:column> - <rich:column id="findID"> - <h:outputText value="#{rich:findComponent('dataTableID').rowCount}" /> - </rich:column> - </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2008-07-21 08:36:40 UTC (rev 9697) @@ -27,7 +27,7 @@ action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}" oncomplete="#{event.oncomplete}" ondragend="#{event.ondragend}" - ondragstart="#{event.ondragstart}" onsubmit="#{event.onsubmit}" + ondragstart="#{event.ondragstart}" onbeforedomupdate="#{event.onbeforedomupdate}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" id="dragSupportID" binding="#{dndBean.htmlDrag}"> @@ -47,7 +47,6 @@ ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" oncomplete="#{event.oncomplete}" - onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}" binding="#{dndBean.htmlDrop}"> </rich:dropSupport> </h:panelGrid> @@ -104,7 +103,7 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid1"> <f:verbatim>Accepts file and folder... Customizes</f:verbatim> <rich:dropSupport id="zone1" oncomplete="#{event.oncomplete}" - onsubmit="#{event.onsubmit}" ondragenter="#{event.ondragenter}" + ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondropend="#{event.ondropend}" ondrop="#{event.ondrop}" onbeforedomupdate="#{event.onbeforedomupdate}" @@ -125,7 +124,7 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid3"> <f:verbatim>Accepts none... Customizes</f:verbatim> <rich:dropSupport typeMapping="{file: testDrop}" - oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" + oncomplete="#{event.oncomplete}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondropend="#{event.ondropend}" ondrop="#{event.ondrop}" onbeforedomupdate="#{event.onbeforedomupdate}"> @@ -139,7 +138,7 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid4"> <f:verbatim>Accepts file and folder</f:verbatim> <rich:dropSupport acceptedTypes="file, folder" - oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" + oncomplete="#{event.oncomplete}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondropend="#{event.ondropend}" ondrop="#{event.ondrop}" onbeforedomupdate="#{event.onbeforedomupdate}"> @@ -151,7 +150,6 @@ <rich:dragSupport dragType="file" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" - onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> @@ -163,7 +161,7 @@ <rich:dragSupport dragType="file" dragIndicator="indicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" - oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" + oncomplete="#{event.oncomplete}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> @@ -175,7 +173,7 @@ <rich:dragSupport dragType="folder" dragIndicator="indicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" - oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" + oncomplete="#{event.oncomplete}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> @@ -189,7 +187,6 @@ <rich:dragSupport dragType="folder" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" oncomplete="#{event.oncomplete}" - onsubmit="#{event.onsubmit}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> @@ -212,7 +209,7 @@ <rich:dragSupport dragType="folder" dragIndicator="defaultIndicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" - oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" + oncomplete="#{event.oncomplete}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="label" value="testDragValue for Folder" /> </rich:dragSupport> @@ -225,7 +222,7 @@ <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" ondragend="#{event.ondragend}" ondragstart="#{event.ondragstart}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}" - oncomplete="#{event.oncomplete}" onsubmit="#{event.onsubmit}" + oncomplete="#{event.oncomplete}" onbeforedomupdate="#{event.onbeforedomupdate}"> <rich:dndParam name="marker" value="testMarkerValue" /> <rich:dndParam name="label" value="testDragValue" /> @@ -237,27 +234,5 @@ </h:panelGrid> <br /> <br /> - <div style="FONT-WEIGHT: bold;">rich:findComponent</div> - <h:panelGrid columns="2"> - <rich:column> - <a4j:commandLink value="getDragValue" reRender="findID1"></a4j:commandLink> - </rich:column> - <rich:column id="findID1"> - <h:outputText - value="#{rich:findComponent('dragSupportID').dragValue}" /> - </rich:column> - <rich:column> - <a4j:commandLink value="getDropValue" reRender="findID2"></a4j:commandLink> - </rich:column> - <rich:column id="findID2"> - <h:outputText - value="#{rich:findComponent('dropSupportID').dropValue}" /> - </rich:column> - <rich:column> - <a4j:commandLink value="getAcceptClass" reRender="findID3"></a4j:commandLink> - </rich:column> - <rich:column id="findID3"> - <h:outputText value="#{rich:findComponent('indicator').acceptClass}" /> - </rich:column> - </h:panelGrid> + </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2008-07-21 08:36:40 UTC (rev 9697) @@ -3,13 +3,13 @@ <rich:gmap id="gMapID" enableInfoWindow="#{gmap.enableInfoWindow}" mapType="#{gmap.mapType}" lng="#{gmap.lng}" lat="#{gmap.lat}" warningMessage="#{gmap.warningMessage}" rendered="#{gmap.rendered}" zoom="#{gmap.zoom}" enableContinuousZoom="#{gmap.continuousZoom}" enableDoubleClickZoom="#{gmap.doubleClickZoom}" enableDragging="#{gmap.dragging}" - gmapVar="map" oninit="alert('init ...')" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}" - showGScaleControl="#{gmap.showGScaleControl}" + gmapVar="map" oninit="#{event.oninit}" showGLargeMapControl="#{gmap.showGLargeMapControl}" showGMapTypeControl="#{gmap.showGMapTypeControl}" + showGScaleControl="#{gmap.showGScaleControl}" locale="#{gmap.locale}" 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}" gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" style="#{style.style}" styleClass="#{style.styleClass}" binding="#{gmap.htmlGMap}" /> <h:panelGroup> - <f:verbatim> + <f:verbatim><br /> Controls:<br /> <a href="javascript:void(0);" onclick="map.hideControls();return false;">Remove</a> <a href="javascript:void(0);" onclick="map.showControls();return false;">Show</a> Modified: trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/Gmap/GmapProperty.xhtml 2008-07-21 08:36:40 UTC (rev 9697) @@ -14,53 +14,63 @@ </h:selectOneMenu> <h:outputText value="enableInfoWindow:"></h:outputText> - <h:selectBooleanCheckbox value="#{gmap.enableInfoWindow}" - onclick="submit()"></h:selectBooleanCheckbox> + <h:selectOneRadio value="#{gmap.enableInfoWindow}" + onchange="submit();"> + <f:selectItem itemLabel="on" itemValue="true" /> + <f:selectItem itemLabel="off" itemValue="false" /> + </h:selectOneRadio> <h:outputText value="showGLargeMapControl:"></h:outputText> - <h:selectBooleanCheckbox value="#{gmap.showGLargeMapControl}" - onclick="submit()"></h:selectBooleanCheckbox> + <h:selectOneRadio value="#{gmap.showGLargeMapControl}" + onchange="submit();"> + <f:selectItem itemLabel="on" itemValue="true" /> + <f:selectItem itemLabel="off" itemValue="false" /> + </h:selectOneRadio> <h:outputText value="showGMapTypeControl:"></h:outputText> - <h:selectBooleanCheckbox value="#{gmap.showGMapTypeControl}" - onclick="submit()"></h:selectBooleanCheckbox> + <h:selectOneRadio value="#{gmap.showGMapTypeControl}" + onchange="submit();"> + <f:selectItem itemLabel="on" itemValue="true" /> + <f:selectItem itemLabel="off" itemValue="false" /> + </h:selectOneRadio> <h:outputText value="showGScaleControl:"></h:outputText> - <h:selectBooleanCheckbox value="#{gmap.showGScaleControl}" - onclick="submit()"></h:selectBooleanCheckbox> + <h:selectOneRadio value="#{gmap.showGScaleControl}" + onchange="submit();"> + <f:selectItem itemLabel="on" itemValue="true" /> + <f:selectItem itemLabel="off" itemValue="false" /> + </h:selectOneRadio> <h:outputText value="warningMessage:"></h:outputText> <h:inputText value="#{gmap.warningMessage}" onclick="submit()"></h:inputText> <h:outputText value="lng:"></h:outputText> - <h:inputText value="#{gmap.lng}" onclick="submit()"></h:inputText> + <h:inputText value="#{gmap.lng}" onchange="submit()"></h:inputText> <h:outputText value="lat:"></h:outputText> - <h:inputText value="#{gmap.lat}" onclick="submit()"></h:inputText> + <h:inputText value="#{gmap.lat}" onchange="submit()"></h:inputText> <h:outputText value="Dragging:" /> - <h:selectBooleanCheckbox value="#{gmap.dragging}" onclick="submit()" /> + <h:selectOneRadio value="#{gmap.dragging}" onchange="submit();"> + <f:selectItem itemLabel="on" itemValue="true" /> + <f:selectItem itemLabel="off" itemValue="false" /> + </h:selectOneRadio> <h:outputText value="Continuous Zoom:" /> - <h:selectBooleanCheckbox value="#{gmap.continuousZoom}" - onclick="submit()" /> + <h:selectOneRadio value="#{gmap.continuousZoom}" onchange="submit();"> + <f:selectItem itemLabel="on" itemValue="true" /> + <f:selectItem itemLabel="off" itemValue="false" /> + </h:selectOneRadio> <h:outputText value="Double Click Zoom:" /> - <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" - onclick="submit()" /> + <h:selectOneRadio value="#{gmap.doubleClickZoom}" onchange="submit();"> + <f:selectItem itemLabel="on" itemValue="true" /> + <f:selectItem itemLabel="off" itemValue="false" /> + </h:selectOneRadio> <h:outputText value="rendered:"></h:outputText> <h:selectBooleanCheckbox value="#{gmap.rendered}" onchange="submit();"></h:selectBooleanCheckbox> </h:panelGrid> <br /> <br /> - <div style="FONT-WEIGHT: bold;">rich:findComponent</div> - <h:panelGrid columns="2"> - <rich:column> - <a4j:commandLink value="getRendererType" reRender="findID"></a4j:commandLink> - </rich:column> - <rich:column id="findID"> - <h:outputText value="#{rich:findComponent('gMapID').rendererType}" /> - </rich:column> - </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-07-21 08:36:40 UTC (rev 9697) @@ -67,7 +67,6 @@ <h:outputLink onclick="Richfaces.hideModalPanel('modalPanel2ID');return false;" ><f:verbatim>Close</f:verbatim></h:outputLink> - </rich:modalPanel> <rich:modalPanel id="modalPanel3ID" minHeight="100" minWidth="200" moveable="true" resizeable="false" autosized="true"> Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-07-21 08:36:40 UTC (rev 9697) @@ -2,7 +2,7 @@ <f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="virtualEarthSubviewID"> <h:panelGrid columns="2"> - <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="alert('LoadMap')" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" + <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="#{event.onLoadMap}" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" dashboardSize="#{virtualEarth.dashboardSize}" mapStyle="#{virtualEarth.mapStyle}" var="map" 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}" binding="#{virtualEarth.htmlVirtualEarth}"/> Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-07-21 08:36:40 UTC (rev 9697) @@ -68,13 +68,5 @@ </h:panelGroup> <br /> <br /> - <div style="FONT-WEIGHT: bold;">rich:findComponent</div> - <h:panelGrid columns="2"> - <rich:column> - <a4j:commandLink value="getRendererType" reRender="findID"></a4j:commandLink> - </rich:column> - <rich:column id="findID"> - <h:outputText value="#{rich:findComponent('vEarthID').rendererType}" /> - </rich:column> - </h:panelGrid> + </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-07-21 08:15:49 UTC (rev 9696) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-07-21 08:36:40 UTC (rev 9697) @@ -41,7 +41,7 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.x! ml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/fac! es-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF /faces-config-Custom.xml</param-value> + <param-value>/WEB-INF/faces-config-DataGrid.xml,/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/W! EB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-co! nfig-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF /faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>