Index: vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml
===================================================================
diff -u -r3001 -r3006
--- vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3001)
+++ vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3006)
@@ -4,102 +4,88 @@
 <Super>TECH.RegisteredObject,TECH.PubSub.EventRaiser</Super>
 
 <Property name="AsyncEvents">
-<Type>%ListOfObjects</Type>
-<Collection>array</Collection>
+<Type>TECH.PubSub.Event</Type>
+<Collection>list</Collection>
 <Private>1</Private>
 </Property>
 
 <Property name="SyncEvents">
-<Type>%ListOfObjects</Type>
-<Collection>array</Collection>
+<Type>TECH.PubSub.Event</Type>
+<Collection>list</Collection>
 <Private>1</Private>
 </Property>
 
+<Method name="PushedInstance">
+<ClassMethod>1</ClassMethod>
+<ReturnType>vhTest.Spy.TECH.PubSub.EventRaiser</ReturnType>
+<Implementation><![CDATA[
+	#dim Instance As vhTest.Spy.TECH.PubSub.EventRaiser = ..%New()
+	#dim PubSubAPIstub As vhTest.Mock.TECH.PubSub.PubSubAPI = ##class(vhTest.Mock.TECH.PubSub.PubSubAPI).MockInstance()
+	do PubSubAPIstub.IndienMethodCall("GeefEventRaiser").DanReturn(Instance)
+	quit Instance
+]]></Implementation>
+</Method>
+
 <Method name="RaiseEventAsync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	do ..AddEventToArrayList( Event,..AsyncEvents )
+<Implementation><![CDATA[	do ..AsyncEvents.Insert(Event)
 ]]></Implementation>
 </Method>
 
 <Method name="RaiseEventSync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	do ..AddEventToArrayList( Event,..SyncEvents )
+<Implementation><![CDATA[	do ..SyncEvents.Insert(Event)
 ]]></Implementation>
 </Method>
 
-<Method name="AddEventToArrayList">
-<FormalSpec>Event:TECH.PubSub.Event,EventArray:%ArrayOfObjects</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-
-	if 'EventArray.IsDefined(Event.Type) {
-		do EventArray.SetAt( ##class(%ListOfObjects).%New() , Event.Type )
-	}
-	do EventArray.GetAt(Event.Type).Insert(Event)
+<Method name="GeefAsynchroneEvents">
+<ReturnType>TECH.PubSub.EventList</ReturnType>
+<Implementation><![CDATA[	quit ..AsyncEvents
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalNietSynchroneEvents">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	quit ..GeefAantalEvents(..AsyncEvents)
-]]></Implementation>
-</Method>
-
-<Method name="GeefAantalSynchroneEvents">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	quit ..GeefAantalEvents(..SyncEvents)
-]]></Implementation>
-</Method>
-
-<Method name="GeefNietSynchroneEventsVoorType">
-<FormalSpec>Type:%String</FormalSpec>
+<Method name="GeefSynchroneEvents">
 <ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[
-	set Events = ##class(TECH.PubSub.EventList).%New()
-	if ..AsyncEvents.IsDefined(Type) {
-		set Events = ..AsyncEvents.GetAt(Type)
-	}
-	quit Events
+<Implementation><![CDATA[	quit ..SyncEvents
 ]]></Implementation>
 </Method>
 
-<Method name="GeefSynchroneEventsVoorType">
-<FormalSpec>Type:%String</FormalSpec>
-<ReturnType>TECH.PubSub.EventList</ReturnType>
+<Method name="IsEventGeraised">
+<FormalSpec>EventType:%String,EventData:TECH.PubSub.EventData=""</FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	set Events = ##class(TECH.PubSub.EventList).%New()
-	if ..SyncEvents.IsDefined(Type) {
-		set Events = ..SyncEvents.GetAt(Type)
+	#dim EventGeraisedFoutBoodschap As %String = "Event '"_EventType_"' niet geraised"
+	Set AsynchroneEventsIt = ##class(TECH.ListIterator).%New(..GeefAsynchroneEvents())
+
+	While AsynchroneEventsIt.HasNext()
+	{
+		#dim AsynchroneEvent As TECH.PubSub.Event =  AsynchroneEventsIt.Next()
+		If (AsynchroneEvent.Type = EventType){
+			Set EventGeraisedFoutBoodschap = ""
+			
+			If $IsObject(EventData) {
+			  set EventGeraisedFoutBoodschap = ##class(TECH.ListUtils).ListToPieces(..ObjectDifferenciator.GetDifferences(EventData,AsynchroneEvent.Data),$$$CRLF)
+			}
+		}
+		
 	}
-	quit Events
+	quit EventGeraisedFoutBoodschap
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalEventsVoorType">
-<FormalSpec>Type:%String</FormalSpec>
-<Implementation><![CDATA[
-	#dim AantalEvents As %Integer = 0
-	set AantalEvents = AantalEvents + ..GeefNietSynchroneEventsVoorType(Type).Count()
-	set AantalEvents = AantalEvents + ..GeefSynchroneEventsVoorType(Type).Count()
-	quit AantalEvents
-]]></Implementation>
-</Method>
+<Property name="ObjectDifferenciator">
+<Type>TECH.ObjectUtils.impl.Differenciator</Type>
+<Private>1</Private>
+</Property>
 
-<Method name="GeefAantalEvents">
-<FormalSpec>EventArray:%ArrayOfObjects</FormalSpec>
+<Method name="ObjectDifferenciatorGet">
 <Private>1</Private>
+<ReturnType>TECH.ObjectUtils.impl.Differenciator</ReturnType>
 <Implementation><![CDATA[
-	#dim AantalEvents As %Integer = 0
-	
-	set Iterator = ##class(TECH.ListIterator).%New(EventArray)
-	while Iterator.HasNext() {
-		#dim EventLijst As %ListOfObjects = Iterator.Next()
-		set AantalEvents = AantalEvents + EventLijst.Count()
-	}
-	
-	quit AantalEvents
+	set r%ObjectDifferenciator=$$$LazyInstance(r%ObjectDifferenciator,##class(TECH.ObjectUtils.impl.Differenciator).%New())
+	quit r%ObjectDifferenciator
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml
===================================================================
diff -u -r3005 -r3006
--- vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 3005)
+++ vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 3006)
@@ -3,24 +3,11 @@
 <Class name="vhTest.Fake.TECH.PubSub.impl.PubSubAPI">
 <Super>TECH.PubSub.impl.PubSubAPI</Super>
 
-<Property name="EventSubscriptionCollector">
-<Type>vhTest.Fake.TECH.PubSub.impl.EventSubscriptionCollector</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="GeefEventRaiser">
 <ReturnType>TECH.PubSub.EventRaiser</ReturnType>
-<Implementation><![CDATA[
-	Set ..EventSubscriptionCollector = ##class(vhTest.Fake.TECH.PubSub.impl.EventSubscriptionCollector).%New()
-	Set EventDispatcher = ##class(TECH.PubSub.impl.EventDispatcher).%New(..EventSubscriptionCollector)
-	Quit ##class(TECH.PubSub.impl.SimpelEventRaiser).%New(EventDispatcher)
+<Implementation><![CDATA[	Quit ##class(vhTest.Fake.TECH.PubSub.EventRaiser).%New()
 ]]></Implementation>
 </Method>
-
-<Method name="VerwijderEvent">
-<Implementation><![CDATA[	Do ..EventSubscriptionCollector.VerwijderEvent()
-]]></Implementation>
-</Method>
 </Class>
 
 
FishEye: Tag 3004 refers to a dead (removed) revision in file `vhTest/Fake/TECH/PubSub/EventRaiser.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 3006 refers to a dead (removed) revision in file `vhTest/Spy/TECH/PubSub/impl/PubSubAPI.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 3006 refers to a dead (removed) revision in file `vhTest/Fake/TECH/PubSub/impl/EventSubscriptionCollector.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?