[richfaces-svn-commits] JBoss Rich Faces SVN: r2316 - in trunk/test-applications/jsp/src/main: webapp/Gmap and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: ayanul
Date: 2007-08-17 09:13:29 -0400 (Fri, 17 Aug 2007)
New Revision: 2316

Modified:
   trunk/test-applications/jsp/src/main/java/gmap/Gmap.java
   trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp
   trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Gmap.xml
Log:
http://jira.jboss.com/jira/browse/RF-613

Modified: trunk/test-applications/jsp/src/main/java/gmap/Gmap.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/gmap/Gmap.java	2007-08-17 13:02:18 UTC (rev 2315)
+++ trunk/test-applications/jsp/src/main/java/gmap/Gmap.java	2007-08-17 13:13:29 UTC (rev 2316)
@@ -3,14 +3,14 @@
 public class Gmap {
 
 	private String zoom;
-	private String continuousZoom;
-	private String doubleClickZoom;
-	private String dragging;
+	private boolean continuousZoom;
+	private boolean doubleClickZoom;
+	private boolean dragging;
 
 	public Gmap() {
-		continuousZoom = "false";
-		doubleClickZoom = "false";
-		dragging = "false";
+		continuousZoom = false;
+		doubleClickZoom = false;
+		dragging = false;
 	}
 
 	public String getZoom() {
@@ -27,27 +27,39 @@
 		return null;
 	}
 
-	public String getContinuousZoom() {
+	public boolean isContinuousZoom() {
 		return continuousZoom;
 	}
 
-	public void setContinuousZoom(String continuousZoom) {
+	public void setContinuousZoom(boolean continuousZoom) {
 		this.continuousZoom = continuousZoom;
 	}
 
-	public String getDoubleClickZoom() {
+	public boolean isDoubleClickZoom() {
 		return doubleClickZoom;
 	}
 
-	public void setDoubleClickZoom(String doubleClickZoom) {
+	public void setDoubleClickZoom(boolean doubleClickZoom) {
 		this.doubleClickZoom = doubleClickZoom;
 	}
 
-	public String getDragging() {
+	public boolean isDragging() {
 		return dragging;
 	}
 
-	public void setDragging(String dragging) {
+	public void setDragging(boolean dragging) {
 		this.dragging = dragging;
 	}
+
+	public String getContinuousZoomAsString() {
+		return String.valueOf(continuousZoom);
+	}
+
+	public String getDoubleClickZoomAsString() {
+		return String.valueOf(continuousZoom);
+	}
+
+	public String getDraggingAsString() {
+		return String.valueOf(continuousZoom);
+	}
 }

Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp	2007-08-17 13:02:18 UTC (rev 2315)
+++ trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp	2007-08-17 13:13:29 UTC (rev 2316)
@@ -12,9 +12,10 @@
 		<rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map"
 			gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA"
 			style="width:500px;height:400px"
-			enableContinuousZoom="#{gmap.continuousZoom}"
-			enableDoubleClickZoom="#{gmap.doubleClickZoom}"
-			enableDragging="#{gmap.dragging}" />
+			enableContinuousZoom="#{gmap.continuousZoomAsString}"
+			enableDoubleClickZoom="#{gmap.doubleClickZoomAsString}"
+			enableDragging="#{gmap.draggingAsString}"
+			/>
 
 		<h:panelGroup>
 			<f:verbatim>
@@ -68,10 +69,10 @@
 
 		<a4j:outputPanel id="zoomer">
 			<script>
-		  function zoomIt() {
-		   map.setZoom(#{gmap.zoom});
-		  }
-		</script>
+			  function zoomIt() {
+	   			map.setZoom(</f:verbatim>#{gmap.zoom});
+			  }
+			</script>
 		</a4j:outputPanel>
 
 		<a4j:outputPanel>

Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Gmap.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Gmap.xml	2007-08-17 13:02:18 UTC (rev 2315)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Gmap.xml	2007-08-17 13:13:29 UTC (rev 2316)
@@ -5,7 +5,7 @@
  <managed-bean>
   <managed-bean-name>gmap</managed-bean-name>
   <managed-bean-class>gmap.Gmap</managed-bean-class>
-  <managed-bean-scope>session</managed-bean-scope>
+  <managed-bean-scope>request</managed-bean-scope>
   <managed-property>
    <property-name>zoom</property-name>
    <property-class>java.lang.String</property-class>