Index: vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml
===================================================================
diff -u -r2401 -r3001
--- vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 2401)
+++ vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3001)
@@ -4,88 +4,102 @@
 <Super>TECH.RegisteredObject,TECH.PubSub.EventRaiser</Super>
 
 <Property name="AsyncEvents">
-<Type>TECH.PubSub.Event</Type>
-<Collection>list</Collection>
+<Type>%ListOfObjects</Type>
+<Collection>array</Collection>
 <Private>1</Private>
 </Property>
 
 <Property name="SyncEvents">
-<Type>TECH.PubSub.Event</Type>
-<Collection>list</Collection>
+<Type>%ListOfObjects</Type>
+<Collection>array</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 ..AsyncEvents.Insert(Event)
+<Implementation><![CDATA[	do ..AddEventToArrayList( Event,..AsyncEvents )
 ]]></Implementation>
 </Method>
 
 <Method name="RaiseEventSync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	do ..SyncEvents.Insert(Event)
+<Implementation><![CDATA[	do ..AddEventToArrayList( Event,..SyncEvents )
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAsynchroneEvents">
-<ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[	quit ..AsyncEvents
+<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)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefSynchroneEvents">
-<ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[	quit ..SyncEvents
+<Method name="GeefAantalNietSynchroneEvents">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..GeefAantalEvents(..AsyncEvents)
 ]]></Implementation>
 </Method>
 
-<Method name="IsEventGeraised">
-<FormalSpec>EventType:%String,EventData:TECH.PubSub.EventData=""</FormalSpec>
-<ReturnType>%String</ReturnType>
+<Method name="GeefAantalSynchroneEvents">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..GeefAantalEvents(..SyncEvents)
+]]></Implementation>
+</Method>
+
+<Method name="GeefNietSynchroneEventsVoorType">
+<FormalSpec>Type:%String</FormalSpec>
+<ReturnType>TECH.PubSub.EventList</ReturnType>
 <Implementation><![CDATA[
-	#dim EventGeraisedFoutBoodschap As %String = "Event '"_EventType_"' niet geraised"
-	Set AsynchroneEventsIt = ##class(TECH.ListIterator).%New(..GeefAsynchroneEvents())
+	set Events = ##class(TECH.PubSub.EventList).%New()
+	if ..AsyncEvents.IsDefined(Type) {
+		set Events = ..AsyncEvents.GetAt(Type)
+	}
+	quit Events
+]]></Implementation>
+</Method>
 
-	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)
-			}
-		}
-		
+<Method name="GeefSynchroneEventsVoorType">
+<FormalSpec>Type:%String</FormalSpec>
+<ReturnType>TECH.PubSub.EventList</ReturnType>
+<Implementation><![CDATA[
+	set Events = ##class(TECH.PubSub.EventList).%New()
+	if ..SyncEvents.IsDefined(Type) {
+		set Events = ..SyncEvents.GetAt(Type)
 	}
-	quit EventGeraisedFoutBoodschap
+	quit Events
 ]]></Implementation>
 </Method>
 
-<Property name="ObjectDifferenciator">
-<Type>TECH.ObjectUtils.impl.Differenciator</Type>
-<Private>1</Private>
-</Property>
+<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>
 
-<Method name="ObjectDifferenciatorGet">
+<Method name="GeefAantalEvents">
+<FormalSpec>EventArray:%ArrayOfObjects</FormalSpec>
 <Private>1</Private>
-<ReturnType>TECH.ObjectUtils.impl.Differenciator</ReturnType>
 <Implementation><![CDATA[
-	set r%ObjectDifferenciator=$$$LazyInstance(r%ObjectDifferenciator,##class(TECH.ObjectUtils.impl.Differenciator).%New())
-	quit r%ObjectDifferenciator
+	#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
 ]]></Implementation>
 </Method>
 </Class>