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

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-06-16 18:24:06 -0400 (Wed, 16 Jun 2010)
New Revision: 13207

Modified:
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java
Log:
cleanup


Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java	2010-06-16 22:20:40 UTC (rev 13206)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java	2010-06-16 22:24:06 UTC (rev 13207)
@@ -7,7 +7,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.jboss.seam.examples.booking.controls.RegistrationFormControls;
 import org.jboss.seam.examples.booking.model.User;
 import org.jboss.seam.international.status.Messages;
 import org.jboss.seam.international.status.builder.BundleKey;
@@ -27,9 +26,6 @@
    private Messages messages;
 
    @Inject
-   private RegistrationFormControls formControls;
-
-   @Inject
    @Authenticated
    private User user;
 
@@ -42,8 +38,6 @@
       em.merge(user);
       messages.info(new BundleKey("messages", "account.passwordChanged")).textDefault("Password successfully updated.");
       changed = true;
-      // messages.error(new BundleKey("messages",
-      // "account.passwordsDoNotMatch")).textDefault("Passwords do not match. Please re-type the new password.");
    }
 
    public boolean isChanged()

Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java	2010-06-16 22:20:40 UTC (rev 13206)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java	2010-06-16 22:24:06 UTC (rev 13207)
@@ -61,7 +61,7 @@
    private EntityManager em;
 
    @Inject
-   private MessageFactory mf;
+   private MessageFactory msg;
 
    @Inject
    private Messages messages;
@@ -90,7 +90,7 @@
       hotelSelection = em.find(Hotel.class, id);
       if (hotelSelection != null)
       {
-         log.info(mf.info("Selected the {0} in {1}").textParams(hotelSelection.getName(), hotelSelection.getCity()).build().getText());
+         log.info(msg.info("Selected the {0} in {1}").textParams(hotelSelection.getName(), hotelSelection.getCity()).build().getText());
       }
    }
 
@@ -132,7 +132,7 @@
       em.persist(booking);
       // FIXME can't inject event object into bean with passivating scope
       manager.fireEvent(new BookingEvent(booking), ConfirmedLiteral.INSTANCE);
-      log.info(mf.info("New booking at the {0} confirmed for {1}").textParams(booking.getHotel().getName(), booking.getUser().getName()).build().getText());
+      log.info(msg.info("New booking at the {0} confirmed for {1}").textParams(booking.getHotel().getName(), booking.getUser().getName()).build().getText());
       messages.info(new BundleKey("messages", "booking.confirmed")).textDefault("Booking confirmed.");
    }
 

Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java	2010-06-16 22:20:40 UTC (rev 13206)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java	2010-06-16 22:24:06 UTC (rev 13207)
@@ -58,7 +58,7 @@
    private SearchCriteria criteria;
 
    @Inject
-   private MessageFactory mf;
+   private MessageFactory msg;
 
    private boolean nextPageAvailable = false;
 
@@ -130,7 +130,7 @@
       {
          hotels = results;
       }
-      log.info(mf.info("Found {0} hotel(s) matching search term [ {1} ] (limit {2})")
+      log.info(msg.info("Found {0} hotel(s) matching search term [ {1} ] (limit {2})")
             .textParams(hotels.size(), criteria.getQuery(), criteria.getPageSize()).build().getText());
    }
 }