Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r1645 -r1787
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1645)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1787)
@@ -122,9 +122,9 @@
 Deze klasse geeft alle properties terug van een klasse, alsook de properties van de properties die geen basistype waren.</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlasseNaam:%String</FormalSpec>
-<ReturnType>TECH.KeyValueList</ReturnType>
+<ReturnType>TECH.KeyValue.List</ReturnType>
 <Implementation><![CDATA[
-	set List = ##class(TECH.KeyValueList).%New()
+	set List = ##class(TECH.KeyValue.List).%New()
 	if ##class(%Dictionary.CompiledClass).%ExistsId(KlasseNaam) {
 		 set CompiledClass = ##class(%Dictionary.CompiledClass).%OpenId(KlasseNaam)
 		 set itProperties = ##class(TECH.ListIterator).%New(CompiledClass.Properties)
@@ -134,7 +134,7 @@
 			if ##class(TECH.ClassUtils).IsOurs(Property.Type) {
 				Do ##class(TECH.ListUtils).CopyListOfDataTypes(##class(TECH.ClassUtils).GeefPropertiesRecursief(Property.Type), List)
 			} Else {
-				Do List.InsertKeyValuePair(KlasseNaam, Property.Name)
+				Do List.InsertKeyValue(KlasseNaam, Property.Name)
 			}
 		}
 	}
@@ -207,37 +207,42 @@
 Smijt een Exception als validatie niet gelukt is. </Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
-	Set CallingMethod = ##class(TECH.ClassUtils).GetCallingMethod()
-	Set ClassName = $LI(CallingMethod,1)	
-	Set MethodName = $LI(CallingMethod,2)
+	#Dim CallingMethod As %List = ##class(TECH.ClassUtils).GetCallingMethod()
+	#Dim ClassName = $LI(CallingMethod,1)	
+	#Dim MethodName = $LI(CallingMethod,2)
 	
 	/// Aflopen van parameters
 	Set Class = ##class(TECH.ClassInfo.ClassDefinition).%New(ClassName)
+	
 	If ($IsObject(Class)){
-		Set Method = Class.GeefMethod(MethodName)
-		Set DefaultArgs = ""
+		#Dim Method As TECH.ClassInfo.MethodDefinition = Class.GeefMethod(MethodName)
+		#Dim DefaultArgs As %CacheString = ""
+		
 		Set CompiledMethod = ##class(%Dictionary.CompiledMethod).%OpenId(ClassName_"||"_MethodName)
+		
 		If ($IsObject(CompiledMethod)){
 			Set DefaultArgs = CompiledMethod.DefaultArgs
 		}
 		If ($IsObject(Method)){
-			Set CurrentParameter = 1
-			Set ParameterIt = Method.GeefParameters()
-			While (ParameterIt.HasNext()){
-				Set Parameter = ParameterIt.Next()
+			#Dim CurrentParameter As %Integer = 1
+			#Dim ParameterIterator As TECH.Iterator = Method.GeefParameters()
+			
+			While (ParameterIterator.HasNext()) {
+				#Dim Parameter As TECH.ClassInfo.ParameterDefinition = ParameterIterator.Next()
 				
 				/// Valideren van parameters
 				
-				Set ParameterName = Parameter.GeefNaam()
-				Set DefaultArg = $LG(DefaultArgs,CurrentParameter)
-				Set HeeftParameterInhoud = $length($get(@ParameterName))				
+				#Dim ParameterName As %String = Parameter.GeefNaam()
+				#Dim HeeftParameterInhoud As %Boolean = $length($get(@ParameterName))
+				#Dim DefaultArg As %String = $LG(DefaultArgs,CurrentParameter)		
 				
 				/// Required
-				If (($length(DefaultArg)=0) & ('HeeftParameterInhoud)) {
+				If (($length(DefaultArg) = 0) && ('HeeftParameterInhoud)) {
 					Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Parameter '"_ParameterName_"' is required voor '"_ClassName_"."_MethodName_"(..)'"))			
 				}
+				
 				/// Deep validate 
-				Set HeeftDefaultArg = ($length(DefaultArg)>0)
+				#Dim HeeftDefaultArg As %Boolean= ($length(DefaultArg) > 0)
 				If ('HeeftDefaultArg || (HeeftDefaultArg && HeeftParameterInhoud)){
 					Do ##class(TECH.ClassUtils).ValidateValue(@ParameterName,Parameter.GeefType())
 				}