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

[SVN]

Author: mflorea
Date: 2008-02-13 18:32:06 +0100 (Wed, 13 Feb 2008)
New Revision: 7636

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/DocumentationActivityEvent.java
Log:
CURRIKI-1571, CURRIKI-1570, CURRIKI-1573, CURRIKI-1572

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-13 17:26:22 UTC (rev 7635)
+++ 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/impl/CurrikiActivityStream.java
  2008-02-13 17:32:06 UTC (rev 7636)
@@ -106,14 +106,19 @@
         }
 
         String docTitle = newdoc.getTitle();
-        String docType =
-            newdoc.getTags(context).contains("documentation-file") ? "file" : 
"wikipage";
+        String docType = "wikipage";
+        if (newdoc.getObject("XWiki.TagClass") != null) {
+            docType =
+                newdoc.getTags(context).contains("documentation-file") ? 
"file" : "wikipage";
+        }
 
         // update event parameter (workaround)
         if (newdoc.isNew()) {
             docTitle = olddoc.getTitle();
-            docType =
-                olddoc.getTags(context).contains("documentation-file") ? 
"file" : "wikipage";
+            if (olddoc.getObject("XWiki.TagClass") != null) {
+                docType =
+                    olddoc.getTags(context).contains("documentation-file") ? 
"file" : "wikipage";
+            }
             event = XWikiDocChangeNotificationInterface.EVENT_DELETE;
         } else if (olddoc == null && "1.2".equals(newdoc.getVersion())) {
             event = XWikiDocChangeNotificationInterface.EVENT_NEW;

Modified: 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/plugin/DocumentationActivityEvent.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/plugin/DocumentationActivityEvent.java
   2008-02-13 17:26:22 UTC (rev 7635)
+++ 
xwiki-products/curriki/trunk/plugins/currikiactivitystream/src/main/java/org/curriki/plugin/activitystream/plugin/DocumentationActivityEvent.java
   2008-02-13 17:32:06 UTC (rev 7636)
@@ -49,7 +49,6 @@
             if (!doc.isNew()) {
                 docTitle = doc.getTitle();
                 docLink = "[" + docTitle + ">" + doc.getExternalURL("view", 
context) + "]";
-                isFile = doc.getTags(context).contains("documentation-file");
             }
         } catch (XWikiException e) {
         }

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