From 9f9afe2ee6b1408e97a0b98a3eadd88aa129a7f6 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Fri, 21 Dec 2012 07:20:39 +0500
Subject: [PATCH] Converted over SendToPublishEventArgs to new events.

---
 .../Events/SendToPublishEventArgs.cs          | 19 ++++++++++++++-
 src/Umbraco.Core/Services/ContentService.cs   | 23 +++++++------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Core/Events/SendToPublishEventArgs.cs b/src/Umbraco.Core/Events/SendToPublishEventArgs.cs
index 1c2a868e61..b246395a92 100644
--- a/src/Umbraco.Core/Events/SendToPublishEventArgs.cs
+++ b/src/Umbraco.Core/Events/SendToPublishEventArgs.cs
@@ -1,4 +1,21 @@
 namespace Umbraco.Core.Events
 {
-	public class SendToPublishEventArgs : System.ComponentModel.CancelEventArgs { }
+	public class SendToPublishEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
+	{
+		public SendToPublishEventArgs(TEntity eventObject, bool canCancel) : base(eventObject, canCancel)
+		{
+		}
+
+		public SendToPublishEventArgs(TEntity eventObject) : base(eventObject)
+		{
+		}
+
+		/// <summary>
+		/// The entity being sent to publish
+		/// </summary>
+		public TEntity Entity
+		{
+			get { return EventObject; }
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index c4daec88c9..70e54ad56c 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1066,24 +1066,17 @@ namespace Umbraco.Core.Services
 		/// <returns>True if sending publication was succesfull otherwise false</returns>
 		internal bool SendToPublication(IContent content, int userId = -1)
 		{
-			//TODO Implement something similar to this
-			var e = new SendToPublishEventArgs();
 
-			if (SendingToPublish != null)
-				SendingToPublish(content, e);
+			if (SendingToPublish.IsRaisedEventCancelled(new SendToPublishEventArgs<IContent>(content), this))
+				return false;
 
-			if (!e.Cancel)
-			{
-				// Do some stuff here.. RunActionHandlers
+			//TODO: Do some stuff here.. RunActionHandlers
 
-				if (SentToPublish != null)
-					SentToPublish(content, e);
+			SentToPublish.RaiseEvent(new SendToPublishEventArgs<IContent>(content, false), this);
 
-				Audit.Add(AuditTypes.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
+			Audit.Add(AuditTypes.SendToPublish, "Send to Publish performed by user", content.WriterId, content.Id);
 
-			    return true;
-			}
-			return false;
+			return true;
 		}
 
 	    /// <summary>
@@ -1309,12 +1302,12 @@ namespace Umbraco.Core.Services
 		/// <summary>
 		/// Occurs before Send to Publish
 		/// </summary>
-		public static event EventHandler<SendToPublishEventArgs> SendingToPublish;
+		public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SendingToPublish;
 
 		/// <summary>
 		/// Occurs after Send to Publish
 		/// </summary>
-		public static event EventHandler<SendToPublishEventArgs> SentToPublish;
+		public static event TypedEventHandler<IContentService, SendToPublishEventArgs<IContent>> SentToPublish;
 		#endregion
 	}
 }
\ No newline at end of file