[jboss-cvs] JBossAS SVN: r101830 - 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
Thu Mar 4 09:58:49 EST 2010
Author: lvlcek at redhat.com
Date: 2010-03-04 09:58:49 -0500 (Thu, 04 Mar 2010)
New Revision: 101830
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/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/searchReservation.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 2010-03-04 14:53:27 UTC (rev 101829)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java 2010-03-04 14:58:49 UTC (rev 101830)
@@ -13,8 +13,6 @@
public class ReferenceData
{
private SelectItem[] equipmentTypes;
- private SelectItem[] equipments;
-
private EquipmentService equipmentService;
public void init()
@@ -27,15 +25,6 @@
equipmentTypes[i++] = new SelectItem(type);
}
- 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()
@@ -43,12 +32,6 @@
return equipmentTypes;
}
- public SelectItem[] getAllEquipments()
- {
- return equipments;
- }
-
-
public EquipmentService getEquipmentService()
{
return equipmentService;
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 2010-03-04 14:53:27 UTC (rev 101829)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2010-03-04 14:58:49 UTC (rev 101830)
@@ -15,16 +15,16 @@
<bean id="reservationCreate" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationCreate" scope="session" init-method="init">
<property name="reservationService" ref="reservationService"/>
<property name="accountService" ref="accountService"/>
- <property name="accountFilter" ref="accountFilter"/>
- <property name="equipmentFilter" ref="equipmentFilter"/>
+ <property name="accountFilter" ref="accountFilterCreate"/>
+ <property name="equipmentFilter" ref="equipmentFilterCreate"/>
</bean>
<bean id="reservationSearch" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationSearch" scope="session">
<property name="reservationService" ref="reservationService"/>
<property name="tableState" ref="reservationSearchTableState"/>
<property name="reservationSearchOptions" ref="reservationSearchOptions"/>
- <property name="accountFilter" ref="accountFilter"/>
- <property name="equipmentFilter" ref="equipmentFilter"/>
+ <property name="accountFilter" ref="accountFilterSearch"/>
+ <property name="equipmentFilter" ref="equipmentFilterSearch"/>
</bean>
<bean id="reservationSearchTableState" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationTableState" scope="session"/>
@@ -33,18 +33,27 @@
<property name="equipmentService" ref="equipmentService"/>
</bean>
- <bean id="accountFilter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.AccountFilter" scope="session">
+ <!-- *FilterSearch beans are used by reservationSearch -->
+ <bean id="accountFilterSearch" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.AccountFilter" scope="session">
<property name="accountService" ref="accountService"/>
</bean>
- <bean id="equipmentFilter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.EquipmentFilter" scope="session">
+ <bean id="equipmentFilterSearch" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.EquipmentFilter" scope="session">
<property name="equipmentService" ref="equipmentService"/>
</bean>
+
+ <!-- *FilterCreate beans are used by reservationCreate -->
+ <bean id="accountFilterCreate" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.AccountFilter" scope="session">
+ <property name="accountService" ref="accountService"/>
+ </bean>
+
+ <bean id="equipmentFilterCreate" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.EquipmentFilter" scope="session">
+ <property name="equipmentService" ref="equipmentService"/>
+ </bean>
<bean id="equipmentTypeConverter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.converter.EquipmentTypeConverter"/>
<!-- Application scoped service -->
- <!-- TODO remove if not needed -->
<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 2010-03-04 14:53:27 UTC (rev 101829)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml 2010-03-04 14:58:49 UTC (rev 101830)
@@ -16,20 +16,20 @@
<f:facet name="header">Filter accounts</f:facet>
<h:form>
Type subscriber name:
- <h:inputText id="searchField" value="#{accountFilter.subscriberNameFragment}"
+ <h:inputText id="searchField" value="#{accountFilterCreate.subscriberNameFragment}"
label="Search name"/>
<rich:hotKey selector="##{rich:clientId('searchField')}" key="return"
handler="#{rich:element('searchButton')}.onclick();return false;"/>
- <a4j:commandButton id="searchButton" value="Search" action="#{accountFilter.searchAccounts}"
+ <a4j:commandButton id="searchButton" value="Search" action="#{accountFilterCreate.searchAccounts}"
reRender="accountsTable"/>
</h:form>
</rich:panel>
<rich:panel>
<f:facet name="header">Select Account</f:facet>
<h:form id="AccountSelectForm">
- <rich:extendedDataTable id="accountsTable" value="#{accountFilter}" var="account"
+ <rich:extendedDataTable id="accountsTable" value="#{accountFilterCreate}" var="account"
selectionMode="single"
- selection="#{accountFilter.selection}"
+ selection="#{accountFilterCreate.selection}"
enableContextMenu="true"
height="250px"
rows="5">
@@ -74,7 +74,7 @@
<f:facet name="footer">
<rich:datascroller id="scrollerAccount" for="accountsTable" maxPages="5"
- page="#{accountFilter.currentPage}"/>
+ page="#{accountFilterCreate.currentPage}"/>
</f:facet>
</rich:extendedDataTable>
</h:form>
@@ -85,9 +85,9 @@
<rich:panel>
<f:facet name="header">Select Equipment</f:facet>
<h:form id="EquipmentSelectForm">
- <rich:extendedDataTable id="equipmentsTable" value="#{equipmentFilter}" var="equipment"
+ <rich:extendedDataTable id="equipmentsTable" value="#{equipmentFilterCreate}" var="equipment"
selectionMode="single"
- selection="#{equipmentFilter.selection}"
+ selection="#{equipmentFilterCreate.selection}"
enableContextMenu="true"
height="250px"
rows="5">
@@ -118,7 +118,7 @@
<f:facet name="footer">
<rich:datascroller id="scrollerEquipment" for="equipmentsTable" maxPages="5"
- page="#{equipmentFilter.currentPage}"/>
+ page="#{equipmentFilterCreate.currentPage}"/>
</f:facet>
</rich:extendedDataTable>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml 2010-03-04 14:53:27 UTC (rev 101829)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml 2010-03-04 14:58:49 UTC (rev 101830)
@@ -121,20 +121,20 @@
<f:facet name="header">Filter accounts</f:facet>
<h:form>
Type subscriber name:
- <h:inputText id="searchField" value="#{accountFilter.subscriberNameFragment}"
+ <h:inputText id="searchField" value="#{accountFilterSearch.subscriberNameFragment}"
label="Search name"/>
<rich:hotKey selector="##{rich:clientId('searchField')}" key="return"
handler="#{rich:element('searchButton')}.onclick();return false;"/>
- <a4j:commandButton id="searchButton" value="Search" action="#{accountFilter.searchAccounts}"
+ <a4j:commandButton id="searchButton" value="Search" action="#{accountFilterSearch.searchAccounts}"
reRender="accountsTable"/>
</h:form>
</rich:panel>
<rich:panel>
<f:facet name="header">Select Account</f:facet>
<h:form id="AccountSelectForm">
- <rich:extendedDataTable id="accountsTable" value="#{accountFilter}" var="account"
+ <rich:extendedDataTable id="accountsTable" value="#{accountFilterSearch}" var="account"
selectionMode="single"
- selection="#{accountFilter.selection}"
+ selection="#{accountFilterSearch.selection}"
enableContextMenu="true"
height="250px"
rows="5">
@@ -179,7 +179,7 @@
<f:facet name="footer">
<rich:datascroller id="scrollerAccount" for="accountsTable" maxPages="5"
- page="#{accountFilter.currentPage}"/>
+ page="#{accountFilterSearch.currentPage}"/>
</f:facet>
</rich:extendedDataTable>
</h:form>
@@ -190,9 +190,9 @@
<rich:panel>
<f:facet name="header">Select Equipment</f:facet>
<h:form id="EquipmentSelectForm">
- <rich:extendedDataTable id="equipmentsTable" value="#{equipmentFilter}" var="equipment"
+ <rich:extendedDataTable id="equipmentsTable" value="#{equipmentFilterSearch}" var="equipment"
selectionMode="single"
- selection="#{equipmentFilter.selection}"
+ selection="#{equipmentFilterSearch.selection}"
enableContextMenu="true"
height="250px"
rows="5">
@@ -223,7 +223,7 @@
<f:facet name="footer">
<rich:datascroller id="scrollerEquipment" for="equipmentsTable" maxPages="5"
- page="#{equipmentFilter.currentPage}"/>
+ page="#{equipmentFilterSearch.currentPage}"/>
</f:facet>
</rich:extendedDataTable>
More information about the jboss-cvs-commits
mailing list