Index: TECH/Persistentie/GlobalPersistenceMgr.cls.xml
===================================================================
diff -u -r365 -r1956
--- TECH/Persistentie/GlobalPersistenceMgr.cls.xml	(.../GlobalPersistenceMgr.cls.xml)	(revision 365)
+++ TECH/Persistentie/GlobalPersistenceMgr.cls.xml	(.../GlobalPersistenceMgr.cls.xml)	(revision 1956)
@@ -38,11 +38,11 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>GlobalPersistenceMgr</ReturnType>
 <Implementation><![CDATA[
-		If ("" '= $Get(%GlobalPersistenceMgrInstance)) {
-			Quit %GlobalPersistenceMgrInstance
-		} Else {
-			Quit ..%New() // TODO: dit mag (voor performantie) een singleton instance van een toekomstige subclass geven die geen nodes onthoudt.
-		}
+	If ("" '= $Get(%GlobalPersistenceMgrInstance)) {
+		Quit %GlobalPersistenceMgrInstance
+	} Else {
+		Quit ..%New() // TODO: dit mag (voor performantie) een singleton instance van een toekomstige subclass geven die geen nodes onthoudt.
+	}
 ]]></Implementation>
 </Method>
 
@@ -53,7 +53,7 @@
 
 <Method name="Start">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[		Set %GlobalPersistenceMgrInstance = ..%New()
+<Implementation><![CDATA[	Set %GlobalPersistenceMgrInstance = ..%New()
 ]]></Implementation>
 </Method>
 
@@ -64,23 +64,21 @@
 
 <Method name="Stop">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[		Set %GlobalPersistenceMgrInstance = ""
+<Implementation><![CDATA[	Set %GlobalPersistenceMgrInstance = ""
 ]]></Implementation>
 </Method>
 
 <UDLText name="T">
-<Content><![CDATA[
-/* Geef een GlobalNode.
-	 * De GlobalNaam en Subscripts zijn aparte parameters, opdat we een "canonische" node key kunnen maken.
-	 */
+<Content><![CDATA[/* Geef een GlobalNode. De GlobalNaam en Subscripts zijn aparte parameters, opdat we een "canonische" node key kunnen maken. */
 ]]></Content>
 </UDLText>
 
 <Method name="GeefNodeViaSubscriptLijst">
 <FormalSpec>GlobalNaam:%String,Subscripts:%ListOfDataTypes</FormalSpec>
 <ReturnType>GlobalNode</ReturnType>
 <Implementation><![CDATA[
-	Set NodeKey = ##class(GlobalUtils).MaakNodeKey(GlobalNaam, Subscripts)
+	#Dim NodeKey As %String = ##class(GlobalUtils).MaakNodeKey(GlobalNaam, Subscripts)
+	
 	If (..OpenNodes.IsDefined(NodeKey)) {
 		Quit ..OpenNodes.GetAt(NodeKey)
 	} Else {
@@ -101,27 +99,28 @@
 <FormalSpec>GlobalNaam:%String,Subscript1:%String,Subscript2:%String,Subscript3:%String,Subscript4:%String,Subscript5:%String,Subscript6:%String</FormalSpec>
 <ReturnType>GlobalNode</ReturnType>
 <Implementation><![CDATA[
-		Set Subscripts = ##class(%ListOfDataTypes).%New()
-		If (1 = $Data(Subscript1)) {
-			Do Subscripts.Insert(Subscript1)
-			If (1 = $Data(Subscript2)) {
-				Do Subscripts.Insert(Subscript2)
-				If (1 = $Data(Subscript3)) {
-					Do Subscripts.Insert(Subscript3)
-					If (1 = $Data(Subscript4)) {
-						Do Subscripts.Insert(Subscript4)
-						If (1 = $Data(Subscript5)) {
-							Do Subscripts.Insert(Subscript5)
-							If (1 = $Data(Subscript6)) {
-								Do Subscripts.Insert(Subscript6)
-							}
+	Set Subscripts = ##class(%ListOfDataTypes).%New()
+	
+	If (1 = $Data(Subscript1)) {
+		Do Subscripts.Insert(Subscript1)
+		If (1 = $Data(Subscript2)) {
+			Do Subscripts.Insert(Subscript2)
+			If (1 = $Data(Subscript3)) {
+				Do Subscripts.Insert(Subscript3)
+				If (1 = $Data(Subscript4)) {
+					Do Subscripts.Insert(Subscript4)
+					If (1 = $Data(Subscript5)) {
+						Do Subscripts.Insert(Subscript5)
+						If (1 = $Data(Subscript6)) {
+							Do Subscripts.Insert(Subscript6)
 						}
 					}
 				}
 			}
 		}
+	}
 		
-		Quit ..GeefNodeViaSubscriptLijst(GlobalNaam, Subscripts)
+	Quit ..GeefNodeViaSubscriptLijst(GlobalNaam, Subscripts)
 ]]></Implementation>
 </Method>
 
@@ -135,8 +134,8 @@
 <Method name="MaakNodePersistentViaSubLijst">
 <FormalSpec>Node:TECH.Persistentie.GlobalNode,GlobalNaam:%String,Subscripts:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
+	#Dim NodeKey As %String = ##class(GlobalUtils).MaakNodeKey(GlobalNaam, Subscripts)
 	
-	Set NodeKey = ##class(GlobalUtils).MaakNodeKey(GlobalNaam, Subscripts)
 	If (Node.IsPersistent()) {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Node " _ Node _ " had reeds een persistente lokatie: " _ Node.GeefPersistenteLokatie() _ ". Opnieuw een persistente lokatie instellen (naar " _ NodeKey _ ") is niet ondersteund."))
 	} ElseIf (..OpenNodes.IsDefined(NodeKey)) {
@@ -151,27 +150,27 @@
 <Method name="MaakNodePersistent">
 <FormalSpec>Node:TECH.Persistentie.GlobalNode,GlobalNaam:%String,Subscript1:%String,Subscript2:%String,Subscript3:%String,Subscript4:%String,Subscript5:%String,Subscript6:%String</FormalSpec>
 <Implementation><![CDATA[
-		Set Subscripts = ##class(%ListOfDataTypes).%New()
-		If (1 = $Data(Subscript1)) {
-			Do Subscripts.Insert(Subscript1)
-			If (1 = $Data(Subscript2)) {
-				Do Subscripts.Insert(Subscript2)
-				If (1 = $Data(Subscript3)) {
-					Do Subscripts.Insert(Subscript3)
-					If (1 = $Data(Subscript4)) {
-						Do Subscripts.Insert(Subscript4)
-						If (1 = $Data(Subscript5)) {
-							Do Subscripts.Insert(Subscript5)
-							If (1 = $Data(Subscript6)) {
-								Do Subscripts.Insert(Subscript6)
-							}
+	Set Subscripts = ##class(%ListOfDataTypes).%New()
+	If (1 = $Data(Subscript1)) {
+		Do Subscripts.Insert(Subscript1)
+		If (1 = $Data(Subscript2)) {
+			Do Subscripts.Insert(Subscript2)
+			If (1 = $Data(Subscript3)) {
+				Do Subscripts.Insert(Subscript3)
+				If (1 = $Data(Subscript4)) {
+					Do Subscripts.Insert(Subscript4)
+					If (1 = $Data(Subscript5)) {
+						Do Subscripts.Insert(Subscript5)
+						If (1 = $Data(Subscript6)) {
+							Do Subscripts.Insert(Subscript6)
 						}
 					}
 				}
 			}
 		}
-		
-		Do ..MaakNodePersistentViaSubLijst(Node, GlobalNaam, Subscripts)
+	}
+	
+	Do ..MaakNodePersistentViaSubLijst(Node, GlobalNaam, Subscripts)
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/Persistentie/GlobalUtils.cls.xml
===================================================================
diff -u -r250 -r1956
--- TECH/Persistentie/GlobalUtils.cls.xml	(.../GlobalUtils.cls.xml)	(revision 250)
+++ TECH/Persistentie/GlobalUtils.cls.xml	(.../GlobalUtils.cls.xml)	(revision 1956)
@@ -8,14 +8,15 @@
 <UDLText name="T">
 <Content><![CDATA[
 /* @param GlobalNaam Deze moet met een hoedje beginnen.
-	 * @param Subscripts Deze mogen geen dubbele quotes bevatten.
-	 */
+ * @param Subscripts Deze mogen geen dubbele quotes bevatten.
+ */
 ]]></Content>
 </UDLText>
 
 <Method name="MaakNodeKey">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>GlobalNaam:%String,Subscripts:%ListOfDataTypes</FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim NodeKeyIsGeldig As %Boolean = 1
 	#dim NodeKey As %String = GlobalNaam _ "("
@@ -48,7 +49,7 @@
 [Previously private]</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>String:%String</FormalSpec>
-<Implementation><![CDATA[		Quit """" _ String _ """"
+<Implementation><![CDATA[	Quit """" _ String _ """"
 ]]></Implementation>
 </Method>