Index: TECH/SourceCodeUtils.cls.xml
===================================================================
diff -u -r748 -r788
--- TECH/SourceCodeUtils.cls.xml	(.../SourceCodeUtils.cls.xml)	(revision 748)
+++ TECH/SourceCodeUtils.cls.xml	(.../SourceCodeUtils.cls.xml)	(revision 788)
@@ -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 6408)" ts="2011-01-31 13:03:06">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-03 16:56:50">
 <Class name="TECH.SourceCodeUtils">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62118,52341.974814</TimeChanged>
+<TimeChanged>62125,56558.026492</TimeChanged>
 <TimeCreated>62118,40201.414242</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -14,12 +14,17 @@
 <Implementation><![CDATA[
 	set Exists = 0
 	set ItemType = ..Type(InternalName)
+	
 	if ItemType = "routine" { 
 		set Exists = ##class(%RoutineMgr).Exists(InternalName) 
 	}
 	if ItemType = "class" { 
 		set Exists = ##class(%Dictionary.ClassDefinition).%ExistsId(..StripExtension(InternalName)) 
 	}
+	if ItemType = "csp" {
+		set CSPFilename = ##class(TECH.CSP.CSPApplicatie).GetPhysicalFilename(InternalName)
+		if $length(CSPFilename) set Exists = ##class(%File).Exists(CSPFilename)
+	}
 	quit Exists
 ]]></Implementation>
 </Method>
@@ -31,6 +36,7 @@
 <Implementation><![CDATA[
 	set Extensie = $piece(InternalName,".",$length(InternalName,"."))
 	if $zcvt(Extensie,"U")="CLS" quit "class"
+	if $extract(InternalName)="/" quit "csp"
 	if $zcvt(Extensie,"U")="CSP" quit "csp"
 	if $zcvt(Extensie,"U")="CSR" quit "csp"
 	if $zcvt(Extensie,"U")="PRJ" quit "project"
@@ -55,7 +61,7 @@
 		set Type = ..Type(InternalName) 
 		if Type = "class" {
 			set Class = ##class(%Dictionary.ClassDefinition).%OpenId(..StripExtension(InternalName))
-			Set IsSystemCode = Class.System
+			if $isObject(Class) Set IsSystemCode = Class.System
 		}
 	}
 
@@ -76,5 +82,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="706874168"/>
+<Checksum value="2707062469"/>
 </Export>
Index: TECH/File.cls.xml
===================================================================
diff -u -r748 -r788
--- TECH/File.cls.xml	(.../File.cls.xml)	(revision 748)
+++ TECH/File.cls.xml	(.../File.cls.xml)	(revision 788)
@@ -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 6408)" ts="2011-01-31 13:03:05">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-03 16:56:48">
 <Class name="TECH.File">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%Library.File</Super>
-<TimeChanged>62117,42872.648187</TimeChanged>
+<TimeChanged>62124,36966.520392</TimeChanged>
 <TimeCreated>62118,40201.173604</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -26,23 +26,28 @@
 <Method name="RemoveDirectoryTree">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Directory:%String</FormalSpec>
+<ReturnType>%Library.Integer</ReturnType>
 <Implementation><![CDATA[
+	#if $system.Version.GetMajor()=5
+	
 	// Uitlezen van alle bestanden in de directory
 	Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
 	Do ResultSet.Execute(Directory,"*")
-	While(ResultSet.Next())
-	{
+	While(ResultSet.Next()) {
 		Set FileLocation = ResultSet.Data("Name")
-		If (##class(%File).DirectoryExists(FileLocation))
-		{
+		If (..DirectoryExists(FileLocation)) {
 			Do ..Delete(FileLocation)
+		} Else	{
+			Do ..Delete(FileLocation)
 		}
-		Else
-		{
-			Do ##class(%File).Delete(FileLocation)
-		}
 	}
-	Do ##class(%File).RemoveDirectory(Directory)
+	Quit ..RemoveDirectory(Directory)
+	
+	#else
+	
+	quit ##super(Directory)
+	
+	#endif
 ]]></Implementation>
 </Method>
 
@@ -56,5 +61,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="222568097"/>
+<Checksum value="3819800779"/>
 </Export>
Index: TECH/StringUtils.cls.xml
===================================================================
diff -u -r748 -r788
--- TECH/StringUtils.cls.xml	(.../StringUtils.cls.xml)	(revision 748)
+++ TECH/StringUtils.cls.xml	(.../StringUtils.cls.xml)	(revision 788)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel) 5.0.21 (Build 6408)" ts="2011-01-31 13:03:06">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-03 16:56:50">
 <Class name="TECH.StringUtils">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62118,29428.208649</TimeChanged>
+<TimeChanged>62122,53431.034896</TimeChanged>
 <TimeCreated>62118,40201.439469</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="Replace">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>String,F,T,From,Cnt</FormalSpec>
+<FormalSpec>String,F,T,From,Cnt,Continue=0</FormalSpec>
 <Implementation><![CDATA[
  	Set P=1
  	For I=1:1:$G(From) Set P=$F(String,F,P) Quit:'P
@@ -19,6 +19,9 @@
  	.Set $E(String,P-$L(F),P-1)=T
  	.Set P=P-$L(F)+$L(T)
  	.Set Cnt=Cnt-1
+ 	if Continue {
+	  if String[F Set String = ..Replace(String,.F,.T,.From,.Cnt,.Continue)
+ 	}
  	Quit String
 ]]></Implementation>
 </Method>
@@ -30,5 +33,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="1519191299"/>
+<Checksum value="1429247905"/>
 </Export>
Index: TECH/FileInfo.cls.xml
===================================================================
diff -u -r748 -r788
--- TECH/FileInfo.cls.xml	(.../FileInfo.cls.xml)	(revision 748)
+++ TECH/FileInfo.cls.xml	(.../FileInfo.cls.xml)	(revision 788)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel) 5.0.21 (Build 6408)" ts="2011-01-31 13:03:05">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-03 16:56:49">
 <Class name="TECH.FileInfo">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
@@ -27,5 +27,5 @@
 <Type>%String</Type>
 </Property>
 </Class>
-<Checksum value="2172655803"/>
+<Checksum value="3409901325"/>
 </Export>