Index: Tools/CompileEnumerator.cls.xml
===================================================================
diff -u -r2245 -r2603
--- Tools/CompileEnumerator.cls.xml	(.../CompileEnumerator.cls.xml)	(revision 2245)
+++ Tools/CompileEnumerator.cls.xml	(.../CompileEnumerator.cls.xml)	(revision 2603)
@@ -19,8 +19,17 @@
 	
 	w "Zoeken...",!!
 	
-	do ..BuildCompileMultiDim(EnumeratorKlasse,.mdToCompile)
-	
+	Set Enumerators = ##class(%ListOfDataTypes).%New()
+	Do Enumerators.Insert(EnumeratorKlasse)
+	Do ..CompileEnumeratorList(Enumerators, VraagBevestiging)
+]]></Implementation>
+</Method>
+
+<Method name="CompileEnumeratorList">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Enumerators:%ListOfDataTypes,VraagBevestiging:%Boolean=1</FormalSpec>
+<Implementation><![CDATA[
+	do ..BuildCompileMultiDim(Enumerators,.mdToCompile)
 	If ($order(mdToCompile($order(mdToCompile(""))))'="")
 	{
 		Set Input = ""
@@ -48,9 +57,17 @@
 
 <Method name="BuildCompileMultiDim">
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[EnumeratorKlasse:%String,&mdToCompile]]></FormalSpec>
+<FormalSpec><![CDATA[Enumerators:%ListOfDataTypes,&mdToCompile]]></FormalSpec>
 <Implementation><![CDATA[
-	Set mdToCompile(EnumeratorKlasse_".cls")=""
+	Set ArrayOfEnums = ##class(%ArrayOfDataTypes).%New()
+	Set Iterator = ##class(TECH.ListIterator).%New(Enumerators)
+	While (Iterator.HasNext())
+	{
+		Set Enum = Iterator.Next()
+		Do ArrayOfEnums.SetAt(1,Enum_" ")
+		Set mdToCompile(Enum_".cls")=""
+	}
+
 	Set ResultSet = ##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:Summary")
 	Do ResultSet.Execute()
 	While ResultSet.Next()
@@ -61,7 +78,7 @@
 		{
 			Set ClassDefinition = ##class(TECH.ClassInfo.ClassDefinition).%New(ClassName)
 			If $IsObject(ClassDefinition) {
-				If (..BevatProperty(ClassDefinition, EnumeratorKlasse))
+				If (..BevatProperty(ClassDefinition, .ArrayOfEnums))
 				{
 					set IsGenerated = ##class(TECH.SourceCodeUtils).IsGeneratedCode(ClassName_".cls",.GeneratedBy) 
 					if IsGenerated {
@@ -90,7 +107,7 @@
 							If ('Gecontroleerd.IsDefined(TeControleren.GeefNaam()))
 							{
 								Do Gecontroleerd.SetAt("",TeControleren.GeefNaam())
-								If (TeControleren.GeefNaam()=EnumeratorKlasse)
+								If (ArrayOfEnums.IsDefined(TeControleren.GeefNaam()_" "))
 								{
 									Set mdToCompile(ClassName_".cls")=""
 									w "Gebruikt in webservice: "_ClassDefinition.GeefNaam(),!
@@ -131,14 +148,14 @@
 				}
 			}
 		}
-}
-Quit
+	}
+	Quit
 ]]></Implementation>
 </Method>
 
 <Method name="BevatProperty">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>ClassDefinition:%Dictionary.ClassDefinition,EnumeratorKlasse:%String</FormalSpec>
+<FormalSpec>ClassDefinition:%Dictionary.ClassDefinition,ArrayOfEnums:%ArrayOfDataTypes</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set BevatProperty = 0
@@ -147,7 +164,7 @@
 	{
 		Set PropertyDefinition = PropertiesIterator.Next()
 		Set Type = PropertyDefinition.GeefType()
-		Set BevatProperty = (Type = EnumeratorKlasse)
+		Set BevatProperty = ArrayOfEnums.IsDefined(Type_" ")
 	}
 	Quit BevatProperty
 ]]></Implementation>