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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/27 09:40:03

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace    
                        BlogAction.java FriendAction.java Member.java
                        ProfileAction.java
  Log:
  minor improvements
  
  Revision  Changes    Path
  1.13      +1 -1      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/BlogAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BlogAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/BlogAction.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- BlogAction.java	27 Jan 2007 14:05:53 -0000	1.12
  +++ BlogAction.java	27 Jan 2007 14:40:02 -0000	1.13
  @@ -34,7 +34,7 @@
      private EntityManager entityManager;
      
      @In(required = false)
  -   private Member selectedMember;   
  +   Member selectedMember;   
      
      @In(required = false) @Out(required = false)
      private MemberBlog selectedBlog;
  
  
  
  1.3       +7 -10     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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- FriendAction.java	27 Jan 2007 14:25:31 -0000	1.2
  +++ FriendAction.java	27 Jan 2007 14:40:03 -0000	1.3
  @@ -15,6 +15,7 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Out;
   import org.jboss.seam.annotations.RequestParameter;
  +import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.security.Identity;
   
  @@ -44,17 +45,13 @@
            .setParameter("memberName", name)
            .getSingleResult();
                     
  -         if (!Identity.instance().hasPermission("friendComment", "create", member.getFriends()))
  -         {
  -            FacesMessages.instance().add("You cannot leave a comment for this member");
  -         }
  -         else
  -         {
  +         Contexts.getMethodContext().set("friends", member.getFriends());
  +         Identity.instance().checkRestriction("#{s:hasPermission('friendComment', 'create', friends)}");
  +
               friendComment = new FriendComment();
               friendComment.setFriend(authenticatedMember);
               friendComment.setMember(member);
            }
  -      }
         catch (NoResultException ex) 
         { 
            FacesMessages.instance().add("Member not found.");
  
  
  
  1.16      +0 -11     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.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- Member.java	27 Jan 2007 14:05:53 -0000	1.15
  +++ Member.java	27 Jan 2007 14:40:03 -0000	1.16
  @@ -255,17 +255,6 @@
      }
      
      @Transient
  -   public boolean isFriend(Member member)
  -   {
  -      for (MemberFriend f : getFriends())
  -      {
  -         if (f.getFriend().equals(member) && f.isAuthorized())
  -            return true;
  -      }
  -      return false;
  -   }
  -   
  -   @Transient
      public String getAge()
      {
         Calendar birthday = new GregorianCalendar();
  
  
  
  1.18      +2 -2      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ProfileAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProfileAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ProfileAction.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- ProfileAction.java	27 Jan 2007 14:05:53 -0000	1.17
  +++ ProfileAction.java	27 Jan 2007 14:40:03 -0000	1.18
  @@ -31,10 +31,10 @@
      private Member authenticatedMember;
      
      @Out(required = false)
  -   private List newMembers;
  +   List newMembers;
      
      @Out(required = false)
  -   private List memberBlogs;   
  +   List memberBlogs;   
      
      @In(create=true)
      private EntityManager entityManager;