[seam-commits] Seam SVN: r13277 - examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-06-19 19:00:46 -0400 (Sat, 19 Jun 2010)
New Revision: 13277

Modified:
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountHolder.java
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManager.java
   examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/Registrar.java
Log:
formatting

Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountHolder.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountHolder.java	2010-06-19 22:57:13 UTC (rev 13276)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountHolder.java	2010-06-19 23:00:46 UTC (rev 13277)
@@ -34,15 +34,12 @@
  * 
  * @author Dan Allen
  */
- at Stateful
- at SessionScoped
+ at Stateful @SessionScoped
 public class AccountHolder
 {
    private User currentUser;
 
-   @Produces
-   @Authenticated
-   @Named("currentUser")
+   @Produces @Authenticated @Named("currentUser")
    public User getCurrentAccount()
    {
       return currentUser;

Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java	2010-06-19 22:57:13 UTC (rev 13276)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java	2010-06-19 23:00:46 UTC (rev 13277)
@@ -45,12 +45,10 @@
    @Inject
    private BundleTemplateMessage messageBuilder;
 
-   @Inject
-   @InputField
+   @Inject @InputField
    private String newPassword;
 
-   @Inject
-   @InputField
+   @Inject @InputField
    private String confirmPassword;
 
    public void validate(final FacesContext ctx, final UIComponent form, final Object components) throws ValidatorException

Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java	2010-06-19 22:57:13 UTC (rev 13276)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java	2010-06-19 23:00:46 UTC (rev 13277)
@@ -34,6 +34,9 @@
 import org.jboss.seam.international.status.builder.BundleTemplateMessage;
 
 /**
+ * A JSF Validator, used to check that the password the user submits matches
+ * that on record.
+ * 
  * @author Dan Allen
  */
 @FacesValidator("currentPassword")
@@ -42,22 +45,19 @@
    @Inject
    private BundleTemplateMessage messageBuilder;
 
-   @Inject
-   @Authenticated
+   @Inject @Authenticated
    private User currentUser;
 
-   @SuppressWarnings("unchecked")
    public void validate(final FacesContext ctx, final UIComponent comp, final Object value) throws ValidatorException
    {
       String currentPassword = (String) value;
       if ((currentUser.getPassword() != null) && !currentUser.getPassword().equals(currentPassword))
       {
          /*
-          * This is an ugly way to put i18n in FacesMessages: https://jira.jboss.org/browse/SEAMFACES-24
+          * This is an ugly way to put i18n in FacesMessages:
+          * https://jira.jboss.org/browse/SEAMFACES-24
           */
-         throw new ValidatorException(new FacesMessage(messageBuilder.text(
-                  new DefaultBundleKey("account_passwordNotConfirmed")).build()
-                  .getText()));
+         throw new ValidatorException(new FacesMessage(messageBuilder.text(new DefaultBundleKey("account_passwordNotConfirmed")).build().getText()));
       }
    }
 

Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManager.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManager.java	2010-06-19 22:57:13 UTC (rev 13276)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManager.java	2010-06-19 23:00:46 UTC (rev 13277)
@@ -34,10 +34,11 @@
 import org.jboss.seam.international.status.Messages;
 
 /**
+ * The view controller for changing the user password
+ * 
  * @author Dan Allen
  */
- at Stateful
- at Model
+ at Stateful @Model
 public class PasswordManager
 {
    @PersistenceContext
@@ -46,12 +47,10 @@
    @Inject
    private Messages messages;
 
-   @Inject
-   @Authenticated
+   @Inject @Authenticated
    private User user;
 
-   @NotNull
-   @Size(min = 5, max = 15)
+   @NotNull @Size(min = 5, max = 15)
    private String confirmPassword;
 
    private boolean changed;

Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/Registrar.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/Registrar.java	2010-06-19 22:57:13 UTC (rev 13276)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/Registrar.java	2010-06-19 23:00:46 UTC (rev 13277)
@@ -40,6 +40,8 @@
 import org.jboss.seam.international.status.builder.BundleKey;
 
 /**
+ * The view controller for registering a new user
+ * 
  * @author Dan Allen
  */
 @Stateful
@@ -59,8 +61,7 @@
 
    private final User newUser = new User();
 
-   @NotNull
-   @Size(min = 5, max = 15)
+   @NotNull @Size(min = 5, max = 15)
    private String confirmPassword;
 
    private boolean registered;