Index: Tools/impl/MoveHelper.cls.xml
===================================================================
diff -u
--- Tools/impl/MoveHelper.cls.xml	(revision 0)
+++ Tools/impl/MoveHelper.cls.xml	(revision 1554)
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="Tools.impl.MoveHelper">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.ClassInfo.QNameFinder</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="svnHelper">
+<Type>svn.Helper</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ZoekOpPrefix">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RenameFrom">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RenameTo">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ZoekOpPrefix:%Boolean=0</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..svnHelper = ##class(svn.Helper).%New()
+	Set ..ZoekOpPrefix = ZoekOpPrefix
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Move">
+<Description>
+Set cls="DUAL" 
+Do ##class(Tools.impl.MoveHelper).%New().Move("APPS.VisiDot."_cls,"APPS.VisiDot.dto."_cls)
+q
+Do ##class(Tools.impl.MoveHelper).%New().Move("APPS.VisiDot.DUAL","APPS.VisiDot.dto.DUAL")</Description>
+<FormalSpec>ClassFrom:%String,ClassTo:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ..RenameFrom = ClassFrom
+	Set ..RenameTo = ClassTo
+	
+	Set Berichten = ""
+	Set Commands = ##class(%ListOfObjects).%New()
+	Set TeVerplaatsenKlassen = ##class(%ListOfObjects).%New()
+	// We gaan alle unieke klassen verzamelen die moeten gesaved worden.
+	// Dit omdat veelvuldig saven van een klasse de implementation stream van de methods kan breken.
+	Set ClassesToSave = ##class(%ArrayOfObjects).%New()
+	
+	w !,"======================"_$Translate($J("",$Length(ClassFrom_ClassTo))," ","="),!
+	w "Verplaatsen van "_ClassFrom_" naar "_ClassTo,!
+	w "======================"_$Translate($J("",$Length(ClassFrom_ClassTo))," ","="),!!
+	
+	w "Zoeken...",!!
+	
+	Set ResultSet = ##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:Summary")
+	Do ResultSet.Execute()
+	While ResultSet.Next()
+	{
+		Set ClassName = ResultSet.Data("Name")
+		continue:($extract(ClassName,1)="%")   ; Geen %-klassen onderzoeken 
+		
+		Set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(ClassName)
+		If (ClassDefinition '= "")
+		{
+			If (..IsTeRenamen(ClassDefinition.Name))
+			{
+				Do TeVerplaatsenKlassen.Insert(ClassDefinition)
+			}
+			
+			Set Class = ##class(TECH.ClassInfo.ClassDefinition).%New(ClassDefinition.Name)
+			Set Berichten(Class.GeefNaam()) = ##class(%ListOfDataTypes).%New()
+			
+			// --- Controleer super klassen
+			Set SuperKlassen = Class.GeefSuperKlassen()
+			Set RenamedSuperKlassen = ""
+			Set HeeftRenamed = 0
+			While (SuperKlassen.HasNext())
+			{
+				Set SuperKlas = SuperKlassen.Next()
+				If (..IsTeRenamen(SuperKlas))
+				{
+					Do Berichten(Class.GeefNaam()).Insert("De bovenklasse")
+					Set SuperKlas = ..RenameNaar(SuperKlas)
+					Set HeeftRenamed = 1
+				}
+				Set RenamedSuperKlassen = RenamedSuperKlassen_SuperKlas_$S(SuperKlassen.HasNext():",",1:"")
+			}
+			
+			If (HeeftRenamed)
+			{
+				Do Commands.Insert(##class(Tools.impl.RenameSuperCommand).%New(RenamedSuperKlassen, Class))
+				Do ClassesToSave.SetAt(Class,Class.GeefNaam())
+			}
+			
+			// --- Controleer properties
+			Set Properties = Class.GeefProperties()
+			While (Properties.HasNext())
+			{
+				Set Property = Properties.Next()
+				If (..IsTeRenamen(Property.GeefType()))
+				{
+					Do Berichten(Class.GeefNaam()).Insert("Property type van "_Property.GeefNaam())
+					Do Commands.Insert(##class(Tools.impl.RenamePropertyCommand).%New(..RenameNaar(Property.GeefType()), Property))
+					Do ClassesToSave.SetAt(Class,Class.GeefNaam())
+				}
+			}
+			
+			Set Methods = Class.GeefMethods()
+			While (Methods.HasNext())
+			{
+				Set Method = Methods.Next()
+				// -- Controleer return types van methods
+				If (..IsTeRenamen(Method.GeefType()))
+				{
+					Do Berichten(Class.GeefNaam()).Insert("Return type van method "_Method.GeefNaam())
+					Do Commands.Insert(##class(Tools.impl.RenameMethodCommand).%New(..RenameNaar(Method.GeefType()), Method))
+					Do ClassesToSave.SetAt(Class,Class.GeefNaam())
+				}
+				
+				// -- Controleer parameter types
+				Set Parameters = Method.GeefParameters()
+				While (Parameters.HasNext())
+				{
+					Set Parameter = Parameters.Next()
+					If (..IsTeRenamen(Parameter.GeefType()))
+					{
+						Do Berichten(Class.GeefNaam()).Insert("Parameter "_Parameter.GeefNaam()_" van method "_Method.GeefNaam())
+						Do Commands.Insert(##class(Tools.impl.RenameParameterCommand).%New(..RenameNaar(Parameter.GeefType()), Parameter, Method))
+						Do ClassesToSave.SetAt(Class,Class.GeefNaam())
+					}
+				}
+				
+				// -- Controleer implementatie
+						
+				Set Implementatie = Method.GeefImplementatie()
+				Set i = 0
+				Set Lijnen = ##class(%ListOfDataTypes).%New()
+				While ('Implementatie.AtEnd)
+				{
+					Set Lijn = Implementatie.ReadLine()
+					If (Lijn [ "##class(")
+					{
+						Set Vervangen = ..ReplaceBetween(Class,Lijn,"##class(",")")
+						If (Vervangen '= Lijn) {
+							Set i = i + 1
+							Set Lijn = Vervangen
+						}
+					}
+					Do Lijnen.Insert(Lijn)
+				}
+				Do Implementatie.Rewind()
+				
+				If (i > 0)
+				{
+					Do Berichten(Class.GeefNaam()).Insert("In de method "_Method.GeefNaam()_" "_i_" keer gebruikt")
+					Do Commands.Insert(##class(Tools.impl.RenameImplementationCommand).%New(Lijnen, Method))
+					Do ClassesToSave.SetAt(Class,Class.GeefNaam())
+				}
+			}
+		}
+	}
+	
+	w "Volgende items zullen hernoemd worden:",!!
+	
+	Set Klasse = $Order(Berichten(""))
+	While (Klasse '= "")
+	{
+		If (Berichten(Klasse).Count() > 0)
+		{
+			w "In klasse "_Klasse_":",!
+			Set Iterator = ##class(TECH.ListIterator).%New(Berichten(Klasse))
+			While (Iterator.HasNext())
+			{
+				w $J(" ",4)_"- "_Iterator.Next(),!
+			}
+		}
+		Set Klasse = $Order(Berichten(Klasse))
+	}
+	
+	If (##class(%Dictionary.ClassDefinition).%ExistsId(ClassTo))
+	{
+		w !,"WAARSCHUWING: "_ClassTo_" bestaat reeds en zal worden overschreven!",!
+	}
+	
+	Set Input = ""
+	While (Input '= "Y") && (Input '= "N")
+	{
+		w !,"Wilt u deze acties uitvoeren? (Y/N)",!
+		read Input
+	}
+	
+	If (Input = "Y")
+	{
+		w !!,"Uitvoeren van de acties:",!!
+		
+		Set CommandIterator = ##class(TECH.ListIterator).%New(Commands)
+		While (CommandIterator.HasNext())
+		{
+			Set Command = CommandIterator.Next()
+			w $J(" ",4)_"- "
+			Set Status = Command.Execute()
+			w !
+			
+			If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+		}
+		
+		Set ClassesIterator = ##class(TECH.ListIterator).%New(ClassesToSave)
+		While (ClassesIterator.HasNext())
+		{
+			Set Class = ClassesIterator.Next()
+			If ('##class(TECH.ListUtils).Contains(TeVerplaatsenKlassen, ##class(%Dictionary.ClassDefinition).%OpenId(Class.GeefNaam())))
+			{
+				w $J(" ",4)_"- Opslaan "_Class.GeefNaam(),!
+				Set Status = Class.Save()
+				If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+				Else  Do ..ExportToSVN(Class.GeefNaam())
+			}
+		}
+		
+		
+		Set TeVerplaatsenIterator = ##class(TECH.ListIterator).%New(TeVerplaatsenKlassen)
+		While (TeVerplaatsenIterator.HasNext())
+		{
+			Set ClassFromDefinition = TeVerplaatsenIterator.Next()
+			Do ##class(%Dictionary.ClassDefinition).%DeleteId(..RenameNaar(ClassFromDefinition.Name))
+			w $J(" ",4)_"- Klasse "_ClassFromDefinition.Name_" verplaatsen...",!
+			
+			// De klasse mag pas op het einde van alle acties verplaatst worden, dit is nodig als er zich in de te verplaatsen
+			// klasse een referentie is naar zichzelf, anders wordt deze niet hernoemd.
+			Set Clone = ClassFromDefinition.%ConstructClone(1)
+			Set Clone.Name = ..RenameNaar(ClassFromDefinition.Name)
+			Set Status = Clone.%Save()
+			If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+			Else  Do ..ExportToSVN(Clone.Name)
+		}
+		
+		Set Input = ""
+		While (Input '= "Y") && (Input '= "N")
+		{
+			w !,"Wilt u volgende klassen definitief verwijderen? (Y/N)",!
+			Set TeVerplaatsenIterator = ##class(TECH.ListIterator).%New(TeVerplaatsenKlassen)
+			While (TeVerplaatsenIterator.HasNext())
+			{
+				Set ClassFromDefinition = TeVerplaatsenIterator.Next()
+				w $J(" ",4)_"- Klasse "_ClassFromDefinition.Name_"",!
+			}
+			read Input
+		}
+		
+		If (Input = "Y")
+		{
+			Set TeVerplaatsenIterator = ##class(TECH.ListIterator).%New(TeVerplaatsenKlassen)
+			While (TeVerplaatsenIterator.HasNext())
+			{
+				Set ClassFromDefinition = TeVerplaatsenIterator.Next()
+				Set Status = ##class(%Dictionary.ClassDefinition).%DeleteId(ClassFromDefinition.Name)
+				If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+				Else  Do ..DeleteFromSVN(ClassFromDefinition.Name)
+			}
+		}
+		
+		Do ..svnHelper.CompileImportedSourceCode()
+
+	}
+	
+	w !!,"GELIEVE EEN NIEUWE TERMINAL TE OPENEN VOOR DE VOLGENDE VERPLAATS ACTIE!",!!
+]]></Implementation>
+</Method>
+
+<Method name="ReplaceBetween">
+<FormalSpec>Class:TECH.ClassInfo.ClassDefinition,String:%String,Prefix:%String,Suffix:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Aantal = $Length(String,Prefix)
+	Set Find = 1
+	For i = 1:1:Aantal-1
+	{
+		Set Gevonden = $Piece($Piece($Extract(String,Find,$Length(String)),Prefix,2),Suffix)
+		Set Find = $Find(String,Prefix,Find)
+		If ($Extract(String,Find+$Length(Gevonden),Find+$Length(Gevonden)) = Suffix)
+		{
+			Set ClassName = ..GeefQualifiedName($Extract(String,Find,Find+$Length(Gevonden)-1),Class)
+			If (..IsTeRenamen(ClassName))
+			{
+				Set $Extract(String,Find,Find+$Length(Gevonden)-1) = ..RenameNaar(ClassName)
+			}
+		}
+	}
+	Quit String
+]]></Implementation>
+</Method>
+
+<Method name="IsTeRenamen">
+<FormalSpec>ClassName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Quit (..ZoekOpPrefix && ##class(TECH.StringUtils).StartsWith(ClassName,..RenameFrom)) || (ClassName = ..RenameFrom)
+]]></Implementation>
+</Method>
+
+<Method name="RenameNaar">
+<FormalSpec>ClassName:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set RenameNaar = ..RenameTo
+	If (..ZoekOpPrefix)
+	{
+		Set RenameNaar = RenameNaar_$Piece(ClassName,..RenameFrom,2,$Length(ClassName,..RenameFrom))
+	}
+	Quit RenameNaar
+]]></Implementation>
+</Method>
+
+<Method name="ExportToSVN">
+<FormalSpec>Classname:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set InternalName = Classname_".cls"
+	Do ..svnHelper.SVNExport(InternalName)
+	Do ..svnHelper.ToCompile.Insert(InternalName)
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="DeleteFromSVN">
+<FormalSpec>Classname:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set InternalName = Classname_".cls"
+	Do ..svnHelper.SVNDelete(InternalName)
+	Quit
+]]></Implementation>
+</Method>
+</Class>
+</Export>
FishEye: Tag 1554 refers to a dead (removed) revision in file `Tools/MovePackage.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: TECH/ListUtils.cls.xml
===================================================================
diff -u -r1523 -r1554
--- TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1523)
+++ TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1554)
@@ -99,6 +99,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Contains">
+<Description>
+Werkt ook voor ListOfObjects en Item een object</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>List:%ListOfDataTypes,Item:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set Iterator = ##class(TECH.ListIterator).%New(List)
+	Set Contains = 0
+	While ('Contains) && (Iterator.HasNext())
+	{
+		Set Contains = (Iterator.Next() = Item)
+	}
+	Quit Contains
+]]></Implementation>
+</Method>
+
 <Method name="RemoveObjectFromList">
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[Object,&List:%ListOfObjects]]></FormalSpec>
Index: Tools/CacheSourceUtils.cls.xml
===================================================================
diff -u
--- Tools/CacheSourceUtils.cls.xml	(revision 0)
+++ Tools/CacheSourceUtils.cls.xml	(revision 1554)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="Tools.CacheSourceUtils">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="MoveClass">
+<Description>
+Do ##class(Tools.CacheSourceUtils).MoveClass("KlasseVan","KlasseNaar")</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ClassToMove:%String,MoveToClass:%String</FormalSpec>
+<Implementation><![CDATA[	Do ##class(Tools.impl.MoveHelper).%New().Move(ClassToMove,MoveToClass)
+]]></Implementation>
+</Method>
+
+<Method name="MovePackage">
+<Description>
+Do ##class(Tools.CacheSourceUtils).MoveClass("PackageVan","PackageNaar")</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PackageToMove:%String,MoveToPackage:%String</FormalSpec>
+<Implementation><![CDATA[	Do ##class(Tools.impl.MoveHelper).%New(1).Move(PackageToMove,MoveToPackage)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
FishEye: Tag 1554 refers to a dead (removed) revision in file `Tools/MoveClass.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?