Index: TECH/ListUtils.cls.xml
===================================================================
diff -u -r1558 -r1561
--- TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1558)
+++ TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1561)
@@ -433,48 +433,49 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Lijst:%ListOfObjects,Comparator:TECH.Comparator.IComparator</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[
-	#dim Maximum As %CacheString = ""
-	If Lijst.Count() > 0 
-	{
-		Set Maximum = Lijst.GetAt(1)
-		#dim i As TECH.Integer
-		For i = 2:1:Lijst.Count()
-		{
-			#dim HulpWaarde As %CacheString = Lijst.GetAt(i)
-			If ($$$Not(Comparator.IsKleinerDan(HulpWaarde,Maximum)))
-			{
-				Set Maximum = HulpWaarde	
-			}
-		}
-	}
-	Quit Maximum
+<Implementation><![CDATA[	Quit ..GeefExtrema(Lijst, Comparator, $$$True)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefMinimum">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Lijst:%ListOfObjects,Comparator:TECH.Comparator.IComparator</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefExtrema(Lijst, Comparator, $$$False)
+]]></Implementation>
+</Method>
+
+<Method name="GeefExtrema">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Lijst:%ListOfObjects,Comparator:TECH.Comparator.IComparator,IsMaximum:%Boolean</FormalSpec>
+<Private>1</Private>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	#dim Minimum As %CacheString = ""
-	If Lijst.Count() > 0 
-	{
-		Set Minimum = Lijst.GetAt(1)
+	#dim Extrema As %CacheString = ""
+	If Lijst.Count() > 0 {
+		Set Extrema = Lijst.GetAt(1)
 		#dim i As TECH.Integer
-		For i = 2:1:Lijst.Count()
-		{
+		For i = 2:1:Lijst.Count() {
 			#dim HulpWaarde As %CacheString = Lijst.GetAt(i)
-			If (Comparator.IsKleinerDan(HulpWaarde,Minimum))
-			{
-				Set Minimum = HulpWaarde	
+			If (..ComparatorValidator(HulpWaarde,Extrema, Comparator, IsMaximum)) {
+				Set Extrema = HulpWaarde	
 			}
 		}
 	}
-	Quit Minimum
+	Quit Extrema
 ]]></Implementation>
 </Method>
 
+<Method name="ComparatorValidator">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Waarde1:%CacheString,Waarde2:%CacheString,Comparator:TECH.Comparator.IComparator,IsMaximum:%Boolean</FormalSpec>
+<Language>basic</Language>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Return Comparator.IsKleinerDan(Waarde1,Waarde2) Xor IsMaximum
+]]></Implementation>
+</Method>
+
 <Method name="IsDeelverzamelingVan">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Lijst1:%ListOfDataTypes,Lijst2:%ListOfDataTypes</FormalSpec>