From 7546d20c6e32f2018fe6470e55ef4bd1a35a68e5 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Tue, 1 Jul 2014 15:31:01 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    75082:
 Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       73269: Renamed
 ContentReadEvent to ContentEventImpl

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/web/scripts/content/ContentStreamer.java   | 5 +++--
 source/java/org/alfresco/repo/webdav/WebDAVHelper.java       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java b/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
index f4c8352e71..a2969be40b 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
@@ -13,7 +13,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.events.types.ContentReadEvent;
+import org.alfresco.events.types.ContentEvent;
+import org.alfresco.events.types.ContentEventImpl;
 import org.alfresco.events.types.Event;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
@@ -362,7 +363,7 @@ public class ContentStreamer implements ResourceLoaderAware
                     {
                         String siteId = siteService.getSiteShortName(nodeRef);
                         
-                        return new ContentReadEvent(ContentReadEvent.DOWNLOAD, user, networkId, transactionId,
+                        return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId,
                                     nodeRef.getId(), siteId, propertyQName.toString(), Client.webclient, finalMimetype, size, encoding);
                     }
                 });
diff --git a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
index 06d9daa0ca..c92991a91c 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
@@ -32,7 +32,8 @@ import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.events.types.ContentReadEvent;
+import org.alfresco.events.types.ContentEvent;
+import org.alfresco.events.types.ContentEventImpl;
 import org.alfresco.events.types.ContentReadRangeEvent;
 import org.alfresco.events.types.Event;
 import org.alfresco.jlan.util.IPAddress;
@@ -1103,7 +1104,7 @@ public class WebDAVHelper
                 } 
                 else 
                 {
-                    return new ContentReadEvent(ContentReadEvent.DOWNLOAD, user, networkId, transactionId, realNodeInfo.getNodeRef().getId(),
+                    return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId, realNodeInfo.getNodeRef().getId(),
                                 null, realNodeInfo.getType().toString(), Client.webdav, mimetype, size, contentEncoding);            
                 }
             }