Index: svn/StudioHook.cls.xml
===================================================================
diff -u -r1632 -r1633
--- svn/StudioHook.cls.xml	(.../StudioHook.cls.xml)	(revision 1632)
+++ svn/StudioHook.cls.xml	(.../StudioHook.cls.xml)	(revision 1633)
@@ -142,9 +142,11 @@
 <Implementation><![CDATA[
 	if ..Debug write !,"Method 'UserAction' Type:"_Type_" Name:"_Name_" InternalName:"_InternalName_" SelectedText:"_SelectedText_" Action:"_Action_" Target:"_Target_" Msg:"_Msg_" Reload:"_Reload
 	#dim tCmd as svn.Command
-	set tIsPopupMenu=$zcvt($p(Name,",",1),"L")["integration"
-	set tMenu=$zcvt($p($p(Name,",",2)," ",1),"L")
-	set tMenu(2)=$zcvt($p($p(Name,",",2)," ",2,99),"L")
+	#dim tIsPopupMenu As %Boolean = $zcvt($p(Name,",",1),"L")["integration"
+	#dim Menu As %String = $zcvt($p(Name,",",1),"L")
+	#dim tMenu As %String =$zcvt($p($p(Name,",",2)," ",1),"L")
+	set tMenu(2) = $zcvt($p($p(Name,",",2)," ",2,99),"L")
+	
 	// DK 2.15
 	
 	set ..tNsp=$zutil(5)
@@ -168,60 +170,57 @@
 	// FMA
 	//if '##class(%File).DirectoryExists(..LocalWorkspacePath(..svnHelper.Branch)) do ..svnHelper.MakeDir(..LocalWorkspacePath(..svnHelper.Branch))
 	//
-	if tMenu="settings" { 
-		do ..SubversionSettings(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="import" {
-		do ..SubversionImport(.InternalName,.Action,.Target,.Msg,.Reload)
-		// branches
-	} elseif tMenu="branch" {
-		if tMenu(2)["set current" {
-			do ..SubversionBranchSetCurrent(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu(2)["show" {
-			do ..SubversionBranchShowCurrent(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu(2)["create" {
-			do ..SubversionBranchCreate(.InternalName,.Action,.Target,.Msg,.Reload)
-		} elseif tMenu(2)["merge" {
-			do ..SubversionBranchMerge(.InternalName,.Action,.Target,.Msg,.Reload)
-		} else {
-		    do ..SubversionBranchDelete(.InternalName,.Action,.Target,.Msg,.Reload)
-		}
-	} elseif tMenu="update" { 
-		set UpdateToVersion = $select(tMenu(2)["to head":"",1:0)
-		do ..SubversionUpdate(.InternalName,.Action,.Target,.Msg,.Reload,UpdateToVersion)
-	} elseif tMenu="getlatest" {
-		do ..svnHelper.SubversionGetLatest()
-	} elseif tMenu="pre-commit" {
-		do ..SubversionPreCommit(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="check" {
-		do ..SubversionCheck(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="revert" {
-		do ..SubversionRevert(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="status" {
-	    do ..SubversionStatus(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="synchronize" {
-		if tMenu(2)[ "changes" do ..SubversionSynchronizeChanges(.InternalName,.Action,.Target,.Msg,.Reload)
-		if tMenu(2)[ "all" {
-			Set Action = 1
-			set Target = "Alle bestanden synchronizeren met het file-systeem ?"
-		}
-	} elseif tMenu="reload" {
-		if $length(InternalName) {
-			#dim Repo As svn.Repository = ..svnHelper.GeefRepository(InternalName)
-			if $IsObject(Repo) {
-				set Action = 1
-				set Target = "Reload file "_InternalName_" from "_Repo.ExternalName(InternalName)_"?"
+	if Menu="subversion" {
+		if tMenu="settings" { 
+			do ..SubversionSettings(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu="import" {
+			do ..SubversionImport(.InternalName,.Action,.Target,.Msg,.Reload)
+			// branches
+		} elseif tMenu="branch" {
+			if tMenu(2)["set current" {
+				do ..SubversionBranchSetCurrent(.InternalName,.Action,.Target,.Msg,.Reload)
+			} elseif tMenu(2)["show" {
+				do ..SubversionBranchShowCurrent(.InternalName,.Action,.Target,.Msg,.Reload)
+			} elseif tMenu(2)["create" {
+				do ..SubversionBranchCreate(.InternalName,.Action,.Target,.Msg,.Reload)
+			} elseif tMenu(2)["merge" {
+				do ..SubversionBranchMerge(.InternalName,.Action,.Target,.Msg,.Reload)
+			} else {
+			    do ..SubversionBranchDelete(.InternalName,.Action,.Target,.Msg,.Reload)
 			}
-		}
-	} elseif tMenu="unittest" {
-		if tMenu(2)="uitvoeren" {
-			do ..RunUnitTest(.InternalName)
-		} elseif tMenu(2)="openen" {
-			do ..OpenUnitTest(.InternalName,.Action,.Target)	
-		} 
-	}
-	
-	elseif tMenu="tortoisesvn" {
-			if (tMenu(2) [ "log") do ..TortoiseSVN("log") 
+		} elseif tMenu="update" { 
+			set UpdateToVersion = $select(tMenu(2)["to head":"",1:0)
+			do ..SubversionUpdate(.InternalName,.Action,.Target,.Msg,.Reload,UpdateToVersion)
+		} elseif tMenu="getlatest" {
+			do ..svnHelper.SubversionGetLatest()
+		} elseif tMenu="pre-commit" {
+			do ..SubversionPreCommit(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu="check" {
+			do ..SubversionCheck(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu="revert" {
+			do ..SubversionRevert(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu="status" {
+		    do ..SubversionStatus(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu="synchronize" {
+			if tMenu(2)[ "changes" do ..SubversionSynchronizeChanges(.InternalName,.Action,.Target,.Msg,.Reload)
+			if tMenu(2)[ "all" {
+				Set Action = 1
+				set Target = "Alle bestanden synchronizeren met het file-systeem ?"
+			}
+		} elseif tMenu="reload" {
+			if $length(InternalName) {
+				#dim Repo As svn.Repository = ..svnHelper.GeefRepository(InternalName)
+				if $IsObject(Repo) {
+					set Action = 1
+					set Target = "Reload file "_InternalName_" from "_Repo.ExternalName(InternalName)_"?"
+				}
+			}
+		} elseif tMenu="source" {
+			set Action=1
+			Set path = $g(^SYS("SourceControl",$$$PRODUCT,"LocalSourceControlWorkspace"))
+			set Target="Update source control code from "_$zcvt(path,"l")_" ?"_$C(13,10)_$C(13,10)_"You have to restart the Studio afterwards."	
+		} elseif tMenu="tortoisesvn" {
+			if (tMenu(2) [ "log") do ..TortoiseSVN("log",.InternalName) 
 			if (tMenu(2) [ "status") do ..TortoiseSVN("repostatus")
 			if (tMenu(2) [ "update") {
 				if (tMenu(2) [ "head") { do ..TortoiseSVN("update") }
@@ -230,24 +229,32 @@
 			if (tMenu(2) [ "commit") do ..TortoiseSVN("commit")
 			if (tMenu(2) [ "browse") do ..TortoiseSVN("repobrowser")
 			if (tMenu(2) [ "merge") do ..TortoiseSVN("merge")
-	} elseif tMenu="commit" {
-		do ..SubversionCommit(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="project" {
-		do ..SubversionProject(.InternalName,.Action,.Target,.Msg,.Reload,.tMenu)
-	} elseif tMenu="resolved" {
-		set Action=1
-		set Target="Run 'resolved'?"	
-	} elseif tMenu="more" {
-		do ..SubversionMore(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="merge" {
-		do ..SubversionMerge(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="deploy" {
-		do ..SubversionDeploy(.InternalName,.Action,.Target,.Msg,.Reload)
-	} elseif tMenu="source" {
-		set Action=1
-		Set path = $g(^SYS("SourceControl",$$$PRODUCT,"LocalSourceControlWorkspace"))
-		set Target="Update source control code from "_$zcvt(path,"l")_" ?"_$C(13,10)_$C(13,10)_"You have to restart the Studio afterwards."	
-	} else { // nothing
+		} elseif tMenu="commit" {
+			do ..SubversionCommit(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu="project" {
+			do ..SubversionProject(.InternalName,.Action,.Target,.Msg,.Reload,.tMenu)
+		} elseif tMenu="resolved" {
+			set Action=1
+			set Target="Run 'resolved'?"	
+		} elseif tMenu="more" {
+			do ..SubversionMore(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu="merge" {
+			do ..SubversionMerge(.InternalName,.Action,.Target,.Msg,.Reload)
+		} elseif tMenu="deploy" {
+			do ..SubversionDeploy(.InternalName,.Action,.Target,.Msg,.Reload)
+		}
+	} elseif Menu="unit testing" {
+		if tMenu="unittest" {
+			if tMenu(2)="uitvoeren" {
+				do ..RunUnitTest(.InternalName)
+			} elseif tMenu(2)="openen" {
+				do ..OpenUnitTest(.InternalName,.Action,.Target)	
+			}
+		}
+		elseif tMenu="alle" {
+			do ..ExecUnitTest()	
+		}
+	}  else { // nothing
 	}
 done	//
 	Quit $$$OK
@@ -591,13 +598,15 @@
 <Method name="TortoiseSVN">
 <FormalSpec>Command:%String,Param:%String=""</FormalSpec>
 <Implementation><![CDATA[
-	set xCommand=##class(svn.Command).%New($listbuild(..svnHelper.LocalWorkspacePath(..svnHelper.Branch)))
-	set xCommand.Command="cmd /c tortoiseproc /command:"_Command
-		_" /path:" _ ..svnHelper.LocalWorkspacePath(..svnHelper.Branch)
+	#dim Repository As svn.Repository = ..svnHelper.GeefRepository(Param)
+	#dim WorkspacePath As %String = Repository.WorkspacePath()
+	set svnCommand=##class(svn.Command).%New($listbuild(WorkspacePath))
+	set svnCommand.Command="cmd /c tortoiseproc /command:"_Command
+		_" /path:" _ WorkspacePath
 		_ $Select(Param '= "":" /"_Param,1:"")
-	set xCommand.CallOut = 1
-	do xCommand.Execute()
-	kill xCommand
+	set svnCommand.CallOut = 1
+	do svnCommand.Execute()
+	kill svnCommand
 ]]></Implementation>
 </Method>
 
@@ -761,14 +770,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ExecUnitTest">
+<FormalSpec>Filter:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	write !,"UnitTest uitvoeren : ",Filter
+	do ##class(vhUnitTest.Manager).RunTest("/display=all",Filter)
+]]></Implementation>
+</Method>
+
 <Method name="RunUnitTest">
 <FormalSpec>InternalName:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim UnitTestName = ..BepaalUnitTestName(InternalName)
+	#dim UnitTestName As %String = $piece(InternalName,".",1,$length(InternalName,".")-1)
+	if '##class(TECH.StringUtils).StartsWith(UnitTestName,"vhUnitTest") { 
+		set UnitTestName = ..BepaalUnitTestName(InternalName)
+	}
+	
 	if ##class(%Dictionary.ClassDefinition).%ExistsId(UnitTestName) {
 		set UnitTestName = $piece(UnitTestName,"vhUnitTest.",2,$length(UnitTestName,"vhUnitTest."))
-		write !,"UnitTest uitvoeren : ",UnitTestName
-		do ##class(vhUnitTest.Manager).RunTest("/display=all",UnitTestName)
+		do ..ExecUnitTest(UnitTestName)
 	} else {
 		write !,"Geen unittest ("_UnitTestName_") voor "_InternalName	
 	}
@@ -1012,6 +1032,8 @@
 
 	set InternalName = ..svnHelper.NormalizeInternalName(InternalName)
 	do ..svnHelper.SVNExport(InternalName)
+	
+	do ##class(svn.InterfaceControleur).%New().Controleer($piece(InternalName,".",1,$length(InternalName,".")-1))
 
 	Quit $$$OK
 ]]></Implementation>