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

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

Author: ayanul
Date: 2007-08-29 07:55:22 -0400 (Wed, 29 Aug 2007)
New Revision: 2562

Modified:
   trunk/test-applications/jsp/src/main/java/paint2D/Paint2D.java
   trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp
Log:
http://jira.jboss.com/jira/browse/RF-753

Modified: trunk/test-applications/jsp/src/main/java/paint2D/Paint2D.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/paint2D/Paint2D.java	2007-08-29 11:41:29 UTC (rev 2561)
+++ trunk/test-applications/jsp/src/main/java/paint2D/Paint2D.java	2007-08-29 11:55:22 UTC (rev 2562)
@@ -21,7 +21,16 @@
 	private String bgcolor;
 	private String border;
 	private boolean rendered;
+	private boolean style;
 
+	public boolean isStyle() {
+		return style;
+	}
+
+	public void setStyle(boolean style) {
+		this.style = style;
+	}
+
 	public boolean isRerender() {
 		return rendered;
 	}
@@ -46,7 +55,16 @@
 		title = "Pain2D title";
 		bgcolor = "white";
 		rendered = true;
+		border = "4px";
+		style = false;
 	}
+	
+	public String getStyleString() {
+		if(style)
+			return "style";
+		else 
+			return "";
+	}
 
 	public void paint(Graphics2D g2, Object obj) {
 		PaintData data = (PaintData) obj;

Modified: trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp	2007-08-29 11:41:29 UTC (rev 2561)
+++ trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp	2007-08-29 11:55:22 UTC (rev 2562)
@@ -13,7 +13,7 @@
 	<h:form>
 		<rich:paint2D id="paint2d" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" align="#{paint2D.align}"
 			hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}" format="#{paint2D.format}" title="#{paint2D.title}"
-			styleClass="style" border="#{paint2D.border}" rendered="#{paint2D.rendered}" />
+			styleClass="#{paint2D.styleString}" border="#{paint2D.border}" rendered="#{paint2D.rendered}" />
 
 		<h:panelGrid columns="2" cellpadding="5px" border="2">
 			<h:outputText value="Text"></h:outputText>
@@ -21,11 +21,6 @@
 				<a4j:support event="onkeyup" reRender="paint2d" />
 			</h:inputText>
 
-			<h:outputText value="Border: "></h:outputText>
-			<h:inputText value="#{paint2D.border}">
-				<a4j:support event="onclick" reRender="paint2d"></a4j:support>
-			</h:inputText>
-
 			<h:outputText value="Width: "></h:outputText>
 			<h:inputText value="#{paint2D.width}">
 				<a4j:support event="onchange" reRender="paint2d"></a4j:support>
@@ -81,6 +76,16 @@
 				<a4j:support event="onclick" reRender="paint2d"></a4j:support>
 			</h:selectOneMenu>
 
+			<h:outputText value="Style" />
+			<h:selectBooleanCheckbox value="#{paint2D.style}" >
+				<a4j:support event="onclick" reRender="paint2d,borderID" />
+			</h:selectBooleanCheckbox>
+
+			<h:outputText value="Border: "></h:outputText>
+			<h:inputText id="borderID" disabled="#{paint2D.style}" value="#{paint2D.border}">
+				<a4j:support event="onchange" reRender="paint2d"></a4j:support>
+			</h:inputText>
+
 			<h:outputText value="Rendered"></h:outputText>
 			<h:selectBooleanCheckbox value="#{paint2D.rendered}">
 				<a4j:support event="onclick" reRender="paint2d"></a4j:support>