Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r28 -r321
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 28)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 321)
@@ -5,6 +5,54 @@
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Method name="ControleerParameters">
+<Description>
+Controleer van de webmethod zijn parameters adhv een deep-validation uit te voeren.
+Oproepen via 'Do ..ControleerParameters()'
+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)
+	
+	/// Aflopen van parameters
+	Set Class = ##class(TECH.ClassInfo.ClassDefinition).%New(ClassName)
+	If ($IsObject(Class)){
+		Set Method = Class.GeefMethod(MethodName)
+		Set DefaultArgs = ""
+		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()
+				
+				/// Valideren van parameters
+				
+				Set ParameterName = Parameter.GeefNaam()
+				Set DefaultArg = $LG(DefaultArgs,CurrentParameter)
+				Set HeeftParameterInhoud = $length($get(@ParameterName))				
+				
+				/// Required
+				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)
+				If ('HeeftDefaultArg || (HeeftDefaultArg && HeeftParameterInhoud)){
+					Do ##class(TECH.ClassUtils).ValidateValue(@ParameterName,Parameter.GeefType())
+				}
+				Set CurrentParameter = CurrentParameter + 1
+			}			
+		}
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GetCurrentMethod">
 <ClassMethod>1</ClassMethod>
 <ReturnType>%List</ReturnType>
@@ -65,47 +113,88 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsValidParameterForMethod">
+<Method name="ValidateParameterForMethod">
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String,Parameter:%String]]></FormalSpec>
-<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	set Type = ..GetMethodParameterType(ClassName,Method,Parameter)
-	quit ..ValueIsValid(.Value,Type)
+	Do ..ValueIsValid(.Value,Type)
 ]]></Implementation>
 </Method>
 
 <Method name="IsValidReturnTypeForMethod">
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String]]></FormalSpec>
-<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	Set $ZTRAP = "CatchIsNotValidReturnType"
+	Do ..ValidateReturnTypeForMethod(.Value,ClassName,Method)
+	Quit $$$OK
+CatchIsNotValidReturnType
+	Set $ZTRAP = ""
+	Quit 0
+]]></Implementation>
+</Method>
+
+<Method name="ValidateReturnTypeForMethod">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String]]></FormalSpec>
+<Implementation><![CDATA[
 	set Type = ..GetMethodReturnType(ClassName,Method)
-	quit ..ValueIsValid(.Value,Type)
+	Do ..ValidateValue(.Value,Type)
 ]]></Implementation>
 </Method>
 
-<Method name="ValueIsValid">
+<Method name="ValidateValue">
+<Description>
+Throwt foutmelding indien niet geldig. </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String]]></FormalSpec>
-<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	if $isObject(Value) {
 		set result = ( $zobjMethod(Value,"%ValidateObject") = 1 )
-		if result { set result = $zobjMethod(Value,"%Extends",ClassName) }
-		if result { set result = ..PropertiesValid(Value) }
+		if result { 
+			set result = $zobjMethod(Value,"%Extends",ClassName) 
+			If ('result){
+				Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("'"_Value_"' is niet van de correcte klasse '"_ClassName_"'"))	
+			}
+		}
+		if result { 
+			Do ..PropertiesValid(Value)
+			set result = $$$OK
+		 }
 	}
 	else  { 
 		set result = $zobjClassMethod(ClassName,"IsValidDT",Value)
 	}
-	quit result
+	If ($$$ISERR(result)){
+		Set Message = "Validate van "_ ClassName_" is niet gelukt."
+		Set:('$IsObject(Value)) Message = Message_ " (Waarde : '"_Value_"')"
+		Set:(($G(%objlasterror)'="") && '(%objlasterror [ "ECODETRAP")) Message = Message_" "_$$ParseStatus^vhLib(%objlasterror)
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New(Message))	
+	}
 ]]></Implementation>
 </Method>
 
+<Method name="ValueIsValid">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String]]></FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set $ZTRAP = "CatchValueNotValid"
+	Do ..ValidateValue(.Value,ClassName)
+	Quit $$$OK	
+CatchValueNotValid
+	Set $ZTRAP = ""
+	
+	Quit 0
+]]></Implementation>
+</Method>
+
 <Method name="PropertiesValid">
+<Description>
+Throwt foutmelding indien niet geldig. </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Object:%CacheString]]></FormalSpec>
-<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#define CalculatedPropertiesNotIncluded 0
 	
@@ -121,20 +210,66 @@
 	while itProperties.HasNext() {
 		set Property = itProperties.Next()
 		continue:Property.Calculated
+		continue:Property.Private
+		continue:Property.MultiDimensional
 		set PropertyValue = $zobjProperty(Object,Property.Name)
-		if Property.Collection {
-			set itCollection = ##class(TECH.ListIterator).%New(PropertyValue)
+		if (Property.Collection || (Property.Collection = "list") || (Property.Collection = "array")) {
+			If (Property.Collection = "array"){
+				set itCollection = ##class(TECH.ArrayOneDimIterator).%New(PropertyValue)
+			}Else{
+				set itCollection = ##class(TECH.ListIterator).%New(PropertyValue)
+			}
 			while (result) && (itCollection.HasNext()) {
 				set CollectionValue = itCollection.Next()
-				set result = ..ValueIsValid(CollectionValue,Property.Type)
-			}
+				Do ..ValueIsValid(CollectionValue,Property.Type)			}
+		}ElseIf($IsObject(PropertyValue)){
+			Do ..ValueIsValid(PropertyValue,Property.Type)
 		}
 		elseif $length(PropertyValue) {
 			set result = $zobjMethod(Object,Property.Name_"IsValidDT",PropertyValue)
+			If ('result){
+				Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Validatie van  '"_Property.%ClassName(1)_"' is niet correct. (Waarde: '"_PropertyValue_"' is niet correct, Type: '"_Property.Type_"'"))		
+			}
+		}		
+	}
+	quit
+]]></Implementation>
+</Method>
+
+<Method name="GetClassParameterValue">
+<Description>
+Deze oproep enkel gebruiken voor klassen die niet afleiden van %Registered, bijvoorbeeld de csp-klassen, die leiden af van %CSP.Page 
+
+Voor klassen die afleiden van %Registered kan je rechtstreeks oproepen via volgende code : 
+ w ##class(klassenaam).%GetParameter("ParameterNaam") 
+ w $zobjclassmethod("klassenaam","%GetParameter","ParameterNaam") 
+
+Added by WimV on 27/09/2011 </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ClassName:%String,ParamName:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set ClassParameterValue=""
+	If ##class(%Dictionary.ClassDefinition).%ExistsId(ClassName) {
+		Set pdef=##class(%Dictionary.ParameterDefinition).%OpenId(ClassName_"||"_ParamName)
+		If $IsObject(pdef) {
+			Set ClassParameterValue=pdef.Default
 		}
 	}
-	quit result
+	Quit ClassParameterValue
 ]]></Implementation>
 </Method>
+
+<Method name="ClassDerivesFrom">
+<Description>
+Bepaalt of een klasse (ClassName) afgeleid is van de andere klasse (ClassNameFrom) 
+Bijvoorbeeld : 
+  w ##class(TECH.ClassUtils).ClassDerivesFrom(CspClassName,"%CSP.Page") </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ClassName:%String,ClassNameFrom:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(%CacheFileBridge.Project).DerivesFrom(ClassName,ClassNameFrom)
+]]></Implementation>
+</Method>
 </Class>
 </Export>