[seam-commits] Seam SVN: r13187 - in examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking: booking and 1 other directory.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-06-16 14:07:16 -0400 (Wed, 16 Jun 2010)
New Revision: 13187

Modified:
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountHolderBean.java
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java
Log:
use Instance to get current User
remove logger


Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountHolderBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountHolderBean.java	2010-06-16 17:21:08 UTC (rev 13186)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountHolderBean.java	2010-06-16 18:07:16 UTC (rev 13187)
@@ -4,7 +4,6 @@
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Typed;
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -18,9 +17,6 @@
 @SessionScoped
 public class AccountHolderBean implements AccountHolder
 {
-   @Inject
-   private Logger log;
-
    private User currentUser;
 
    @Produces

Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java	2010-06-16 17:21:08 UTC (rev 13186)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java	2010-06-16 18:07:16 UTC (rev 13187)
@@ -29,6 +29,7 @@
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Observes;
 import javax.enterprise.event.TransactionPhase;
+import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -38,11 +39,11 @@
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Root;
-import org.jboss.seam.examples.booking.account.AccountHolder;
 
 import org.jboss.seam.examples.booking.account.Authenticated;
 import org.jboss.seam.examples.booking.model.Booking;
 import org.jboss.seam.examples.booking.model.Booking_;
+import org.jboss.seam.examples.booking.model.User;
 import org.jboss.seam.examples.booking.model.User_;
 import org.jboss.seam.examples.booking.security.Identity;
 import org.jboss.seam.international.status.Messages;
@@ -69,8 +70,8 @@
    @Inject
    private Identity identity;
 
-   @Inject
-   private AccountHolder accountProducer;
+   @Inject @Authenticated
+   private Instance<User> currentUserInstance;
 
    private List<Booking> bookingsForUser = null;
 
@@ -81,7 +82,7 @@
    {
       if (identity.isLoggedIn() && bookingsForUser == null)
       {
-         String username = accountProducer.getCurrentAccount().getUsername();
+         String username = currentUserInstance.get().getUsername();
          CriteriaBuilder builder = em.getCriteriaBuilder();
          CriteriaQuery<Booking> cquery = builder.createQuery(Booking.class);
          Root<Booking> booking = cquery.from(Booking.class);
@@ -105,7 +106,7 @@
 
    public void cancelBooking(final Booking selectedBooking)
    {
-      log.info("Canceling booking {0} for {1}", selectedBooking.getId(), accountProducer.getCurrentAccount().getName());
+      log.info("Canceling booking {0} for {1}", selectedBooking.getId(), currentUserInstance.get().getName());
       Booking booking = em.find(Booking.class, selectedBooking.getId());
       if (booking != null)
       {