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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/30 21:56:07

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace    
                        FriendAction.java FriendLocal.java Member.java
                        RegisterAction.java
  Log:
  added friend request form
  
  Revision  Changes    Path
  1.7       +35 -3     jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/FriendAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FriendAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/FriendAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- FriendAction.java	30 Jan 2007 23:48:07 -0000	1.6
  +++ FriendAction.java	31 Jan 2007 02:56:07 -0000	1.7
  @@ -29,6 +29,9 @@
      @Out(required = false)
      private FriendComment friendComment;
      
  +   @Out(required = false)
  +   private MemberFriend friendRequest;
  +   
      @In(required = false)
      private Member authenticatedMember;
      
  @@ -45,7 +48,6 @@
            .setParameter("memberName", name)
            .getSingleResult();
                     
  -         // TODO this doesn't work - check with Gavin
            Contexts.getMethodContext().set("friends", member.getFriends());
            Identity.instance().checkRestriction("#{s:hasPermission('friendComment', 'create', friends)}");
   
  @@ -66,6 +68,36 @@
         entityManager.persist(friendComment);
      }
      
  +   @Factory("friendRequest") @Begin
  +   public void createRequest()
  +   {
  +      try
  +      {
  +         Member member = (Member) entityManager.createQuery(
  +         "from Member where memberName = :memberName")
  +         .setParameter("memberName", name)
  +         .getSingleResult();
  +                  
  +         Contexts.getMethodContext().set("friends", member.getFriends());
  +         Identity.instance().checkRestriction("#{s:hasPermission('friendRequest', 'create', friends)}");
  +
  +         friendRequest = new MemberFriend();
  +         friendRequest.setFriend(authenticatedMember);
  +         friendRequest.setMember(member);
  +      }
  +      catch (NoResultException ex) 
  +      { 
  +         FacesMessages.instance().add("Member not found.");
  +      }
  +   }
  +
  +   @End
  +   public void saveRequest()
  +   {
  +      friendRequest.getMember().getFriends().add(friendRequest);
  +      entityManager.persist(friendRequest);      
  +   }
  +   
      @Remove @Destroy
      public void destroy() { }    
   }
  
  
  
  1.2       +4 -0      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/FriendLocal.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FriendLocal.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/FriendLocal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FriendLocal.java	27 Jan 2007 14:05:53 -0000	1.1
  +++ FriendLocal.java	31 Jan 2007 02:56:07 -0000	1.2
  @@ -7,5 +7,9 @@
   {
      void createComment();
      void saveComment();
  +   
  +   void createRequest();
  +   void saveRequest();
  +   
      void destroy(); 
   }
  
  
  
  1.17      +10 -3     jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Member.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Member.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Member.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- Member.java	27 Jan 2007 14:40:03 -0000	1.16
  +++ Member.java	31 Jan 2007 02:56:07 -0000	1.17
  @@ -38,16 +38,23 @@
      private static final long serialVersionUID = 5179242727836683375L;
      
      public enum Gender {
  -      male("Male"), 
  -      female("Female");
  +      male("Male", "his"), 
  +      female("Female", "her");
         
        private String descr;
  -     Gender(String descr) {
  +     private String possessive;
  +     
  +     Gender(String descr, String possessive) {
          this.descr = descr;
  +       this.possessive = possessive;
         }
        public String getDescr() {
           return descr;
        }
  +     
  +     public String getPossessive() {
  +        return possessive;
  +     }
      };
      
      private Integer memberId;
  
  
  
  1.8       +0 -1      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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- RegisterAction.java	30 Jan 2007 23:48:07 -0000	1.7
  +++ RegisterAction.java	31 Jan 2007 02:56:07 -0000	1.8
  @@ -63,7 +63,6 @@
   
      @End
      public void uploadPicture() 
  -      throws LoginException
      {
         newMember.setMemberSince(new Date());
         newMember.setRoles(new HashSet<MemberRole>());