[jboss-cvs] JBossAS SVN: r97442 - in projects/snowdrop/trunk/documentation/samples/sportsclub: sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Dec 4 01:24:29 EST 2009


Author: marius.bogoevici
Date: 2009-12-04 01:24:28 -0500 (Fri, 04 Dec 2009)
New Revision: 97442

Added:
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountBase.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountEdit.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceDataHelper.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/editAccount.xhtml
Removed:
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java
Modified:
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/MembershipRepository.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateMembershipRepository.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionService.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountCreate.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/MembershipConverter.java
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/faces-config.xml
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/web.xml
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createForm.xhtml
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createResult.xhtml
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml
   projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
Log:
More changes for the layout.

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/MembershipRepository.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/MembershipRepository.java	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/MembershipRepository.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -10,4 +10,7 @@
 public interface MembershipRepository extends Repository<Membership, String>
 {
    List<Membership> findAllActiveMembershipTypes();
+
+   List<String> findAllMembershipCodes();
+
 }

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateMembershipRepository.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateMembershipRepository.java	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateMembershipRepository.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -30,4 +30,10 @@
    {
       return (Integer)getCurrentSession().createCriteria(Membership.class).setProjection(Projections.count("code")).uniqueResult();
    }
+
+   public List<String> findAllMembershipCodes()
+   {
+      Criteria query = getCurrentSession().createCriteria(Membership.class).add(Restrictions.eq("active", true)).setProjection(Projections.property("code"));
+      return query.list();
+   }
 }

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionService.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionService.java	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionService.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -1,10 +1,12 @@
 package org.jboss.snowdrop.samples.sportsclub.ejb;
 
 import javax.ejb.Local;
+import javax.ejb.TransactionAttribute;
 import java.util.Collection;
 import java.util.List;
 
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Membership;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Person;
 
@@ -14,11 +16,11 @@
 @Local
 public interface SubscriptionService
 {
-   Account createAccountForPerson(Person person, Membership membership);
-
    int countAccountsBySubscriberName(String name);
 
    List<Account> findAccountsBySubscriberName(String name, int minIndex, int maxIndex);
 
-   Collection<Membership> getMembershipTypes();
+   List<String> getMembershipTypes();
+
+   Account createAccount(Person person, String membershipCode, BillingType billingType);
 }

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -4,11 +4,12 @@
 import javax.ejb.TransactionAttribute;
 import javax.interceptor.Interceptors;
 
-import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 import org.jboss.annotation.spring.Spring;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Membership;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Person;
 import org.jboss.snowdrop.samples.sportsclub.domain.repository.AccountRepository;
@@ -57,18 +58,21 @@
    }
 
    @TransactionAttribute
-   public Account createAccountForPerson(Person person, Membership membership)
+   public Account createAccount(Person person, String membershipCode, BillingType billingType)
    {
       Account account = new Account();
       account.setSubscriber(person);
-      account.setMembership(membership);
+      membershipRepository.findById(membershipCode);
+      account.setMembership(membershipRepository.findById(membershipCode));
+      account.setBillingType(billingType);
+      account.setCreationDate(new Date());
       personRepository.save(person);
       accountRepository.save(account);
       return account;
    }
 
-   public Collection<Membership> getMembershipTypes()
+   public List<String> getMembershipTypes()
    {
-      return membershipRepository.findAllActiveMembershipTypes();
+      return membershipRepository.findAllMembershipCodes();
    }
 }

Added: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountBase.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountBase.java	                        (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountBase.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -0,0 +1,51 @@
+package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.EJB;
+import javax.faces.model.SelectItem;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Address;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Name;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Person;
+import org.jboss.snowdrop.samples.sportsclub.ejb.SubscriptionService;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class AccountBase
+{
+   @EJB
+   protected SubscriptionService subscriptionService;
+   private ReferenceDataHelper referenceDataHelper;
+   protected Account account = null;
+   private SelectItem[] billingTypeItems;
+   private SelectItem[] membershipCodes;
+
+   public void setReferenceDataHelper(ReferenceDataHelper referenceDataHelper)
+   {
+      this.referenceDataHelper = referenceDataHelper;
+   }
+
+   @PostConstruct
+   void init()
+   {
+      membershipCodes = referenceDataHelper.getMembershipCodes();
+      billingTypeItems = referenceDataHelper.getBillingTypes();
+   }
+
+   public Account getAccount()
+   {
+      return account;
+   }
+
+   public SelectItem[] getBillingTypeItems()
+   {
+      return billingTypeItems;
+   }
+
+   public SelectItem[] getSelectableMembershipCodes()
+   {
+      return membershipCodes;
+   }
+}

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountCreate.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountCreate.java	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountCreate.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -1,142 +1,65 @@
 package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
 
+import javax.annotation.PostConstruct;
+import javax.ejb.EJB;
+import javax.faces.model.SelectItem;
+
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Address;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Membership;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Name;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Person;
 import org.jboss.snowdrop.samples.sportsclub.ejb.SubscriptionService;
 
-import javax.ejb.EJB;
-
 /**
  * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
  */
-public class AccountCreate
+public class AccountCreate extends AccountBase
 {
-   @EJB
-   private SubscriptionService subscriptionService;
 
-   private ReferenceData referenceData;
+   private Person person;
 
-   private String firstName;
-
-   private String middleName;
-
-   private String lastName;
-
-   private String city;
-
-   private String provinceOrState;
-
-   private String address;
-
-   private Account account = null;
-
-   private Membership membership = null;
-
    private BillingType billingType;
 
-   public void setReferenceData(ReferenceData referenceData)
+   @PostConstruct
+   public void initPerson()
    {
-      this.referenceData = referenceData;
+      person = new Person();
+      person.setAddress(new Address());
+      person.setName(new Name());
    }
 
-   public String getAddress()
-   {
-      return address;
-   }
+   // reference data
 
-   public void setAddress(String address)
-   {
-      this.address = address;
-   }
+   private String membershipType;
 
-   public String getCity()
+   public Person getPerson()
    {
-      return city;
+      return person;
    }
 
-   public void setCity(String city)
+   public void setPerson(Person person)
    {
-      this.city = city;
+      this.person = person;
    }
 
-   public String getProvinceOrState()
-   {
-      return provinceOrState;
-   }
-
-   public void setProvinceOrState(String provinceOrState)
-   {
-      this.provinceOrState = provinceOrState;
-   }
-
-   public String getFirstName()
-   {
-      return firstName;
-   }
-
-   public void setFirstName(String firstName)
-   {
-      this.firstName = firstName;
-   }
-
-   public String getLastName()
-   {
-      return lastName;
-   }
-
-   public void setLastName(String lastName)
-   {
-      this.lastName = lastName;
-   }
-
-   public Account getAccount()
-   {
-      return account;
-   }
-
    public String create()
    {
-      Person person = new Person();
-      person.setAddress(new Address());
-      person.setName(new Name());
+      account = subscriptionService.createAccount(person, membershipType, billingType);
 
-      person.getName().setFirstName(firstName);
-      person.getName().setLastName(lastName);
-
-
-      person.getAddress().setCity(city);
-      person.getAddress().setProvinceOrState(this.provinceOrState);
-      person.getAddress().setStreetAddress(address);
-
-
-      account = subscriptionService.createAccountForPerson(person, membership);
       return "success";
    }
 
-   public void setMiddleName(String middleName)
+   public void setMembershipType(String membershipType)
    {
-      this.middleName = middleName;
+      this.membershipType = membershipType;
    }
 
-   public String getMiddleName()
+   public String getMembershipType()
    {
-      return middleName;
+      return membershipType;
    }
 
-   public void setMembership(Membership membership)
-   {
-      this.membership = membership;
-   }
-
-   public Membership getMembership()
-   {
-      return membership;
-   }
-
    public void setBillingType(BillingType billingType)
    {
       this.billingType = billingType;
@@ -146,4 +69,5 @@
    {
       return billingType;
    }
+
 }

Added: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountEdit.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountEdit.java	                        (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountEdit.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -0,0 +1,23 @@
+package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.EJB;
+import javax.faces.model.SelectItem;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
+import org.jboss.snowdrop.samples.sportsclub.ejb.SubscriptionService;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class AccountEdit extends AccountBase
+{
+
+  @PostConstruct
+  public void initAccount()
+  {
+     
+  }
+
+}

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/MembershipConverter.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/MembershipConverter.java	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/MembershipConverter.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -2,6 +2,8 @@
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
+import javax.faces.component.UISelectItem;
+import javax.faces.component.UISelectOne;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
@@ -13,26 +15,18 @@
  */
 public class MembershipConverter implements Converter
 {
-
-   private ReferenceData referenceData;
-
-   public void setReferenceData(ReferenceData referenceData)
-   {
-      this.referenceData = referenceData;
-   }
-
    public Object getAsObject(FacesContext context, UIComponent component, String value)
    {
       if (value == null)
          return null;
-      if (!referenceData.getMembershipTypes().containsKey(value))
+      if (component instanceof UISelectOne)
       {
-         FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR,"Wrong code", "Membership code " + value + " does not exist or is not active.");
-         throw new ConverterException(message);
+         return ((UISelectOne)component);
       }
-      return referenceData.getMembershipTypes().get(value);
+      return null;
    }
 
+
    public String getAsString(FacesContext context, UIComponent component, Object value)
    {
       if (value == null)

Deleted: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -1,73 +0,0 @@
-package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.faces.model.SelectItem;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Membership;
-import org.jboss.snowdrop.samples.sportsclub.ejb.SubscriptionService;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
-public class ReferenceData
-{
-
-   @EJB
-   SubscriptionService subscriptionService;
-
-   Map<String, Membership> membershipTypes;
-
-   SelectItem[] billingTypes;
-
-   ReentrantLock lock = new ReentrantLock();
-
-
-   @PostConstruct
-   void init()
-   {
-      billingTypes = new SelectItem[BillingType.values().length];
-      int i=0;
-      for (BillingType billingType: BillingType.values())
-      {
-         billingTypes[i++] = new SelectItem(billingType);
-      }
-   }
-
-   public SelectItem[] getBillingTypes()
-   {
-      return billingTypes;
-   }
-
-   public Map<String, Membership> getMembershipTypes()
-   {
-
-      if (membershipTypes == null)
-      {
-         try
-         {
-            lock.lock();
-            if (membershipTypes == null)
-            {
-               Collection<Membership> memberships = subscriptionService.getMembershipTypes();
-               membershipTypes = new HashMap<String, Membership>();
-               for (Membership membership: memberships)
-               {
-                  membershipTypes.put(membership.getCode(), membership);
-               }
-            }
-         }
-         finally
-         {
-            lock.unlock();
-         }
-      }
-
-      return membershipTypes;
-   }
-}

Copied: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceDataHelper.java (from rev 97331, projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceData.java)
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceDataHelper.java	                        (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReferenceDataHelper.java	2009-12-04 06:24:28 UTC (rev 97442)
@@ -0,0 +1,64 @@
+package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.EJB;
+import javax.faces.model.SelectItem;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Membership;
+import org.jboss.snowdrop.samples.sportsclub.ejb.SubscriptionService;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+public class ReferenceDataHelper
+{
+
+   @EJB
+   SubscriptionService subscriptionService;
+
+   private SelectItem[] billingTypes;
+
+   @PostConstruct
+   void init()
+   {
+      initBillingTypes();
+   }
+
+   private void initBillingTypes()
+   {
+      billingTypes = new SelectItem[BillingType.values().length];
+      int i=0;
+      for (BillingType billingType: BillingType.values())
+      {
+         billingTypes[i++] = new SelectItem(billingType);
+      }
+   }
+
+   public SelectItem[] getBillingTypes()
+   {
+      return billingTypes;
+   }
+
+
+
+   public SelectItem[] getMembershipCodes()
+   {
+      List<String> membershipCodes = subscriptionService.getMembershipTypes();
+
+      SelectItem[] selectItems = new SelectItem[membershipCodes.size()];
+      int i = 0;
+      for (String membershipCode: membershipCodes)
+      {
+         selectItems[i++] = new SelectItem(membershipCode);
+      }
+      
+      return selectItems;
+   }
+
+}

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/faces-config.xml	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/faces-config.xml	2009-12-04 06:24:28 UTC (rev 97442)
@@ -16,20 +16,20 @@
         <managed-bean-name>accountCreate</managed-bean-name>
         <managed-bean-class>org.jboss.snowdrop.samples.sportsclub.jsf.beans.AccountCreate</managed-bean-class>
         <managed-bean-scope>request</managed-bean-scope>
+        <managed-property>
+            <property-name>referenceDataHelper</property-name>
+            <value>#{referenceDataHelper}</value>
+        </managed-property>
     </managed-bean>
     <managed-bean>
-        <managed-bean-name>referenceData</managed-bean-name>
-        <managed-bean-class>org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReferenceData</managed-bean-class>
+        <managed-bean-name>referenceDataHelper</managed-bean-name>
+        <managed-bean-class>org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReferenceDataHelper</managed-bean-class>
         <managed-bean-scope>application</managed-bean-scope>
     </managed-bean>
     <managed-bean>
         <managed-bean-name>membershipConverter</managed-bean-name>
         <managed-bean-class>org.jboss.snowdrop.samples.sportsclub.jsf.beans.MembershipConverter</managed-bean-class>
         <managed-bean-scope>application</managed-bean-scope>
-        <managed-property>
-            <property-name>referenceData</property-name>
-            <value>#{referenceData}</value>
-        </managed-property>
     </managed-bean>
     <converter>
         <converter-id>enumConverter</converter-id>

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/web.xml	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/web.xml	2009-12-04 06:24:28 UTC (rev 97442)
@@ -34,7 +34,7 @@
 
     <context-param>
         <param-name>org.richfaces.SKIN</param-name>
-        <param-value>blueSky</param-value>
+        <param-value>wine</param-value>
     </context-param>
     
     <servlet>

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createForm.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createForm.xhtml	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createForm.xhtml	2009-12-04 06:24:28 UTC (rev 97442)
@@ -10,27 +10,26 @@
             <h:form>
                 <h:panelGrid columns="2">
                     <h:outputLabel value="First name"/>
-                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.firstName}"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.name.firstName}"/>
                     <h:outputLabel value="Middle name"/>
-                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.middleName}"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.name.middleName}"/>
                     <h:outputLabel value="Last name"/>
-                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.lastName}"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.name.lastName}"/>
                     <h:outputLabel value="Address"/>
-                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.address}"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.address.streetAddress}"/>
                     <h:outputLabel value="City"/>
-                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.city}"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.address.city}"/>
                     <h:outputLabel value="Province"/>
-                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.provinceOrState}"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.address.provinceOrState}"/>
                     <h:outputLabel value="Billing"/>
                     <rich:inplaceSelect defaultLabel="Click to select"
                                         value="#{accountCreate.billingType}">
                         <f:converter converterId="enumConverter" />
-                        <f:selectItems value="#{referenceData.billingTypes}"/>
+                        <f:selectItems value="#{accountCreate.billingTypeItems}"/>
                     </rich:inplaceSelect>
                     <h:outputLabel value="Membership"/>
-                    <rich:inplaceSelect defaultLabel="Click to select" value="#{accountCreate.membership}"
-                                        showControls="true" converter="#{membershipConverter}">
-                        <f:selectItems value="#{referenceData.membershipTypes}"/>
+                    <rich:inplaceSelect defaultLabel="Click to select" value="#{accountCreate.membershipType}">
+                        <f:selectItems value="#{accountCreate.selectableMembershipCodes}"/>
                     </rich:inplaceSelect>
                     <h:commandButton value="Save" action="#{accountCreate.create}"/>
                 </h:panelGrid>

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createResult.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createResult.xhtml	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createResult.xhtml	2009-12-04 06:24:28 UTC (rev 97442)
@@ -6,6 +6,8 @@
 	xmlns:a4j="http://richfaces.org/a4j"
 	template="layout/template.xhtml">
 	<ui:define name="content">
-       Created account #<h:outputText value="#{accountCreate.account.id}"/>
+        <rich:panel>
+            Account #<h:outputText value="#{accountCreate.account.id}"/>
+        </rich:panel>
 	</ui:define>
 </ui:composition>
\ No newline at end of file

Copied: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/editAccount.xhtml (from rev 97331, projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/createForm.xhtml)
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/editAccount.xhtml	                        (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/editAccount.xhtml	2009-12-04 06:24:28 UTC (rev 97442)
@@ -0,0 +1,40 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:rich="http://richfaces.org/rich"
+                xmlns:a4j="http://richfaces.org/a4j"
+                template="layout/template.xhtml">
+    <ui:define name="content">
+        <rich:panel>
+            <h:form>
+                <h:panelGrid columns="2">
+                    <h:outputLabel value="First name"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.name.firstName}"/>
+                    <h:outputLabel value="Middle name"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.name.middleName}"/>
+                    <h:outputLabel value="Last name"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.name.lastName}"/>
+                    <h:outputLabel value="Address"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.address.streetAddress}"/>
+                    <h:outputLabel value="City"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.address.city}"/>
+                    <h:outputLabel value="Province"/>
+                    <rich:inplaceInput defaultLabel="Click to enter" value="#{accountCreate.person.address.provinceOrState}"/>
+                    <h:outputLabel value="Billing"/>
+                    <rich:inplaceSelect defaultLabel="Click to select"
+                                        value="#{accountCreate.billingType}">
+                        <f:converter converterId="enumConverter" />
+                        <f:selectItems value="#{accountCreate.billingTypeItems}"/>
+                    </rich:inplaceSelect>
+                    <h:outputLabel value="Membership"/>
+                    <rich:inplaceSelect defaultLabel="Click to select" value="#{accountCreate.membershipType}">
+                        <f:selectItems value="#{accountCreate.selectableMembershipCodes}"/>
+                    </rich:inplaceSelect>
+                    <h:commandButton value="Save" action="#{accountCreate.create}"/>
+                </h:panelGrid>
+            </h:form>
+        </rich:panel>
+
+    </ui:define>
+</ui:composition>
\ No newline at end of file

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml	2009-12-04 06:24:28 UTC (rev 97442)
@@ -18,11 +18,11 @@
 
     <body class="main-body">
 
-    <div style="width: 100%; height: 116px; left: 0px;">
+    <div style="width: 100%; height: 82px; left: 0px;">
         <ui:include src="/includes/header.xhtml"/>
     </div>
-
-    <div style="height: 100%; width: 800px" id="content" class="clearfix">
+    
+    <div style="height: 100%; width: 800px" id="content" class="clearfix" align="center">
 		<ui:insert name="content"/>
 	</div>
 

Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml	2009-12-04 05:22:06 UTC (rev 97441)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml	2009-12-04 06:24:28 UTC (rev 97442)
@@ -25,6 +25,12 @@
                     <rich:dataTable id="searchResultsTable" value="#{accountSearch}" var="account" rows="5">
                         <rich:column>
                             <f:facet name="header">
+                                <h:outputText value="Account #"/>
+                            </f:facet>
+                            <h:outputText value="#{account.id}"/>
+                        </rich:column>
+                        <rich:column>
+                            <f:facet name="header">
                                 <h:outputText value="First Name"/>
                             </f:facet>
                             <h:outputText value="#{account.subscriber.name.firstName}"/>
@@ -53,6 +59,12 @@
                             </f:facet>
                             <h:outputText value="#{account.billingType}"/>
                         </rich:column>
+                        <rich:column>
+                            <f:facet name="header">
+                                <h:outputText value="Edit"/>
+                            </f:facet>
+                            <a4j:commandLink value="Edit" onclick="Richfaces.showModalPanel('')"/>
+                        </rich:column>
                         <f:facet name="footer">
                             <rich:datascroller id="sc2" for="searchResultsTable" maxPages="5"
                                                page="#{accountSearch.currentPage}"/>
@@ -62,6 +74,20 @@
             </h:form>
         </a4j:outputPanel>
 
+        <rich:modalPanel id="edit">
 
+            <f:facet name="header">
+
+                <h:outputText value="I'm panel header"/>
+
+            </f:facet>
+
+            <p> My panel
+            </p>
+
+            <a onclick="Richfaces.hideModalPanel('pnl');" href="#">Hide ModalPanel</a>
+
+        </rich:modalPanel>
+
     </ui:define>
 </ui:composition>
\ No newline at end of file




More information about the jboss-cvs-commits mailing list