Index: TECH/ClassInfo/MethodDefinition.cls.xml
===================================================================
diff -u -r924 -r931
--- TECH/ClassInfo/MethodDefinition.cls.xml	(.../MethodDefinition.cls.xml)	(revision 924)
+++ TECH/ClassInfo/MethodDefinition.cls.xml	(.../MethodDefinition.cls.xml)	(revision 931)
@@ -1,9 +1,9 @@
 <?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:10:54">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-10 16:15:01">
 <Class name="TECH.ClassInfo.MethodDefinition">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,TECH.ClassInfo.QNameFinder</Super>
-<TimeChanged>62158,58253.29557</TimeChanged>
+<TimeChanged>62160,58574.962852</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="MethodDefinition">
@@ -98,14 +98,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="UpdateParameters">
+<Implementation><![CDATA[	Set ..MethodDefinition.FormalSpec = ..GeefParametersToString()
+]]></Implementation>
+</Method>
+
 <Method name="Save">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..MethodDefinition.FormalSpec = ..GeefParametersToString()
+	Do ..UpdateParameters()
+	//Do ..MethodDefinition.Implementation.Flush()
 	Do ..MethodDefinition.Implementation.Rewind()
-	Quit ..MethodDefinition.%Save()
+	Set Status = ..MethodDefinition.%Save()
+	Do ..MethodDefinition.Implementation.Rewind()
+	Quit Status
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="2757493519"/>
+<Checksum value="2483780578"/>
 </Export>
Index: Tools/impl/RenameSuperCommand.cls.xml
===================================================================
diff -u -r907 -r931
--- Tools/impl/RenameSuperCommand.cls.xml	(.../RenameSuperCommand.cls.xml)	(revision 907)
+++ Tools/impl/RenameSuperCommand.cls.xml	(.../RenameSuperCommand.cls.xml)	(revision 931)
@@ -1,9 +1,9 @@
 <?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 15:14:04">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-10 15:38:23">
 <Class name="Tools.impl.RenameSuperCommand">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,Tools.impl.ICommand</Super>
-<TimeChanged>62158,54843.502421</TimeChanged>
+<TimeChanged>62160,56377.449765</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="RenameTo">
@@ -33,9 +33,10 @@
 <Implementation><![CDATA[
 	w "Wijzigen bovenklasse van "_..ClassDefinition.GeefNaam()_" naar "_..RenameTo
 	Do ..ClassDefinition.ZetSuperKlassen(..RenameTo)
-	Quit ..ClassDefinition.Save()
+	Quit $$$OK
+	//Quit ..ClassDefinition.Save()
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="15083511"/>
+<Checksum value="178903262"/>
 </Export>
Index: Tools/impl/RenameImplementationCommand.cls.xml
===================================================================
diff -u -r907 -r931
--- Tools/impl/RenameImplementationCommand.cls.xml	(.../RenameImplementationCommand.cls.xml)	(revision 907)
+++ Tools/impl/RenameImplementationCommand.cls.xml	(.../RenameImplementationCommand.cls.xml)	(revision 931)
@@ -1,9 +1,9 @@
 <?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:15:04">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-10 15:37:04">
 <Class name="Tools.impl.RenameImplementationCommand">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,Tools.impl.ICommand</Super>
-<TimeChanged>62158,58503.227793</TimeChanged>
+<TimeChanged>62160,56298.838595</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Implementation">
@@ -39,9 +39,10 @@
 		Set ImplementatieLijn = ImplementatieIterator.Next()
 		Do ImplementatieStream.WriteLine(ImplementatieLijn)
 	}
-	Quit ..MethodDefinition.Save()
+	Quit $$$OK
+	//Quit ..MethodDefinition.Save()
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="4142543934"/>
+<Checksum value="3748658107"/>
 </Export>
Index: Tools/impl/RenameParameterCommand.cls.xml
===================================================================
diff -u -r907 -r931
--- Tools/impl/RenameParameterCommand.cls.xml	(.../RenameParameterCommand.cls.xml)	(revision 907)
+++ Tools/impl/RenameParameterCommand.cls.xml	(.../RenameParameterCommand.cls.xml)	(revision 931)
@@ -1,9 +1,9 @@
 <?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:03:11">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-10 16:14:28">
 <Class name="Tools.impl.RenameParameterCommand">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,Tools.impl.ICommand</Super>
-<TimeChanged>62158,57790.288822</TimeChanged>
+<TimeChanged>62160,58542.267128</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="RenameTo">
@@ -39,9 +39,11 @@
 <Implementation><![CDATA[
 	w "Wijzigen type van parameter "_..ParameterDefinition.GeefNaam()_" van method "_..MethodDefinition.GeefNaam()_" uit klasse "_..MethodDefinition.GeefKlasse().GeefNaam()
 	Do ..ParameterDefinition.ZetType(..RenameTo)
-	Quit ..MethodDefinition.Save()
+	Do ..MethodDefinition.UpdateParameters()
+	Quit $$$OK
+	//Quit ..MethodDefinition.Save()
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="3135370401"/>
+<Checksum value="346670675"/>
 </Export>
Index: Tools/MovePackage.cls.xml
===================================================================
diff -u
--- Tools/MovePackage.cls.xml	(revision 0)
+++ Tools/MovePackage.cls.xml	(revision 931)
@@ -0,0 +1,30 @@
+<?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-10 10:37:45">
+<Class name="Tools.MovePackage">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<TimeChanged>62160,38340.367545</TimeChanged>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="Move">
+<Description>
+Do ##class(Tools.MovePackage).Move("zTryout.CSC.Timing","zTryout.CSC.TimingCopy")</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PackageFrom:%String,PackageTo:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ResultSet = ##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:Summary")
+	Do ResultSet.Execute()
+	While ResultSet.Next()
+	{
+		Set ClassNameFrom = ResultSet.Data("Name")
+		If (##class(TECH.StringUtils).StartsWith(ClassNameFrom,PackageFrom_"."))
+		{
+			Set ClassNameTo = PackageTo_$Extract(ClassNameFrom,$Length(PackageFrom)+1,$Length(ClassNameFrom))
+			Do ##class(Tools.MoveClass).%New().Move(ClassNameFrom,ClassNameTo)
+		}
+	}
+]]></Implementation>
+</Method>
+</Class>
+<Checksum value="730760160"/>
+</Export>
Index: TECH/ClassInfo/ClassDefinition.cls.xml
===================================================================
diff -u -r924 -r931
--- TECH/ClassInfo/ClassDefinition.cls.xml	(.../ClassDefinition.cls.xml)	(revision 924)
+++ TECH/ClassInfo/ClassDefinition.cls.xml	(.../ClassDefinition.cls.xml)	(revision 931)
@@ -1,9 +1,9 @@
 <?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 14:56:15">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-10 08:45:32">
 <Class name="TECH.ClassInfo.ClassDefinition">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,TECH.ClassInfo.QNameFinder</Super>
-<TimeChanged>62158,53774.693322</TimeChanged>
+<TimeChanged>62160,31607.215478</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="ClassDefinition">
@@ -115,7 +115,17 @@
 
 <Method name="Save">
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	Quit ..ClassDefinition.%Save()
+<Implementation><![CDATA[
+	Set Status = ..ClassDefinition.%Save()
+	
+	Set Methods = ..GeefMethods()
+	While (Methods.HasNext())
+	{
+		Set Method = Methods.Next()
+		Do Method.GeefImplementatie().Rewind()
+	}
+	
+	Quit Status
 ]]></Implementation>
 </Method>
 
@@ -144,5 +154,5 @@
 <Type>%Library.CustomStorage</Type>
 </Storage>
 </Class>
-<Checksum value="899011169"/>
+<Checksum value="3758335963"/>
 </Export>
Index: TECH/ClassInfo/QNameFinder.cls.xml
===================================================================
diff -u -r924 -r931
--- TECH/ClassInfo/QNameFinder.cls.xml	(.../QNameFinder.cls.xml)	(revision 924)
+++ TECH/ClassInfo/QNameFinder.cls.xml	(.../QNameFinder.cls.xml)	(revision 931)
@@ -1,12 +1,14 @@
 <?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-07 15:10:17">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-10 16:43:13">
 <Class name="TECH.ClassInfo.QNameFinder">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62157,54689.221767</TimeChanged>
+<TimeChanged>62160,60267.357823</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="GeefQualifiedName">
+<Description>
+Beter existsid ip openid gebruiken</Description>
 <FormalSpec>Klasse:%String,ContextClassDefinition:TECH.ClassInfo.ClassDefinition</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
@@ -64,5 +66,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="3139039541"/>
+<Checksum value="1582355682"/>
 </Export>
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>
Index: Tools/impl/RenameMethodCommand.cls.xml
===================================================================
diff -u -r907 -r931
--- Tools/impl/RenameMethodCommand.cls.xml	(.../RenameMethodCommand.cls.xml)	(revision 907)
+++ Tools/impl/RenameMethodCommand.cls.xml	(.../RenameMethodCommand.cls.xml)	(revision 931)
@@ -1,9 +1,9 @@
 <?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 15:38:04">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-10 15:37:13">
 <Class name="Tools.impl.RenameMethodCommand">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,Tools.impl.ICommand</Super>
-<TimeChanged>62158,56283.797043</TimeChanged>
+<TimeChanged>62160,56307.345193</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="RenameTo">
@@ -33,9 +33,10 @@
 <Implementation><![CDATA[
 	w "Wijzigen type van method "_..MethodDefinition.GeefNaam()_" uit klasse "_..MethodDefinition.GeefKlasse().GeefNaam()
 	Do ..MethodDefinition.ZetType(..RenameTo)
-	Quit ..MethodDefinition.Save()
+	Quit $$$OK
+	//Quit ..MethodDefinition.Save()
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="1573979812"/>
+<Checksum value="1699394161"/>
 </Export>
Index: Tools/impl/RenamePropertyCommand.cls.xml
===================================================================
diff -u -r907 -r931
--- Tools/impl/RenamePropertyCommand.cls.xml	(.../RenamePropertyCommand.cls.xml)	(revision 907)
+++ Tools/impl/RenamePropertyCommand.cls.xml	(.../RenamePropertyCommand.cls.xml)	(revision 931)
@@ -1,9 +1,9 @@
 <?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 15:34:05">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-10 15:38:14">
 <Class name="Tools.impl.RenamePropertyCommand">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,Tools.impl.ICommand</Super>
-<TimeChanged>62158,56044.46793</TimeChanged>
+<TimeChanged>62160,56368.68175</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="RenameTo">
@@ -33,9 +33,10 @@
 <Implementation><![CDATA[
 	w "Wijzigen type van property "_..PropertyDefinition.GeefNaam()_" uit klasse "_..PropertyDefinition.GeefKlasse().GeefNaam()
 	Do ..PropertyDefinition.ZetType(..RenameTo)
-	Quit ..PropertyDefinition.Save()
+	Quit $$$OK
+	///Quit ..PropertyDefinition.Save()
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="2414516186"/>
+<Checksum value="906921827"/>
 </Export>