Index: vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml
===================================================================
diff -u -r3006 -r3021
--- vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3006)
+++ vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3021)
@@ -3,18 +3,30 @@
 <Class name="vhTest.Spy.TECH.PubSub.EventRaiser">
 <Super>TECH.RegisteredObject,TECH.PubSub.EventRaiser</Super>
 
-<Property name="AsyncEvents">
+<Property name="AsyncEventList">
 <Type>TECH.PubSub.Event</Type>
 <Collection>list</Collection>
 <Private>1</Private>
 </Property>
 
-<Property name="SyncEvents">
+<Property name="SyncEventList">
 <Type>TECH.PubSub.Event</Type>
 <Collection>list</Collection>
 <Private>1</Private>
 </Property>
 
+<Property name="AsyncEvents">
+<Type>%ListOfObjects</Type>
+<Collection>array</Collection>
+<Private>1</Private>
+</Property>
+
+<Property name="SyncEvents">
+<Type>%ListOfObjects</Type>
+<Collection>array</Collection>
+<Private>1</Private>
+</Property>
+
 <Method name="PushedInstance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>vhTest.Spy.TECH.PubSub.EventRaiser</ReturnType>
@@ -29,26 +41,30 @@
 <Method name="RaiseEventAsync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	do ..AsyncEvents.Insert(Event)
+<Implementation><![CDATA[
+	do ..AsyncEventList.Insert(Event)
+	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 ..SyncEventList.Insert(Event)
+	do ..AddEventToArrayList( Event,..SyncEvents )
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAsynchroneEvents">
 <ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[	quit ..AsyncEvents
+<Implementation><![CDATA[	quit ..AsyncEventList
 ]]></Implementation>
 </Method>
 
 <Method name="GeefSynchroneEvents">
 <ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[	quit ..SyncEvents
+<Implementation><![CDATA[	quit ..SyncEventList
 ]]></Implementation>
 </Method>
 
@@ -88,6 +104,80 @@
 	quit r%ObjectDifferenciator
 ]]></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)
+]]></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>
+<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>
+</Method>
+
+<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 Events
+]]></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>
+
+<Method name="GeefAantalEvents">
+<FormalSpec>EventArray:%ArrayOfObjects</FormalSpec>
+<Private>1</Private>
+<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
+]]></Implementation>
+</Method>
 </Class>