Index: Tools/MoveClass.cls.xml
===================================================================
diff -u -r907 -r931
--- Tools/MoveClass.cls.xml	(.../MoveClass.cls.xml)	(revision 907)
+++ Tools/MoveClass.cls.xml	(.../MoveClass.cls.xml)	(revision 931)
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-08 16:44:29">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-11 07:41:50">
 <Class name="Tools.MoveClass">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.ClassInfo.QNameFinder</Super>
-<TimeChanged>62158,60268.508483</TimeChanged>
+<TimeChanged>62161,27785.215735</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="Move">
 <Description>
-Do ##class(Tools.MoveClass).%New().Move("zTryout.CSC.TestKlas2","zTryout.CSC.TestKlas3")</Description>
+Do ##class(Tools.MoveClass).%New().Move("zTryout.CSC.TestKlas3","zTryout.CSC.TestKlas2")</Description>
 <FormalSpec>ClassFrom:%String,ClassTo:%String</FormalSpec>
 <Implementation><![CDATA[
 	Set Berichten = ""
 	Set Commands = ##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 !,"======================"_$Translate($J("",$Length(ClassFrom_ClassTo))," ","="),!
 	w "Verplaatsen van "_ClassFrom_" naar "_ClassTo,!
 	w "======================"_$Translate($J("",$Length(ClassFrom_ClassTo))," ","="),!!
 	
@@ -48,7 +51,11 @@
 				Set RenamedSuperKlassen = RenamedSuperKlassen_SuperKlas_$S(SuperKlassen.HasNext():",",1:"")
 			}
 			
-			If (HeeftRenamed) Do Commands.Insert(##class(Tools.impl.RenameSuperCommand).%New(RenamedSuperKlassen, Class))
+			If (HeeftRenamed)
+			{
+				Do Commands.Insert(##class(Tools.impl.RenameSuperCommand).%New(RenamedSuperKlassen, Class))
+				Do ClassesToSave.SetAt(Class,Class.GeefNaam())
+			}
 			
 			// --- Controleer properties
 			Set Properties = Class.GeefProperties()
@@ -59,6 +66,7 @@
 				{
 					Do Berichten(Class.GeefNaam()).Insert("Property type van "_Property.GeefNaam())
 					Do Commands.Insert(##class(Tools.impl.RenamePropertyCommand).%New(ClassTo, Property))
+					Do ClassesToSave.SetAt(Class,Class.GeefNaam())
 				}
 			}
 			
@@ -71,6 +79,7 @@
 				{
 					Do Berichten(Class.GeefNaam()).Insert("Return type van method "_Method.GeefNaam())
 					Do Commands.Insert(##class(Tools.impl.RenameMethodCommand).%New(ClassTo, Method))
+					Do ClassesToSave.SetAt(Class,Class.GeefNaam())
 				}
 				
 				// -- Controleer parameter types
@@ -82,6 +91,7 @@
 					{
 						Do Berichten(Class.GeefNaam()).Insert("Parameter "_Parameter.GeefNaam()_" van method "_Method.GeefNaam())
 						Do Commands.Insert(##class(Tools.impl.RenameParameterCommand).%New(ClassTo, Parameter, Method))
+						Do ClassesToSave.SetAt(Class,Class.GeefNaam())
 					}
 				}
 				
@@ -92,7 +102,7 @@
 				While ('Implementatie.AtEnd)
 				{
 					Set Lijn = Implementatie.ReadLine()
-					If Lijn [ "##class("
+					If (Lijn [ "##class(")
 					{
 						Set Vervangen = ..ReplaceBetween(Class,Lijn,"##class(",")",ClassFrom,ClassTo)
 						If (Vervangen '= Lijn) {
@@ -102,11 +112,13 @@
 					}
 					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())
 				}
 			}
 		}
@@ -140,17 +152,58 @@
 	{
 		w !!,"Uitvoeren van de acties:",!!
 		
-		Set CommandIterator = ##class(TECH.ListIterator).%New(Commands)
-		While (CommandIterator.HasNext())
+		If (##class(%Dictionary.ClassDefinition).%ExistsId(ClassFrom))
 		{
-			Set Command = CommandIterator.Next()
-			w $J(" ",4)_"- "
-			Set Status = Command.Execute()
-			w !
+			Do ##class(%Dictionary.ClassDefinition).%DeleteId(ClassTo)
 			
-			Set Result = $$ParseStatus^vhLib(Status)
-			If (Result '= "") w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+			Set CommandIterator = ##class(TECH.ListIterator).%New(Commands)
+			While (CommandIterator.HasNext())
+			{
+				Set Command = CommandIterator.Next()
+				w $J(" ",4)_"- "
+				Set Status = Command.Execute()
+				w !
+				
+				If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+			}
+			
+			Set ClassesIterator = ##class(TECH.ListIterator).%New(ClassesToSave)
+			While (ClassesIterator.HasNext())
+			{
+				Set Class = ClassesIterator.Next()
+				w $J(" ",4)_"- Opslaan "_Class.GeefNaam(),!
+				Set Status = Class.Save()
+				If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+			}
+			
+			Set ClassFromDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(ClassFrom)
+			
+			w $J(" ",4)_"- Klasse 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 = ClassTo
+			Set Status = Clone.%Save()
+			If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+			
+			Set Input = ""
+			While (Input '= "Y") && (Input '= "N")
+			{
+				w !,"Wilt u de klasse "_ClassFrom_" definitief verwijderen? (Y/N)",!
+				read Input
+			}
+			
+			If (Input = "Y")
+			{
+				Set Status = ##class(%Dictionary.ClassDefinition).%DeleteId(ClassFrom)
+				If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+			}
 		}
+		Else
+		{
+			If (Result '= "") w $J(" ",6)_"Fout: "_ClassFrom_" bestaat niet!",!
+		}
 	}
 ]]></Implementation>
 </Method>
@@ -178,5 +231,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="190735511"/>
+<Checksum value="3462824080"/>
 </Export>