Index: Tools/AMF/ClassCreator.cls.xml
===================================================================
diff -u -r855 -r857
--- Tools/AMF/ClassCreator.cls.xml	(.../ClassCreator.cls.xml)	(revision 855)
+++ Tools/AMF/ClassCreator.cls.xml	(.../ClassCreator.cls.xml)	(revision 857)
@@ -3,7 +3,7 @@
 <Class name="Tools.AMF.ClassCreator">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="MockClass">
+<Property name="AMFClass">
 <Type>%Dictionary.ClassDefinition</Type>
 <Private>1</Private>
 </Property>
@@ -36,11 +36,11 @@
 	
 	if ..HasToUpdate() {
 		
-		#dim MockClassName As %String = ..GetMockClassName(ClassName)
+		#dim AMFClassName As %String = ..GetAMFClassName(ClassName)
 		
-		set ..MockClass = ..OpenOrCreate(MockClassName ,ClassName)
+		set ..AMFClass = ..OpenOrCreate(AMFClassName ,ClassName)
 	
-		do ..MockClass.Methods.Clear()
+		do ..AMFClass.Methods.Clear()
 	
 		set itMethods = ##class(TECH.ListIterator).%New(..Class.Methods)
 		while itMethods.HasNext() {
@@ -50,7 +50,7 @@
 		}
 		do ..CreateNewMethod()
 		do ..CreateGeefServiceMethod()
-		do ..ExportToSVN(..MockClass.Name)
+		do ..ExportToSVN(..AMFClass.Name)
 		do ..svnHelper.CompileImportedSourceCode()
 	}
 ]]></Implementation>
@@ -93,8 +93,8 @@
 <Implementation><![CDATA[
 	set Method = ##class(%Dictionary.MethodDefinition).%New()
 	set Method.Name = "New"
-	set Method.parent = ..MockClass
-	set Method.ReturnType = ..MockClass.Name
+	set Method.parent = ..AMFClass
+	set Method.ReturnType = ..AMFClass.Name
 	set Method.FormalSpec = "SessieID:%String"
 	set Method.ClassMethod = 1
 	set Method.SequenceNumber = 1
@@ -107,7 +107,7 @@
 <Implementation><![CDATA[
 	set Method = ##class(%Dictionary.MethodDefinition).%New()
 	set Method.Name = "Geef"_..GeefServiceNaam()
-	set Method.parent = ..MockClass
+	set Method.parent = ..AMFClass
 	set Method.ReturnType = ..Class.Name
 	set Method.FormalSpec = ""
 	set Method.Private = 1
@@ -125,12 +125,12 @@
 	set AMFMethod = ##class(%Dictionary.MethodDefinition).%New()
 	set AMFMethod.Name = Method.Name
 	set AMFMethod.ClassMethod = Method.ClassMethod
-	set AMFMethod.parent = ..MockClass
+	set AMFMethod.parent = ..AMFClass
 	set AMFMethod.ReturnType = Method.ReturnType
 	set AMFMethod.FormalSpec = Method.FormalSpec
 	
-	#dim CacheCommando As %String = $select($length(Method.ReturnType)>0:"quit",1:"do")
 	
+	
 	set MethodInfo = ##class(TECH.ClassInfo.MethodDefinition).%New(Method,..Class)
 	#dim itParameters As TECH.Iterator = MethodInfo.GeefParameters() 
 	
@@ -147,15 +147,37 @@
 	;set Line = $char(9)_"do ##class(AMF.OmgevingInitieerder).InitieerOmgeving(..SessieID)"
 	;do AMFMethod.Implementation.WriteLine(Line)
 	
+	set Line = $char(9) _"try {"
+	do AMFMethod.Implementation.WriteLine(Line)
+	
 	#dim ServiceName As %String = ..GeefServiceNaam()
-	set Line = $char(9)_"#dim "_ServiceName _" As "_..Class.Name_"= ..Geef"_ServiceName_"()"
+	set Line = $char(9)_$char(9)_"#dim "_ServiceName _" As "_..Class.Name_"= ..Geef"_ServiceName_"()"
 	do AMFMethod.Implementation.WriteLine(Line)
 	
-	set Line = $char(9)_CacheCommando_" "_ServiceName_"."_Method.Name_"("
+	#dim CacheCommando As %String = $select($length(Method.ReturnType)>0:"#dim "_Method.Name_" As "_Method.ReturnType_" = ",1:"do")
+	set Line = $char(9)_$char(9)_CacheCommando_" "_ServiceName_"."_Method.Name_"("
 	#dim ParametersAsString As %String = ##class(TECH.ListUtils).ListToPieces(Parameters,",")
 	if $length(ParametersAsString)>0 set Line = Line _##class(TECH.StringUtils).Replace(ParametersAsString,"&",".")
 	set Line = Line _ ")"
 	do AMFMethod.Implementation.WriteLine(Line)
+	
+	set Line = $char(9) _"} catch {"
+	do AMFMethod.Implementation.WriteLine(Line)
+	
+	set Line = $char(9)_$char(9) _"#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()"
+	do AMFMethod.Implementation.WriteLine(Line)
+	set Line = $char(9)_$char(9) _"Do ##class(vhLib.Logger).LogExceptie(Exceptie)"
+	do AMFMethod.Implementation.WriteLine(Line)
+	set Line = $char(9)_$char(9) _"Do ##class(TECH.ExceptionHandler).Rethrow(Exceptie)"
+	do AMFMethod.Implementation.WriteLine(Line)
+	set Line = $C(9)_"}"
+	do AMFMethod.Implementation.WriteLine(Line)
+	
+	if $length(Method.ReturnType)>0 {
+		set Line  = $char(9)_"quit "_Method.Name
+		do AMFMethod.Implementation.WriteLine(Line)
+	}
+	
 	set AMFMethod.SequenceNumber = 999
 	write !,AMFMethod.%Save()
 	quit
@@ -169,36 +191,36 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GetMockClassName">
+<Method name="GetAMFClassName">
 <FormalSpec>ClassName:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[	quit ##class(TECH.StringUtils).Replace(ClassName,"APPS","AMF")
 ]]></Implementation>
 </Method>
 
 <Method name="OpenOrCreate">
-<FormalSpec>MockClassName:%String,ClassName:%String</FormalSpec>
+<FormalSpec>AMFClassName:%String,ClassName:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	if '##class(%Dictionary.ClassDefinition).%ExistsId() {
-		do ..CreateMock(MockClassName)	
+		do ..CreateAMF(AMFClassName)	
 	}
-	quit ##class(%Dictionary.ClassDefinition).%OpenId(MockClassName)
+	quit ##class(%Dictionary.ClassDefinition).%OpenId(AMFClassName)
 ]]></Implementation>
 </Method>
 
-<Method name="CreateMock">
-<FormalSpec>MockClassName:%String</FormalSpec>
+<Method name="CreateAMF">
+<FormalSpec>AMFClassName:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Dictionary.ClassDefinition</ReturnType>
 <Implementation><![CDATA[
-	set MockClass = ##class(%Dictionary.ClassDefinition).%New()
-	set MockClass.Name = MockClassName
-	set MockClass.Super = "AMF.RegisteredObject"
-	set MockClass.ProcedureBlock = ..Class.ProcedureBlock
-	do MockClass.%Save()
+	set AMFClass = ##class(%Dictionary.ClassDefinition).%New()
+	set AMFClass.Name = AMFClassName
+	set AMFClass.Super = "AMF.RegisteredObject"
+	set AMFClass.ProcedureBlock = 1
+	do AMFClass.%Save()
 	
-	quit MockClass
+	quit AMFClass
 ]]></Implementation>
 </Method>