[xwiki-notifications] r7760 - in xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream: impl plugin

[SVN]

Author: mflorea
Date: 2008-02-15 17:02:44 +0100 (Fri, 15 Feb 2008)
New Revision: 7760

Modified:
   
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/impl/CurrikiActivityStream.java
   
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/plugin/MessageActivityEvent.java
Log:
CURRIKI-1695

Modified: 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/impl/CurrikiActivityStream.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/impl/CurrikiActivityStream.java
  2008-02-15 15:35:03 UTC (rev 7759)
+++ 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/impl/CurrikiActivityStream.java
  2008-02-15 16:02:44 UTC (rev 7760)
@@ -81,9 +81,16 @@
             event = XWikiDocChangeNotificationInterface.EVENT_NEW;
         }
 
+        String level = "message";
+        if ("commentadd".equals(context.getAction())) {
+            event = XWikiDocChangeNotificationInterface.EVENT_NEW;
+            level = "comment";
+        }
+
         List params = new ArrayList();
         params.add(article.getStringValue("title"));
         params.add(getUserName(context.getUser(), context));
+        params.add(level);
 
         try {
             switch (event) {

Modified: 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/plugin/MessageActivityEvent.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/plugin/MessageActivityEvent.java
 2008-02-15 15:35:03 UTC (rev 7759)
+++ 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/plugin/MessageActivityEvent.java
 2008-02-15 16:02:44 UTC (rev 7760)
@@ -70,13 +70,25 @@
         } catch (XWikiException e) {
         }
 
+        String level = event.getParam3();
+        if (level == null || level.trim().length() == 0) {
+            level = "message";
+        }
         String eventTitle = "";
-        if (ActivityEventType.UPDATE.equals(event.getType())) {
-            eventTitle = "groups_home_activity_mes_edit";
-        } else if (ActivityEventType.CREATE.equals(event.getType())) {
-            eventTitle = "groups_home_activity_mes_add";
-        } else if (ActivityEventType.DELETE.equals(event.getType())) {
-            eventTitle = "groups_home_activity_mes_del";
+        if ("message".equals(level)) {
+            if (ActivityEventType.UPDATE.equals(event.getType())) {
+                eventTitle = "groups_home_activity_mes_edit";
+            } else if (ActivityEventType.CREATE.equals(event.getType())) {
+                eventTitle = "groups_home_activity_mes_add";
+            } else if (ActivityEventType.DELETE.equals(event.getType())) {
+                eventTitle = "groups_home_activity_mes_del";
+            }
+        } else if ("comment".equals(level)) {
+            if (ActivityEventType.CREATE.equals(event.getType())) {
+                eventTitle = "groups_home_activity_mes_com_add";
+            } else if (ActivityEventType.DELETE.equals(event.getType())) {
+                eventTitle = "groups_home_activity_mes_com_del";
+            }
         }
 
         List params = new ArrayList();

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications