[jboss-cvs] JBossAS SVN: r98078 - in projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main: webapp and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 21 08:19:39 EST 2009
Author: lvlcek at redhat.com
Date: 2009-12-21 08:19:39 -0500 (Mon, 21 Dec 2009)
New Revision: 98078
Modified:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationCreate.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createResult.xhtml
Log:
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java 2009-12-21 12:43:51 UTC (rev 98077)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java 2009-12-21 13:19:39 UTC (rev 98078)
@@ -1,30 +1,54 @@
package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
import org.jboss.snowdrop.samples.sportsclub.service.EquipmentService;
import javax.faces.model.SelectItem;
+import java.util.Collection;
/**
* @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
*/
public class ReferenceData
{
+ private SelectItem[] equipmentTypes;
+ private SelectItem[] equipments;
+
private EquipmentService equipmentService;
- public SelectItem[] getEquipmentTypes()
+ public void init()
{
- EquipmentType[] types = getEquipmentService().getEquipmentTypes();
- SelectItem[] items = new SelectItem[types.length];
+ EquipmentType[] types = equipmentService.getEquipmentTypes();
+ equipmentTypes = new SelectItem[types.length];
int i = 0;
for (EquipmentType type : types)
{
- items[i++] = new SelectItem(type);
+ equipmentTypes[i++] = new SelectItem(type);
}
- return items;
+
+ Collection<Equipment> eqps = equipmentService.getAllEquipments();
+ equipments = new SelectItem[eqps.size()];
+ i = 0;
+ for (Equipment e : eqps)
+ {
+ String label = e.getEquipmentType().name() + ", " + e.getDescription();
+ equipments[i++] = new SelectItem(e, label);
+ }
+
}
+ public SelectItem[] getEquipmentTypes()
+ {
+ return equipmentTypes;
+ }
+ public SelectItem[] getAllEquipments()
+ {
+ return equipments;
+ }
+
+
public EquipmentService getEquipmentService()
{
return equipmentService;
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationCreate.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationCreate.java 2009-12-21 12:43:51 UTC (rev 98077)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationCreate.java 2009-12-21 13:19:39 UTC (rev 98078)
@@ -19,7 +19,6 @@
public class ReservationCreate
{
private ReservationService reservationService;
- private EquipmentService equipmentService;
private AccountService accountService;
private Reservation reservation;
@@ -30,7 +29,7 @@
Date to;
Calendar cal = Calendar.getInstance(Locale.US);
- cal.clear();
+ //cal.clear();
from = cal.getTime();
cal.set(Calendar.MONTH, cal.get(Calendar.MONTH) + 1);
@@ -43,19 +42,6 @@
reservation.setTo(to);
}
- public SelectItem[] getAllEquipments()
- {
- Collection<Equipment> equipments = equipmentService.getAllEquipments();
- SelectItem[] items = new SelectItem[equipments.size()];
- int i = 0;
- for (Equipment e : equipments)
- {
- String label = e.getEquipmentType().name() + ", " + e.getDescription();
- items[i++] = new SelectItem(e, label);
- }
- return items;
- }
-
public SelectItem[] getAllAccounts()
{
Collection<Account> accounts = accountService.getAllAccounts();
@@ -98,16 +84,6 @@
this.reservation = reservation;
}
- public EquipmentService getEquipmentService()
- {
- return equipmentService;
- }
-
- public void setEquipmentService(EquipmentService equipmentService)
- {
- this.equipmentService = equipmentService;
- }
-
public AccountService getAccountService()
{
return accountService;
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2009-12-21 12:43:51 UTC (rev 98077)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2009-12-21 13:19:39 UTC (rev 98078)
@@ -22,7 +22,6 @@
<bean id="reservationCreate" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationCreate" scope="request" init-method="init">
<property name="reservationService" ref="reservationService"/>
- <property name="equipmentService" ref="equipmentService"/>
<property name="accountService" ref="accountService"/>
</bean>
@@ -36,7 +35,7 @@
<!-- Application scoped service -->
- <bean id="referenceData" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReferenceData">
+ <bean id="referenceData" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReferenceData" init-method="init">
<property name="equipmentService" ref="equipmentService"/>
</bean>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml 2009-12-21 12:43:51 UTC (rev 98077)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml 2009-12-21 13:19:39 UTC (rev 98078)
@@ -8,30 +8,42 @@
<ui:define name="content">
<rich:panel>
<h:form>
- <h:panelGrid columns="2" >
+ <h:panelGrid columns="2">
<h:outputLabel value="Equipment"/>
<h:panelGroup>
- <rich:inplaceSelect id="equipment" defaultLabel="Click to enter" value="#{reservationCreate.reservation.equipment}" converter="#{equipmentConverter}">
- <f:selectItems value="#{reservationCreate.allEquipments}"/>
+ <rich:inplaceSelect id="equipment" defaultLabel="Click to enter"
+ value="#{reservationCreate.reservation.equipment}"
+ required="true"
+ converter="#{equipmentConverter}">
+ <f:selectItems value="#{referenceData.allEquipments}"/>
</rich:inplaceSelect>
<h:message for="equipment" style="color:RED"/>
</h:panelGroup>
<h:outputLabel value="Account"/>
<h:panelGroup>
- <rich:inplaceSelect id="account" defaultLabel="Click to enter" value="#{reservationCreate.reservation.account}" converter="#{accountConverter}">
+ <rich:inplaceSelect id="account" defaultLabel="Click to enter"
+ value="#{reservationCreate.reservation.account}"
+ required="true"
+ converter="#{accountConverter}">
<f:selectItems value="#{reservationCreate.allAccounts}"/>
</rich:inplaceSelect>
<h:message for="account" style="color:RED"/>
</h:panelGroup>
<h:outputLabel value="From"/>
- <rich:calendar id="from" value="#{reservationCreate.reservation.from}"/>
+ <h:panelGroup>
+ <rich:calendar id="from" value="#{reservationCreate.reservation.from}" required="true"/>
+ <h:message for="from" style="color:RED"/>
+ </h:panelGroup>
<h:outputLabel value="To"/>
- <rich:calendar id="to" value="#{reservationCreate.reservation.to}"/>
-
+ <h:panelGroup>
+ <rich:calendar id="to" value="#{reservationCreate.reservation.to}" required="true"/>
+ <h:message for="to" style="color:RED"/>
+ </h:panelGroup>
+
</h:panelGrid>
<h:commandButton value="Save" action="#{reservationCreate.create}"/>
</h:form>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createResult.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createResult.xhtml 2009-12-21 12:43:51 UTC (rev 98077)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createResult.xhtml 2009-12-21 13:19:39 UTC (rev 98078)
@@ -7,7 +7,7 @@
template="layout/template.xhtml">
<ui:define name="content">
<rich:panel>
- Reservation #<h:outputText value="#{reservationCreate.reservation.id}"/>
+ Reservation #<h:outputText value="#{reservationCreate.reservation.id}"/> created.
</rich:panel>
</ui:define>
</ui:composition>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list