Index: BL/Prod/ImageLink.cls.xml
===================================================================
diff -u -r20214 -r20225
--- BL/Prod/ImageLink.cls.xml	(.../ImageLink.cls.xml)	(revision 20214)
+++ BL/Prod/ImageLink.cls.xml	(.../ImageLink.cls.xml)	(revision 20225)
@@ -6,6 +6,7 @@
 <IncludeCode>BL.EC.Common,Prod.Product,vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="ADBTemplate">
 <Default>ImageLinkControle_01.01</Default>
@@ -226,13 +227,12 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTBXLadeImageCodeBepalerInput">
+<Method name="GeefTBXImageCodeBepalerInput">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ProductID:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.PM.Maatwerk.AfbeeldingService.impl.TBXLadeImageCodeBepalerInput</ReturnType>
 <Implementation><![CDATA[
-	#dim LC,DS,BS,BGRP,NMBS,SPZK,ODSP
 	Set LC=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",ProductID,"LC"))       ; LadeCode 
 	Set DS=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",ProductID,"DS"))       ; Design (A voor intivo) 
 	Set BS=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",ProductID,"BS"))       ; BoxSide 
@@ -255,7 +255,7 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim LadeImageCodeBepalerInput As APPS.PM.Maatwerk.AfbeeldingService.impl.TBXLadeImageCodeBepalerInput = ..GeefTBXLadeImageCodeBepalerInput(PRNr)
+	Set LadeImageCodeBepalerInput = ..GeefTBXImageCodeBepalerInput(PRNr)
 	Quit ..GeefTBXImageCode(LadeImageCodeBepalerInput)
 ]]></Implementation>
 </Method>
@@ -331,13 +331,13 @@
 		Set ObjType = ..#ObjType
 		Set ObjRef = PRNr
 	} Else { ; mogelijk generisch afgeleid product
-		#dim GenTyp As %String = $P($$GENTYP^HAD(PRNr),"\",1,2)
+		Set GenTyp = $P($$GENTYP^HAD(PRNr),"\",1,2)
 		If GenTyp '= "" {
-	 		#dim Type As %String = $P($G(^RES("HAD","PI","GENTYP","D",GenTyp)),"`",$S($E(Gebruik)="I":4,1:5))
-	 		#dim Ref As %String = ""
+	 		Set Type = $P($G(^RES("HAD","PI","GENTYP","D",GenTyp)),"`",$S($E(Gebruik)="I":4,1:5))
+	 		Set Ref = ""
 	 		Set:Type="TBX" Ref=..GeefImageCodeViaTBXProduct(PRNr)
 	 		Set:Type="KAD" Ref=..KADImageCode(PRNr)
-	 	//	Set:((Type="TAO") || (Type="LBX")) Ref = ..ImageCodeViaIngegevenKenmerken(PRNr)
+	 	//	Set:((Type="TAO") || (Type="LBX")) Ref = ..ImageCodeViaIngegevenKenmerken(PRNr)   ; Nieuw maatwerk-framework alleen op Cache2010 
 	 		Set:Type="HALID" Ref=PRNr ; Halux product, alleen voor intern gebruik
 	 		If $L(Ref)&&((Type="HALID") || ##class(Res.ImageLink).HasImage(Type,Ref)) {
 		 		Set ObjType = Type