[jboss-svn-commits] JBL Code SVN: r31490 - labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-02-08 08:57:21 -0500 (Mon, 08 Feb 2010)
New Revision: 31490

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
Log:
Changed delete/undelete events catch to work with SBS 4.

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java	2010-02-08 13:12:14 UTC (rev 31489)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java	2010-02-08 13:57:21 UTC (rev 31490)
@@ -35,7 +35,6 @@
 
 import com.jivesoftware.base.event.v2.EventListener;
 import com.jivesoftware.community.Document;
-import com.jivesoftware.community.DocumentState;
 import com.jivesoftware.community.JiveGlobals;
 import com.jivesoftware.community.cache.Cache;
 import com.jivesoftware.community.event.DocumentEvent;
@@ -267,9 +266,13 @@
     }
   }
 
+  private String getDocumentID(DocumentEvent event) {
+    return "DOC-" + event.getDocID();
+  }
+
   public void documentAdded(DocumentEvent event) {
     if (log.isDebugEnabled()) {
-      log.debug("documentAdded: " + event.getDocID());
+      log.debug("documentAdded: " + getDocumentID(event));
     }
     Document doc = getDocument(event);
     String hfURLTitle = createHFURLTitle(doc.getSubject());
@@ -279,17 +282,16 @@
 
   public void documentDeleted(DocumentEvent event) {
     if (log.isDebugEnabled()) {
-      log.debug("documentDeleted: " + event.getDocID());
+      log.debug("documentDeleted: " + getDocumentID(event));
     }
-    // this notification is fired when administrator delete document.
-    // it's not fired when user mark document as deleted.
-    // This case is handled by document modified with document state = deleted
+    hfURLDAO.deleteHFURL(getDocumentID(event));
+    hfURLCache.remove(getDocumentID(event));
   }
 
   public void documentModified(DocumentEvent event) {
     Document doc = getDocument(event);
     if (log.isDebugEnabled()) {
-      log.debug("documentModified: " + event.getDocID());
+      log.debug("documentModified: " + getDocumentID(event));
       log.debug("event params: " + event.getParams());
       log.debug("Document state: " + doc.getDocumentState());
     }
@@ -316,15 +318,6 @@
       hfURLCache.put(doc.getDocumentID(), hfURLTitle);
     }
 
-    // User delete - it's not Administrator delete that fire documentDeleted
-    // event
-    if ("documentStateModify".equals(params.get("Type"))
-        && doc.getDocumentState().equals(DocumentState.DELETED)) {
-      log.debug("State of document changed to DELETED");
-      hfURLDAO.deleteHFURL(event.getDocID());
-      hfURLCache.remove(event.getDocID());
-    }
-
     // Here is one special case of changing title - when user restore version
     // which has another title CS doesn't fire this event.
 
@@ -334,7 +327,7 @@
 
   public void documentUndeleted(DocumentEvent event) {
     if (log.isDebugEnabled()) {
-      log.debug("documentUndeleted: " + event.getDocID());
+      log.debug("documentUndeleted: " + getDocumentID(event));
     }
     Document doc = getDocument(event);