[richfaces-svn-commits] JBoss Rich Faces SVN: r5539 - in trunk/test-applications/jsp/src/main: java/virtualEarth and 3 other directories.

Author: ayanul Date: 2008-01-22 12:27:01 -0500 (Tue, 22 Jan 2008) New Revision: 5539 Removed: trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp Modified: trunk/test-applications/jsp/src/main/java/gmap/Gmap.java trunk/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp Log: http://jira.jboss.com/jira/browse/RF-1863 Modified: trunk/test-applications/jsp/src/main/java/gmap/Gmap.java =================================================================== --- trunk/test-applications/jsp/src/main/java/gmap/Gmap.java 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/java/gmap/Gmap.java 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,26 +1,41 @@ package gmap; +/** + * @author user + * + */ public class Gmap { - private String zoom; private String continuousZoom; private String doubleClickZoom; private String dragging; + private String enableInfoWindow; + private String lat; + private String lng; + private String mapType; + private String showGLargeMapControl; + private String showGMapTypeControl; + private String showGScaleControl; + private String warningMessage; + private String zoom; + private boolean rendered; public Gmap() { + zoom = "17"; + mapType ="G_NORMAL_MAP"; + lng = "44.44"; + lat = "37.37"; + warningMessage = "warning!!!"; + showGLargeMapControl = "true"; + showGMapTypeControl = "true"; + showGScaleControl = "true"; + enableInfoWindow = "true"; + rendered = true; continuousZoom = "false"; doubleClickZoom = "false"; dragging = "false"; } - public String getZoom() { - return zoom; - } - - public void setZoom(String zoom) { - this.zoom = zoom; - } - public String act() { zoom = "17"; System.out.println("zoom=" + zoom); @@ -44,11 +59,90 @@ } public String getDragging() { - return dragging; } public void setDragging(String dragging) { - this.dragging = dragging; + this.dragging = dragging; } + + public String getEnableInfoWindow() { + return enableInfoWindow; + } + + public void setEnableInfoWindow(String enableInfoWindow) { + this.enableInfoWindow = enableInfoWindow; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getMapType() { + return mapType; + } + + public void setMapType(String mapType) { + this.mapType = mapType; + } + + public String getShowGLargeMapControl() { + return showGLargeMapControl; + } + + public void setShowGLargeMapControl(String showGLargeMapControl) { + this.showGLargeMapControl = showGLargeMapControl; + } + + public String getShowGMapTypeControl() { + return showGMapTypeControl; + } + + public void setShowGMapTypeControl(String showGMapTypeControl) { + this.showGMapTypeControl = showGMapTypeControl; + } + + public String getShowGScaleControl() { + return showGScaleControl; + } + + public void setShowGScaleControl(String showGScaleControl) { + this.showGScaleControl = showGScaleControl; + } + + public String getWarningMessage() { + return warningMessage; + } + + public void setWarningMessage(String warningMessage) { + this.warningMessage = warningMessage; + } + + public String getZoom() { + return zoom; + } + + public void setZoom(String zoom) { + this.zoom = zoom; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } } Modified: trunk/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java =================================================================== --- trunk/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/java/virtualEarth/VirtualEarth.java 2008-01-22 17:27:01 UTC (rev 5539) @@ -3,7 +3,69 @@ public class VirtualEarth { private String zoom; private String version; + private String lat; + private String lng; + private boolean rendered; + private String dashboardSize; + private String mapStyle; + public VirtualEarth() { + version = "6"; + zoom = "17"; + version = "6"; + lat = "37.37"; + lng = "44.44"; + dashboardSize = "Normal"; + mapStyle = "Hybrid"; + rendered = true; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + double d = Double.parseDouble(lat); + if(-97 < d && d < 97) + this.lat = lat; + else this.lat = "0"; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + double d = Double.parseDouble(lng); + if(-180 < d && d < 180) + this.lng = lng; + else this.lng = "0"; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public String getDashboardSize() { + return dashboardSize; + } + + public void setDashboardSize(String dashboardSize) { + this.dashboardSize = dashboardSize; + } + + public String getMapStyle() { + return mapStyle; + } + + public void setMapStyle(String mapStyle) { + this.mapStyle = mapStyle; + } + public String getVersion() { return version; } Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/CalendarJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,50 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="calendarJSAPIID"> - <f:verbatim> - <br /> - <a href="#" id="doExpandCalendarID">Calendar (doExpand)</a> - <br /> - <a href="#" id="doNextYearCalendarID">Calendar (nextYear)</a> - <br /> - <a href="#" id="doPrevYearCalendarID">Calendar (prevYear)</a> - <br /> - <a href="#" id="doNextMonthCalendarID">Calendar (nextMonth)</a> - <br /> - <a href="#" id="doPrevMonthCalendarID">Calendar (prevMonth)</a> - <br /> - <a href="#" id="doTodayCalendarID">Calendar (today)</a> - <br /> - <a href="#" id="doEnableCalendarID">Calendar (enable)</a> - <br /> - <a href="#" id="doDisableCalendarID">Calendar (disable)</a> - <br /> - <a href="#" id="doCurrentYearCalendarID">Calendar (currentYear)</a> - </f:verbatim> - - <rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="doExpand" /> - <rich:componentControl attachTo="doNextYearCalendarID" for="ccCalendarID" event="onclick" operation="nextYear" /> - <rich:componentControl attachTo="doPrevYearCalendarID" for="ccCalendarID" event="onclick" operation="prevYear" /> - <rich:componentControl attachTo="doNextMonthCalendarID" for="ccCalendarID" event="onclick" operation="nextMonth" /> - <rich:componentControl attachTo="doPrevMonthCalendarID" for="ccCalendarID" event="onclick" operation="prevMonth" /> - <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="today" /> - <rich:componentControl attachTo="doEnableCalendarID" for="ccCalendarID" event="onclick" operation="enable" /> - <rich:componentControl attachTo="doDisableCalendarID" for="ccCalendarID" event="onclick" operation="disable" /> - <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="disable" /> - <rich:componentControl attachTo="doCurrentYearCalendarID" for="ccCalendarID" event="onclick" operation="getCurrentYear" /> - <f:verbatim> -selectDate(date) Selects the date specified. If the date isn't in current month - performs request to select -isDateEnabled(date) Checks if given date is selectable -enableDate(date) Enables date cell control on the calendar -disableDate(date) Disables date cell control on the calendar -enableDates(date[]) Enables dates cell controls set on the calendar -disableDates(date[]) Disables dates cell controls set on the calendar -getSelectedDate() Returns currently selected date -Object getData() Returns additional data for the date -getCurrentMonth() Returns number of the month currently being viewed -getCurrentYear() Returns number of the year currently being viewed -</f:verbatim> -</f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ComponentControl.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -4,60 +4,92 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="componentControlSubviewID"> - <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)"> - <h:outputLink id="hideButton1ID" onclick="return false;" value="#"> - <f:verbatim>Close 1</f:verbatim> - </h:outputLink> - <f:verbatim> - <br /> - </f:verbatim> - <h:outputLink id="hideButton2ID" onclick="return false;" value="#"> - <f:verbatim>Close 2</f:verbatim> - </h:outputLink> - </rich:modalPanel> - - <h:commandButton id="showButtonID" value="show ModalPanel" > - <rich:componentControl for="ccModalPanelID" event="onclick" disableDefault="true" operation="show" params="show:'componentControl work(show)'" /> - </h:commandButton> - <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide" - params="hide:'componentControl work(hide)'" /> + <h:inputText value="test"> + <rich:componentControl name="controlMe" event="onclick" attachTiming="onload" for="ccToltipID" operation="show" /> + </h:inputText> + <rich:panel> + <rich:toolTip id="ccToltipID" followMouse="false" direction="top-right" value="Help me, help!"> + </rich:toolTip> + </rich:panel> + + <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)"> + <h:outputLink id="hideButton1ID" onclick="return false;" value="#"> + <f:verbatim>Close 1</f:verbatim> + </h:outputLink> <f:verbatim> <br /> - <br /> </f:verbatim> + <h:outputLink id="hideButton2ID" onclick="return false;" value="#"> + <f:verbatim>Close 2</f:verbatim> + </h:outputLink> + </rich:modalPanel> - <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" mode="ajax" /> - <h:panelGrid columns="2"> - <h:outputText value="popup calendar" /> - <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" /> - </h:panelGrid> -<a onclick="$('j_id_jsp_362828066_1:componentControlSubviewID:ccCalendarID').component.Expand()" href="#">Show</a> + <h:commandButton id="showButtonID" value="show ModalPanel"> + <rich:componentControl for="ccModalPanelID" event="onclick" disableDefault="true" operation="show" + params="show:'componentControl work(show)'" /> + </h:commandButton> + <rich:componentControl attachTiming="onload" attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" + operation="hide" params="hide:'componentControl work(hide)'" /> - <f:verbatim> - <br /> - <br /> - </f:verbatim> + <f:verbatim> + <br /> + <br /> + </f:verbatim> - <rich:panelMenu id="ccContextMenuPanelMenuID"> - <h:outputText value="click text" /> - </rich:panelMenu> + <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" /> + <h:panelGrid columns="2"> + <h:outputText value="popup calendar" /> + <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" /> + </h:panelGrid> - <rich:contextMenu id="ccContextMenuID" submitMode="ajax" onexpand="alert(event.parameters.expand)"> - <rich:menuItem icon="/pics/header.png" value="tab1"> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="/pics/info.gif" value="a"> - </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="b"> - </rich:menuItem> - <rich:menuItem icon="/pics/info.gif" value="c"> - </rich:menuItem> - </rich:contextMenu> - <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" - operation="show" params="expand:'show work'" /> - - <jsp:include page="CalendarJSAPI.jsp" /> + <f:verbatim> + <br /> + <a href="#" id="doExpandCalendarID">Calendar (doExpand)</a> + <br /> + <a href="#" id="doNextYearCalendarID">Calendar (nextYear)</a> + <br /> + <a href="#" id="doPrevYearCalendarID">Calendar (prevYear)</a> + <br /> + <a href="#" id="doNextMonthCalendarID">Calendar (nextMonth)</a> + <br /> + <a href="#" id="doPrevMonthCalendarID">Calendar (prevMonth)</a> + <br /> + <a href="#" id="doTodayCalendarID">Calendar (today)</a> + <br /> + <a href="#" id="doTodayCalendarRenderedID">Calendar (today) rendered="false"</a> + </f:verbatim> + + <rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="doExpand" /> + <rich:componentControl attachTo="doNextYearCalendarID" for="ccCalendarID" event="onclick" operation="nextYear" /> + <rich:componentControl attachTo="doPrevYearCalendarID" for="ccCalendarID" event="onclick" operation="prevYear" /> + <rich:componentControl attachTo="doNextMonthCalendarID" for="ccCalendarID" event="onclick" operation="nextMonth" /> + <rich:componentControl attachTo="doPrevMonthCalendarID" for="ccCalendarID" event="onclick" operation="prevMonth" /> + <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="today" /> + <rich:componentControl attachTo="doTodayCalendarRenderedID" for="ccCalendarID" rendered="false" event="onclick" operation="today" /> + + <f:verbatim> + <br /> + <br /> + </f:verbatim> + + <rich:panelMenu id="ccContextMenuPanelMenuID"> + <h:outputText value="click text" /> + </rich:panelMenu> + + <rich:contextMenu id="ccContextMenuID" submitMode="ajax" onexpand="alert(event.parameters.expand)"> + <rich:menuItem icon="/pics/header.png" value="tab1"> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="/pics/info.gif" value="a"> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="b"> + </rich:menuItem> + <rich:menuItem icon="/pics/info.gif" value="c"> + </rich:menuItem> + </rich:contextMenu> + <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" operation="show" + params="expand:'show work'" /> </f:subview> \ No newline at end of file Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ContextMenuJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="contextMenuJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ListShuttleJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="ListShuttleJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ModalPanelJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="modalPanelJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/OrderingListJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="orderinJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/PanelMenuJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="PanelMenuJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ScrollableDataTableJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="scrollableDataTableJSAPIID"> -</f:subview> Deleted: trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/ComponentControl/ToolTipJSAPI.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -1,7 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - -<f:subview id="toolTipJSAPIID"> -</f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -4,52 +4,45 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="GmapSubviewID"> - <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" - onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" - onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + <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}" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" + onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" - gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" - style="width:500px;height:400px" - enableContinuousZoom="#{gmap.continuousZoom}" - enableDoubleClickZoom="#{gmap.doubleClickZoom}" - enableDragging="#{gmap.dragging}" /> + gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" /> - <h:panelGroup> - <f:verbatim> + <h:panelGroup> + <f:verbatim> 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> - <br /> - <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> + <br /> + <br /> Type:<br /> - <a href="javascript:void(0);" - onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a> - <a href="javascript:void(0);" - onclick="map.setMapType(G_SATELLITE_MAP);return false;">Satellite</a> - <a href="javascript:void(0);" - onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a> + <a href="javascript:void(0);" onclick="map.setMapType(G_SATELLITE_MAP);return false;">Satellite</a> + <a href="javascript:void(0);" onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a> + <br /> + <br /> Zoom:<br /> - <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a> - <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a> - <br /> - <br /> - <a href="javascript:void(0);" onclick="showExadel();return false;">Show - Exadel Office</a> - <br /> - <a href="javascript:void(0);" - onclick="showExadelInMinsk();return false;">Show Exadel in - Belarus</a> - </f:verbatim> - </h:panelGroup> + <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a> + <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a> + <br /> + <br /> + <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> + <br /> + <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> + </f:verbatim> + </h:panelGroup> - <a4j:outputPanel> - <script> + <a4j:outputPanel> + <script> function createMarker(point,html) { var marker = new GMarker(point); @@ -81,6 +74,6 @@ var ul = G_NORMAL_MAP.getProjection().fromPixelToLatLng(ulp,zoom); } </script> - </a4j:outputPanel> + </a4j:outputPanel> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -5,6 +5,34 @@ <f:subview id="GmapPropertySubviewID"> <h:panelGrid columns="2"> + <h:outputText value="mapType"></h:outputText> + <h:selectOneMenu value="#{gmap.mapType}" onchange="submit();"> + <f:selectItem itemLabel="G_NORMAL_MAP" itemValue="G_NORMAL_MAP"/> + <f:selectItem itemLabel="G_SATELLITE_MAP" itemValue="G_SATELLITE_MAP"/> + <f:selectItem itemLabel="G_HYBRID_MAP" itemValue="G_HYBRID_MAP"/> + </h:selectOneMenu> + + <h:outputText value="enableInfoWindow:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.enableInfoWindow}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGLargeMapControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGLargeMapControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGMapTypeControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGMapTypeControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <h:outputText value="showGScaleControl:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.showGScaleControl}" onclick="submit()" ></h:selectBooleanCheckbox> + + <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:outputText value="lat:"></h:outputText> + <h:inputText value="#{gmap.lat}" onclick="submit()" ></h:inputText> + <h:outputText value="Dragging:" /> <h:selectBooleanCheckbox value="#{gmap.dragging}" onclick="submit()" /> @@ -13,5 +41,8 @@ <h:outputText value="Double Click Zoom:" /> <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" onclick="submit()" /> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{gmap.rendered}" onchange="submit();"></h:selectBooleanCheckbox> </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -4,19 +4,21 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="virtualEarthSubviewID"> - <h:panelGrid columns="2"> - <rich:virtualEarth style="width:800px;" version="#{virtualEarth.version}" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" - mapStyle="Hybrid" var="map" onclick="showEvent('onclickInputID', 'onclick work!')" - ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" - onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" - onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" - onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" - onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')"/> + <h:panelGrid columns="2"> - </h:panelGrid> + <rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="alert('LoadMap')" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}" + dashboardSize="#{virtualEarth.dashboardSize}" mapStyle="#{virtualEarth.mapStyle}" var="map" onclick="showEvent('onclickInputID', 'onclick work!')" + ondblclick="showEvent('ondblclickInputID', 'ondblclick work!')" onkeydown="showEvent('onkeydownInputID', 'onkeydown work!')" + onkeypress="showEvent('onkeypressInputID', 'onkeypress work!')" onkeyup="showEvent('onkeyupInputID', 'onkeyup work!')" + onmousedown="showEvent('onmousedownInputID', 'onmousedown work!')" + onmousemove="showEvent('onmousemoveInputID', 'onmousemove work!')" + onmouseout="showEvent('onmouseoutInputID', 'onmouseout work!')" + onmouseover="showEvent('onmouseoverInputID', 'onmouseover work!')" onmouseup="showEvent('onmouseupInputID', 'onmouseup work!')" /> - <a4j:outputPanel> - <script> + </h:panelGrid> + + <a4j:outputPanel> + <script> function createMarker(point,html) { var marker = new GMarker(point); GEvent.addListener(marker, "click", function() { @@ -30,10 +32,10 @@ map.SetMapStyle(VEMapStyle.Birdseye); } function showExadelInMinsk() { - var point = new VELatLong(53.92316,27.510737, 53.92316,27.510737); + var point = new VELatLong(53.92316,27.510737); map.SetCenterAndZoom(point, 16); map.SetMapStyle(VEMapStyle.Birdseye); } </script> - </a4j:outputPanel> + </a4j:outputPanel> </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2008-01-22 17:01:45 UTC (rev 5538) +++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2008-01-22 17:27:01 UTC (rev 5539) @@ -4,28 +4,53 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="virtualEarthPropertySubviewID"> - <h:panelGroup> - <f:verbatim> + <h:panelGrid columns="2"> + <h:outputText value="lat(-97 < x < 97):"></h:outputText> + <h:inputText value="#{virtualEarth.lat}" onchange="submit();"></h:inputText> + + <h:outputText value="lng(-180 < x < 180):"></h:outputText> + <h:inputText value="#{virtualEarth.lng}" onchange="submit();"></h:inputText> + + <h:outputText value="dashboardSize"></h:outputText> + <h:selectOneMenu value="#{virtualEarth.dashboardSize}" onchange="submit();"> + <f:selectItem itemLabel="Normal" itemValue="Normal" /> + <f:selectItem itemLabel="Small" itemValue="Small" /> + <f:selectItem itemLabel="Tiny" itemValue="Tiny" /> + </h:selectOneMenu> + + <h:outputText value="mapStyle"></h:outputText> + <h:selectOneMenu value="#{virtualEarth.mapStyle}" onchange="submit();"> + <f:selectItem itemLabel="Birdseye" itemValue="Birdseye" /> + <f:selectItem itemLabel="Hybrid" itemValue="Hybrid" /> + <f:selectItem itemLabel="Aerial" itemValue="Aerial" /> + <f:selectItem itemLabel="Road" itemValue="Road" /> + </h:selectOneMenu> + + <h:outputText value="rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{virtualEarth.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + </h:panelGrid> + <h:panelGroup> + <f:verbatim> Dashboard:<br /> - <a href="javascript:void(0);" onclick="map.HideDashboard();return false;">Remove</a> - <a href="javascript:void(0);" onclick="map.ShowDashboard();return false;">Show</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.HideDashboard();return false;">Remove</a> + <a href="javascript:void(0);" onclick="map.ShowDashboard();return false;">Show</a> + <br /> + <br /> Type:<br /> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> - <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> - <br /> - <br /> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> + <br /> + <br /> Zoom:<br /> - <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> - <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> - <br /> - <br /> - <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> - <br /> - <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> - </f:verbatim> - </h:panelGroup> + <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> + <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> + <br /> + <br /> + <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> + <br /> + <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> + </f:verbatim> + </h:panelGroup> </f:subview> \ No newline at end of file