[jboss-cvs] jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/23 00:25:07

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace   
                        LoginAction.java Register.java RegisterAction.java
  Log:
  finished user registration screen
  
  Revision  Changes    Path
  1.12      +5 -2      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/LoginAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LoginAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/LoginAction.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- LoginAction.java	17 Jan 2007 23:58:37 -0000	1.11
  +++ LoginAction.java	23 Jan 2007 05:25:07 -0000	1.12
  @@ -72,8 +72,11 @@
               .setParameter("password", password)
               .getSingleResult();
   
  +         if (authenticatedMember.getRoles() != null)
  +         {
            for (MemberRole mr : authenticatedMember.getRoles())
               roles.add(mr.getName());
  +         }
            
            return true;
         }
  
  
  
  1.3       +5 -0      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Register.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Register.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Register.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Register.java	22 Jan 2007 16:20:11 -0000	1.2
  +++ Register.java	23 Jan 2007 05:25:07 -0000	1.3
  @@ -14,7 +14,12 @@
      void setConfirm(String confirm);
      String getGender();
      void setGender(String gender);
  +   
      byte[] getPicture();
      void setPicture(byte[] picture);
  +   
  +   String getPictureContentType();
  +   void setPictureContentType(String contentType);
  +   
      void destroy();
   }
  
  
  
  1.4       +45 -6     jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegisterAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- RegisterAction.java	23 Jan 2007 02:48:16 -0000	1.3
  +++ RegisterAction.java	23 Jan 2007 05:25:07 -0000	1.4
  @@ -1,6 +1,7 @@
   package org.jboss.seam.example.seamspace;
   
   import java.util.Date;
  +import java.util.HashSet;
   
   import javax.ejb.Remove;
   import javax.ejb.Stateful;
  @@ -8,6 +9,7 @@
   
   import org.jboss.seam.annotations.Begin;
   import org.jboss.seam.annotations.Destroy;
  +import org.jboss.seam.annotations.End;
   import org.jboss.seam.annotations.Factory;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
  @@ -24,6 +26,12 @@
      @In(create = true)
      private EntityManager entityManager;
      
  +   @In(create = true)
  +   private LoginLocal login;
  +   
  +   @In(required = false)
  +   Member member;   
  +   
      /**
       * Password confirmation
       */
  @@ -32,6 +40,7 @@
      private String gender;
      
      private byte[] picture;
  +   private String pictureContentType;
   
      @Factory("newMember") @Begin
      public void start()
  @@ -47,16 +56,36 @@
         newMember.setGender(Member.Gender.valueOf(gender.toLowerCase()));
      }
      
  +   @End
      public void uploadPicture() 
      {
  +      newMember.setMemberSince(new Date());
  +      newMember.setRoles(new HashSet<MemberRole>());
  +      
  +      MemberRole userRole = (MemberRole) entityManager.createQuery(
  +            "from MemberRole where name = 'user'")
  +            .getSingleResult();
  +      
  +      newMember.getRoles().add(userRole);
  +
  +      entityManager.persist(newMember);
  +
  +      if (picture != null)
  +      {
         MemberImage img = new MemberImage();
         img.setData(picture);
         img.setMember(newMember);
  +         img.setContentType(pictureContentType);
  +         entityManager.persist(img);
         newMember.setPicture(img);
  -      newMember.setMemberSince(new Date());
         
  -      entityManager.persist(img);
  -      entityManager.persist(newMember);
  +         newMember = entityManager.merge(newMember);
  +      }
  +      
  +      // Login the user
  +      member.setUsername(newMember.getUsername());
  +      member.setPassword(newMember.getPassword());
  +      login.login();
      }
      
      public String getConfirm()
  @@ -89,6 +118,16 @@
         return picture;
      }
      
  +   public String getPictureContentType()
  +   {
  +      return pictureContentType;  
  +   }
  +   
  +   public void setPictureContentType(String contentType)
  +   {
  +      this.pictureContentType = contentType;
  +   }
  +   
      @Destroy @Remove
      public void destroy() {}
   }