svn commit: r736356 [2/2] - in /lenya/sandbox/access_control_redesign/src: java/org/apache/lenya/ac/ modules-core/ac/config/ modules-core/ac/java/src/org/apache/lenya/ac/attr/antlr/ modules-core/ac/java/src/org/apache/lenya/ac/file/ modules-core/ac/jav...

Modified: lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/Address.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/Address.java?rev=736356&r1=736355&r2=736356&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/Address.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/Address.java Wed Jan 21 10:04:03 2009
@@ -17,11 +17,17 @@
  */
 package org.apache.lenya.notification;
 
+import java.util.Collection;
+
+import org.apache.lenya.ac.User;
+
 /**
  * A message recipient address.
  */
 public interface Address {
-    
+
     String getId();
 
+    Collection<User> getRecipients();
+
 }

Modified: lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/GroupAddress.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/GroupAddress.java?rev=736356&r1=736355&r2=736356&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/GroupAddress.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/GroupAddress.java Wed Jan 21 10:04:03 2009
@@ -17,7 +17,13 @@
  */
 package org.apache.lenya.notification;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+
 import org.apache.lenya.ac.Group;
+import org.apache.lenya.ac.Groupable;
+import org.apache.lenya.ac.User;
 import org.apache.lenya.util.Assert;
 
 public class GroupAddress implements Address {
@@ -33,8 +39,18 @@
         return getGroup().getId();
     }
 
-    private Group getGroup() {
+    public Group getGroup() {
         return this.group;
     }
 
+    public Collection<User> getRecipients() {
+        Collection<User> users = new HashSet<User>();
+        for (Groupable groupable: getGroup().getMembers()) {
+            if (groupable instanceof User) {
+                users.add((User) groupable);
+            }
+        }
+        return Collections.unmodifiableCollection(users);
+    }
+
 }

Modified: lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/UserAddress.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/UserAddress.java?rev=736356&r1=736355&r2=736356&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/UserAddress.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules/notification/java/src/org/apache/lenya/notification/UserAddress.java Wed Jan 21 10:04:03 2009
@@ -17,6 +17,9 @@
  */
 package org.apache.lenya.notification;
 
+import java.util.Collection;
+import java.util.Collections;
+
 import org.apache.lenya.ac.User;
 import org.apache.lenya.util.Assert;
 
@@ -37,4 +40,8 @@
         return getUser().getId();
     }
 
+    public Collection<User> getRecipients() {
+        return Collections.singleton(getUser());
+    }
+
 }

Modified: lenya/sandbox/access_control_redesign/src/modules/notification/usecases/currentMessage.jx
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules/notification/usecases/currentMessage.jx?rev=736356&r1=736355&r2=736356&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules/notification/usecases/currentMessage.jx (original)
+++ lenya/sandbox/access_control_redesign/src/modules/notification/usecases/currentMessage.jx Wed Jan 21 10:04:03 2009
@@ -34,8 +34,9 @@
           <tr>
             <td class="lenya-entry-caption"><i18n:text>From</i18n:text>:</td>
             <td style="white-space: nowrap">
-              <jx:out value="${message.getMessage().getSender().getName()}"/>
-              (<a href="?lenya.usecase=admin.user&amp;userId=${message.getMessage().getSender().getId()}"><jx:out value="${message.getMessage().getSender().getId()}"/></a>)
+              <jx:set var="sender" value="${message.getMessage().getSenderAddress().getUser()}"/>
+              <jx:out value="${sender.getName()}"/>
+              (<a href="?lenya.usecase=admin.user&amp;userId=${sender.getId()}"><jx:out value="${sender.getId()}"/></a>)
             </td>
           </tr>
           <tr>