Index: APPS/common/ProductCriteria/dto/OfCriterium.cls.xml
===================================================================
diff -u -r3087 -r3183
--- APPS/common/ProductCriteria/dto/OfCriterium.cls.xml	(.../OfCriterium.cls.xml)	(revision 3087)
+++ APPS/common/ProductCriteria/dto/OfCriterium.cls.xml	(.../OfCriterium.cls.xml)	(revision 3183)
@@ -2,25 +2,15 @@
 <Export generator="Cache" version="9">
 <Class name="APPS.common.ProductCriteria.dto.OfCriterium">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.common.ProductCriteria.dto.Criterium</Super>
+<Super>APPS.common.ProductCriteria.dto.SamengesteldCriterium</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Criteria">
-<Type>APPS.common.ProductCriteria.dto.Criterium</Type>
-<Collection>list</Collection>
-</Property>
-
-<Method name="GeefProductCriterium">
-<ReturnType>APPS.common.ProductCriteria.impl.ProductCriterium</ReturnType>
+<Method name="Accept">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.impl.ProductCriteriumVisitor</FormalSpec>
 <Implementation><![CDATA[
-	Set OfCriterium = ##class(APPS.common.ProductCriteria.impl.OfCriterium).%New()
-	Set CriteriaIterator = ##class(TECH.ListIterator).%New(..Criteria)
-	While (CriteriaIterator.HasNext())
-	{
-		Set Criterium = CriteriaIterator.Next()
-		Do OfCriterium.VoegToeCriteria(Criterium.GeefProductCriterium())
-	}
-	Quit OfCriterium
+	Do ##super(Visitor)
+	Do Visitor.VerwerkOfCriterium(##this)
+	Do ..VisitKindCriteria(Visitor)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/common/ProductCriteria/dto/ProductCodeStartMetCriterium.cls.xml
===================================================================
diff -u -r3087 -r3183
--- APPS/common/ProductCriteria/dto/ProductCodeStartMetCriterium.cls.xml	(.../ProductCodeStartMetCriterium.cls.xml)	(revision 3087)
+++ APPS/common/ProductCriteria/dto/ProductCodeStartMetCriterium.cls.xml	(.../ProductCodeStartMetCriterium.cls.xml)	(revision 3183)
@@ -9,9 +9,9 @@
 <Type>%String</Type>
 </Property>
 
-<Method name="GeefProductCriterium">
-<ReturnType>APPS.common.ProductCriteria.impl.ProductCriterium</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.common.ProductCriteria.impl.ProductCodeStartMetCriterium).%New(..StartMet)
+<Method name="Accept">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.impl.ProductCriteriumVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkProductCodeStartMetCrit(##this)
 ]]></Implementation>
 </Method>
 </Class>
FishEye: Tag 3183 refers to a dead (removed) revision in file `APPS/common/ProductCriteria/impl/ProductCodeStartMetCriterium.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/common/ProductCriteria/dto/Criterium.cls.xml
===================================================================
diff -u -r3087 -r3183
--- APPS/common/ProductCriteria/dto/Criterium.cls.xml	(.../Criterium.cls.xml)	(revision 3087)
+++ APPS/common/ProductCriteria/dto/Criterium.cls.xml	(.../Criterium.cls.xml)	(revision 3183)
@@ -5,9 +5,9 @@
 <Super>%RegisteredObject,%XML.Adaptor</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Method name="GeefProductCriterium">
+<Method name="Accept">
 <Abstract>1</Abstract>
-<ReturnType>APPS.common.ProductCriteria.impl.ProductCriterium</ReturnType>
+<FormalSpec>Visitor:APPS.common.ProductCriteria.impl.ProductCriteriumVisitor</FormalSpec>
 </Method>
 </Class>
 </Export>
Index: APPS/common/ProductCriteria/dto/ClassificatieCriterium.cls.xml
===================================================================
diff -u -r3087 -r3183
--- APPS/common/ProductCriteria/dto/ClassificatieCriterium.cls.xml	(.../ClassificatieCriterium.cls.xml)	(revision 3087)
+++ APPS/common/ProductCriteria/dto/ClassificatieCriterium.cls.xml	(.../ClassificatieCriterium.cls.xml)	(revision 3183)
@@ -9,9 +9,9 @@
 <Type>%String</Type>
 </Property>
 
-<Method name="GeefProductCriterium">
-<ReturnType>APPS.common.ProductCriteria.impl.ProductCriterium</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(..ClassificatieID)
+<Method name="Accept">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.impl.ProductCriteriumVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkClassificatieCriterium(##this)
 ]]></Implementation>
 </Method>
 </Class>
FishEye: Tag 3183 refers to a dead (removed) revision in file `APPS/common/ProductCriteria/impl/OfCriterium.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/common/ProductCriteria/dto/SamengesteldCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/dto/SamengesteldCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/dto/SamengesteldCriterium.cls.xml	(revision 3183)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.dto.SamengesteldCriterium">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.ProductCriteria.dto.Criterium</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Criteria">
+<Type>APPS.common.ProductCriteria.dto.Criterium</Type>
+<Collection>list</Collection>
+</Property>
+
+<Method name="Accept">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.impl.ProductCriteriumVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.BeginSamengesteldCriterium(##this)
+]]></Implementation>
+</Method>
+
+<Method name="VisitKindCriteria">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.impl.ProductCriteriumVisitor</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set CriteriaIterator = ..GeefCriteriaIterator()
+	While (CriteriaIterator.HasNext())
+	{
+		Do CriteriaIterator.Next().Accept(Visitor)
+	}
+	Do Visitor.EindeSamengesteldCriterium(##this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefCriteriaIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Criteria)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
FishEye: Tag 3183 refers to a dead (removed) revision in file `APPS/common/ProductCriteria/impl/ClassificatieCriterium.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml
===================================================================
diff -u -r3091 -r3183
--- APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml	(.../ProductZoekOpCriteria.cls.xml)	(revision 3091)
+++ APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml	(.../ProductZoekOpCriteria.cls.xml)	(revision 3183)
@@ -40,7 +40,7 @@
 </Method>
 
 <Method name="BouwZoekQuery">
-<FormalSpec>Criterium:APPS.common.ProductCriteria.impl.ProductCriterium</FormalSpec>
+<FormalSpec>Criterium:APPS.common.ProductCriteria.dto.Criterium</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Do ..InitQueryBuilderStructuur()
@@ -53,16 +53,16 @@
 </Method>
 
 <Method name="VerwerkProductCodeStartMetCrit">
-<FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.impl.ProductCodeStartMetCriterium</FormalSpec>
+<FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.dto.ProductCodeStartMetCriterium</FormalSpec>
 <Implementation><![CDATA[
 	Set ProductTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.Product")
 	Do ..DefinieerTabelMetProductID("ID",ProductTabel)
-	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("KortTekst LIKE '"_ProductCodeStartMetCriterium.GeefStartMet()_"%'"))
+	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("KortTekst LIKE '"_ProductCodeStartMetCriterium.StartMet_"%'"))
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkClassificatieCriterium">
-<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.impl.ClassificatieCriterium</FormalSpec>
+<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.dto.ClassificatieCriterium</FormalSpec>
 <Implementation><![CDATA[
 	Set ProductKlasTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.ProductKlas")
 	Do ..DefinieerTabelMetProductID("ID",ProductKlasTabel)
@@ -72,23 +72,23 @@
 	Do ..QueryBuilder.VoegToeTabel(ProductKlasKlasTabel)
 	Do ..QueryBuilder.VoegToeForeignKey(##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("ID", ProductKlasKlasTabel, "Klas", ProductKlasTabel))
 	
-	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("Prod_Klas.Klas.ID = "_ClassificatieCriterium.GeefClassificatieID()))
+	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("Prod_Klas.Klas.ID = "_ClassificatieCriterium.ClassificatieID))
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkOfCriterium">
-<FormalSpec>OfCriterium:APPS.common.ProductCriteria.impl.OfCriterium</FormalSpec>
+<FormalSpec>OfCriterium:APPS.common.ProductCriteria.dto.OfCriterium</FormalSpec>
 <Implementation><![CDATA[	Do ..DiepteEerstBoomBuilder.VoegToeKind(##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).Of()))
 ]]></Implementation>
 </Method>
 
 <Method name="BeginSamengesteldCriterium">
-<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.impl.SamengesteldCriterium</FormalSpec>
+<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.dto.SamengesteldCriterium</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="EindeSamengesteldCriterium">
-<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.impl.SamengesteldCriterium</FormalSpec>
+<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.dto.SamengesteldCriterium</FormalSpec>
 <Implementation><![CDATA[	Do ..DiepteEerstBoomBuilder.StijgNiveau()
 ]]></Implementation>
 </Method>
FishEye: Tag 3183 refers to a dead (removed) revision in file `APPS/common/ProductCriteria/impl/SamengesteldCriterium.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml
===================================================================
diff -u -r3068 -r3183
--- vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml	(.../TestProductCriteria.cls.xml)	(revision 3068)
+++ vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml	(.../TestProductCriteria.cls.xml)	(revision 3183)
@@ -9,31 +9,35 @@
 
 <Method name="TestKorttekstStartMet">
 <Implementation><![CDATA[
-	Set StartMet = ##class(APPS.common.ProductCriteria.impl.ProductCodeStartMetCriterium).%New("OL.VLI")
+	Set StartMetCriterium = ##class(APPS.common.ProductCriteria.dto.ProductCodeStartMetCriterium).%New()
+	Set StartMetCriterium.StartMet = "OL.VLI"
 	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
-	Set Query = ProductZoekOpCriteria.BouwZoekQuery(StartMet)
+	Set Query = ProductZoekOpCriteria.BouwZoekQuery(StartMetCriterium)
 	
 	Do $$$AssertEquals(Query,"SELECT Prod.Product.ID FROM Prod.Product WHERE KortTekst LIKE 'OL.VLI%'","De Query")
 ]]></Implementation>
 </Method>
 
 <Method name="TestClassificatie">
 <Implementation><![CDATA[
-	Set Classificatie = ##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(374)
+	Set ClassificatieCriterium = ##class(APPS.common.ProductCriteria.dto.ClassificatieCriterium).%New()
+	Set ClassificatieCriterium.ClassificatieID = 374
 	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
-	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Classificatie)
+	Set Query = ProductZoekOpCriteria.BouwZoekQuery(ClassificatieCriterium)
 	
 	Do $$$AssertEquals(Query,"SELECT Prod.ProductKlas.ID FROM Prod.ProductKlas JOIN Prod_Klas.Klas ON Prod_Klas.Klas.ID = Prod.ProductKlas.Klas WHERE Prod_Klas.Klas.ID = 374","De Query")
 ]]></Implementation>
 </Method>
 
 <Method name="TestKTStarMetEnClassificatie">
 <Implementation><![CDATA[
-	Set StartMet = ##class(APPS.common.ProductCriteria.impl.ProductCodeStartMetCriterium).%New("AFV")
-	Set Classificatie = ##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(605)
-	Set Of = ##class(APPS.common.ProductCriteria.impl.OfCriterium).%New()
-	Do Of.VoegToeCriteria(StartMet)
-	Do Of.VoegToeCriteria(Classificatie)
+	Set StartMetCriterium = ##class(APPS.common.ProductCriteria.dto.ProductCodeStartMetCriterium).%New()
+	Set StartMetCriterium.StartMet = "AFV"
+	Set ClassificatieCriterium = ##class(APPS.common.ProductCriteria.dto.ClassificatieCriterium).%New()
+	Set ClassificatieCriterium.ClassificatieID = 605
+	Set Of = ##class(APPS.common.ProductCriteria.dto.OfCriterium).%New()
+	Do Of.Criteria.Insert(StartMetCriterium)
+	Do Of.Criteria.Insert(ClassificatieCriterium)
 	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
 	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Of)
 	
@@ -43,16 +47,20 @@
 
 <Method name="TestKTStarMetEn2Classificaties">
 <Implementation><![CDATA[
-	Set StartMet = ##class(APPS.common.ProductCriteria.impl.ProductCodeStartMetCriterium).%New("AFV")
-	Set Classificatie = ##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(605)
-	Set Of = ##class(APPS.common.ProductCriteria.impl.OfCriterium).%New()
-	Do Of.VoegToeCriteria(StartMet)
-	Do Of.VoegToeCriteria(Classificatie)
-	Set Of2 = ##class(APPS.common.ProductCriteria.impl.OfCriterium).%New()
-	Do Of.VoegToeCriteria(Of2)
+	Set StartMetCriterium = ##class(APPS.common.ProductCriteria.dto.ProductCodeStartMetCriterium).%New()
+	Set StartMetCriterium.StartMet = "AFV"
+	Set ClassificatieCriterium = ##class(APPS.common.ProductCriteria.dto.ClassificatieCriterium).%New()
+	Set ClassificatieCriterium.ClassificatieID = 605
+	Set Of = ##class(APPS.common.ProductCriteria.dto.OfCriterium).%New()
+	Do Of.Criteria.Insert(StartMetCriterium)
+	Do Of.Criteria.Insert(ClassificatieCriterium)
+	Set Of2 = ##class(APPS.common.ProductCriteria.dto.OfCriterium).%New()
+	Do Of.Criteria.Insert(Of2)
 	// Eigenlijk kan dit criteria ook direct aan de eerste "of" worden toegevoegd.
 	// Maar bij wijze van test ook een dieper geneste structuur gebruiken.
-	Do Of2.VoegToeCriteria(##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(604))
+	Set ClassificatieCriterium = ##class(APPS.common.ProductCriteria.dto.ClassificatieCriterium).%New()
+	Set ClassificatieCriterium.ClassificatieID = 604
+	Do Of2.Criteria.Insert(ClassificatieCriterium)
 	
 	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
 	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Of)
Index: APPS/common/ProductCriteria/impl/ProductCriteriumVisitor.cls.xml
===================================================================
diff -u -r3068 -r3183
--- APPS/common/ProductCriteria/impl/ProductCriteriumVisitor.cls.xml	(.../ProductCriteriumVisitor.cls.xml)	(revision 3068)
+++ APPS/common/ProductCriteria/impl/ProductCriteriumVisitor.cls.xml	(.../ProductCriteriumVisitor.cls.xml)	(revision 3183)
@@ -3,40 +3,36 @@
 <Class name="APPS.common.ProductCriteria.impl.ProductCriteriumVisitor">
 <Abstract>1</Abstract>
 <ProcedureBlock>1</ProcedureBlock>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="VerwerkProductCodeStartMetCrit">
 <Abstract>1</Abstract>
-<FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.impl.ProductCodeStartMetCriterium</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.dto.ProductCodeStartMetCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkClassificatieCriterium">
 <Abstract>1</Abstract>
-<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.impl.ClassificatieCriterium</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.dto.ClassificatieCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkOfCriterium">
 <Abstract>1</Abstract>
-<FormalSpec>OfCriterium:APPS.common.ProductCriteria.impl.OfCriterium</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<FormalSpec>OfCriterium:APPS.common.ProductCriteria.dto.OfCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="BeginSamengesteldCriterium">
 <Abstract>1</Abstract>
-<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.impl.SamengesteldCriterium</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.dto.SamengesteldCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="EindeSamengesteldCriterium">
 <Abstract>1</Abstract>
-<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.impl.SamengesteldCriterium</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.dto.SamengesteldCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 </Export>
FishEye: Tag 3183 refers to a dead (removed) revision in file `APPS/common/ProductCriteria/impl/ProductCriterium.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?