Index: TECH/File/impl/FileNameGenerator.cls.xml
===================================================================
diff -u -r1423 -r1452
--- TECH/File/impl/FileNameGenerator.cls.xml	(.../FileNameGenerator.cls.xml)	(revision 1423)
+++ TECH/File/impl/FileNameGenerator.cls.xml	(.../FileNameGenerator.cls.xml)	(revision 1452)
@@ -3,73 +3,30 @@
 <Class name="TECH.File.impl.FileNameGenerator">
 <Super>TECH.RegisteredObject,TECH.File.FileNameGenerator</Super>
 
-<Parameter name="Global">
-<Type>%String</Type>
-<Default>^||FileNameGeneratorGroup</Default>
-</Parameter>
-
-<Property name="FrequentieTabel">
-<Type>TECH.FrequentieTabel</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="Activeer">
-<ClassMethod>1</ClassMethod>
-<ReturnType>TECH.File.FileWriter</ReturnType>
-<Implementation><![CDATA[
-	do ##class(TECH.Context).Instance().PushFileAPIClassName(##class(vhTest.Fake.TECH.File.FileAPITemporaryByJCL).%ClassName(1))
-	Quit ##class(TECH.Context).Instance().GeefFileAPI().GeefFileWriter()
-]]></Implementation>
-</Method>
-
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.DomeinContext</ReturnType>
-<Implementation><![CDATA[
-	#dim %TECHFakeFileNameGenerator As TECH.File.FileNameGenerator
-	If ($G(%TECHFakeFileNameGenerator) = "") || ('$IsObject(%TECHFakeFileNameGenerator)) || ('%TECHFakeFileNameGenerator.%ClassIsLatestVersion()) {
-		Set %TECHFakeFileNameGenerator = ..%New()
-	}
-	Quit %TECHFakeFileNameGenerator
+<Implementation><![CDATA[	Quit ..%New()
 ]]></Implementation>
 </Method>
 
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set ..FrequentieTabel = ##class(TECH.FrequentieTabel).%New()
-	Do ..Reset()
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="GenerateFileName">
 <FormalSpec>FileName:TECH.String,Extension:TECH.String</FormalSpec>
 <Implementation><![CDATA[
-	#dim Groep As %String = $Get(@..#Global)
-	#dim GroepID As %String = Groep_"_ID"
-	
-	Do ..FrequentieTabel.Verhoog(GroepID)
-	#dim Teller As %String = ##class(TECH.StringUtils).AlignRight(..FrequentieTabel.GeefFrequentieVanItem(GroepID),0,3)
-	#dim BestandNaam As %String = Teller_"_"_FileName_"."_Extension
-	set:$length(Groep) BestandNaam = Groep_"_"_BestandNaam
+	#dim BestandNaam As %String = FileName_..GetExtension(Extension)
 	Quit BestandNaam
 ]]></Implementation>
 </Method>
 
-<Method name="ZetGroep">
-<FormalSpec>Groep:TECH.String</FormalSpec>
-<Implementation><![CDATA[	Set @..#Global = Groep
-]]></Implementation>
-</Method>
-
-<Method name="Reset">
+<Method name="GetExtension">
+<FormalSpec>Extension:TECH.String</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
-	Do ..FrequentieTabel.ResetItems()
-	Do ..ZetGroep("")
+	If Extension '= "" {
+		Set Extension = "."_Extension
+	}
+	Quit Extension
 ]]></Implementation>
 </Method>
 </Class>