6:07 a.m.
Author: ilya_shaikovsky
Date: 2010-05-30 07:07:02 -0400 (Sun, 30 May 2010)
New Revision: 17398
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/region/RegionBean.java
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/region/region.xhtml
Log:
region sample corrected
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2010-05-30
10:51:31 UTC (rev 17397)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2010-05-30
11:07:02 UTC (rev 17398)
@@ -1,11 +1,16 @@
package org.richfaces.demo.common.navigation;
+import java.io.Serializable;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
-public class DemoDescriptor extends BaseDescriptor {
+public class DemoDescriptor extends BaseDescriptor implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8753024677503886789L;
private static final String BASE_SAMPLES_DIR = "/richfaces/";
private List<SampleDescriptor> samples;
@@ -17,7 +22,7 @@
}
return samples.get(0);
}
-
+
@XmlElementWrapper(name = "samples")
@XmlElement(name = "sample")
public List<SampleDescriptor> getSamples() {
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/region/RegionBean.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/region/RegionBean.java 2010-05-30
10:51:31 UTC (rev 17397)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/region/RegionBean.java 2010-05-30
11:07:02 UTC (rev 17398)
@@ -15,8 +15,8 @@
*
*/
private static final long serialVersionUID = -3844974441732156513L;
- private UserBean user1;
- private UserBean user2;
+ private UserBean user1 = new UserBean();
+ private UserBean user2 = new UserBean();
public UserBean getUser1() {
return user1;
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/region/region.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/region/region.xhtml 2010-05-30
10:51:31 UTC (rev 17397)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/region/region.xhtml 2010-05-30
11:07:02 UTC (rev 17398)
@@ -24,11 +24,11 @@
just wrapped to region without any additional execute definitions.</p>
<h:form>
<h:panelGrid columns="2">
- <rich:panel id="userInfoPanel1">
+ <h:panelGrid>
<f:facet name="header">
User Info Panel explicitly execute'd by Id
</f:facet>
- <h:panelGrid columns="2">
+ <h:panelGrid columns="2" id="userInfoPanel1">
<h:outputText value="User Name: " />
<h:inputText value="#{regionBean.user1.name}">
<a4j:ajax render="echopanel1" event="blur"
@@ -40,7 +40,7 @@
execute="userInfoPanel1" />
</h:inputText>
</h:panelGrid>
- </rich:panel>
+ </h:panelGrid>
<h:panelGrid columns="2" id="echopanel1">
<f:facet name="header">
Echo Panel
@@ -54,23 +54,23 @@
</h:form>
<h:form>
<h:panelGrid columns="2">
- <rich:panel>
+ <h:panelGrid>
<f:facet name="header">
User Info Panel with Region
</f:facet>
<a4j:region>
<h:panelGrid columns="2">
<h:outputText value="User Name: " />
- <h:inputText value="#{regionBean.user1.name}">
+ <h:inputText value="#{regionBean.user2.name}">
<a4j:ajax render="echopanel2" event="blur" />
</h:inputText>
<h:outputText value="User email: " />
- <h:inputText value="#{regionBean.user1.email}">
+ <h:inputText value="#{regionBean.user2.email}">
<a4j:ajax render="echopanel2" event="blur" />
</h:inputText>
</h:panelGrid>
</a4j:region>
- </rich:panel>
+ </h:panelGrid>
<h:panelGrid columns="2" id="echopanel2">
<f:facet name="header">
Echo Panel