Index: Tools/MoveClass.cls.xml
===================================================================
diff -u -r932 -r946
--- Tools/MoveClass.cls.xml	(.../MoveClass.cls.xml)	(revision 932)
+++ Tools/MoveClass.cls.xml	(.../MoveClass.cls.xml)	(revision 946)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel) 5.0.21 (Build 6408U)" ts="2011-03-11 09:34:26">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-18 13:58:59">
 <Class name="Tools.MoveClass">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.ClassInfo.QNameFinder</Super>
-<TimeChanged>62161,34466.097579</TimeChanged>
+<TimeChanged>62168,50420.352489</TimeChanged>
 <TimeCreated>62161,32256.917774</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -43,7 +43,7 @@
 	While ResultSet.Next()
 	{
 		Set ClassName = ResultSet.Data("Name")
-		continue:$extract(ClassName)="%"
+		continue:($extract(ClassName,1)="%")   ; Geen %-klassen onderzoeken 
 		
 		Set ClassDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(ClassName)
 		If (ClassDefinition '= "")
@@ -112,6 +112,7 @@
 				}
 				
 				// -- Controleer implementatie
+						
 				Set Implementatie = Method.GeefImplementatie()
 				Set i = 0
 				Set Lijnen = ##class(%ListOfDataTypes).%New()
@@ -157,6 +158,11 @@
 		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")
 	{
@@ -180,7 +186,7 @@
 				Set Status = Command.Execute()
 				w !
 				
-				If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+				If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
 			}
 			
 			Set ClassesIterator = ##class(TECH.ListIterator).%New(ClassesToSave)
@@ -189,8 +195,8 @@
 				Set Class = ClassesIterator.Next()
 				w $J(" ",4)_"- Opslaan "_Class.GeefNaam(),!
 				Set Status = Class.Save()
-				If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
-				else  do ..ExportToSVN(Class.GeefNaam())
+				If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+				Else  Do ..ExportToSVN(Class.GeefNaam())
 			}
 			
 			Set ClassFromDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(ClassFrom)
@@ -202,8 +208,8 @@
 			Set Clone = ClassFromDefinition.%ConstructClone(1)
 			Set Clone.Name = ClassTo
 			Set Status = Clone.%Save()
-			If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
-			else  do ..ExportToSVN(Class.GeefNaam())
+			If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+			Else  Do ..ExportToSVN(Clone.Name)
 			
 			Set Input = ""
 			While (Input '= "Y") && (Input '= "N")
@@ -215,11 +221,11 @@
 			If (Input = "Y")
 			{
 				Set Status = ##class(%Dictionary.ClassDefinition).%DeleteId(ClassFrom)
-				If ('Status) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
-				else  do ..DeleteFromSVN(ClassFrom)
+				If ($$$ISERR(Status)) w $J(" ",6)_"Fout: "_$$ParseStatus^vhLib(Status),!
+				Else  Do ..DeleteFromSVN(ClassFrom)
 			}
 			
-			do ..svnHelper.CompileImportedSourceCode()
+			Do ..svnHelper.CompileImportedSourceCode()
 		}
 		Else
 		{
@@ -256,22 +262,22 @@
 <FormalSpec>Classname:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	set InternalName = Classname_".cls"
-	do ..svnHelper.SVNExport(InternalName)
-	do ..svnHelper.ToCompile.Insert(InternalName)
-	quit
+	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
+	Set InternalName = Classname_".cls"
+	Do ..svnHelper.SVNDelete(InternalName)
+	Quit
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="3303873046"/>
+<Checksum value="3116217146"/>
 </Export>