Fixes #115

instantiations · Jul 29, 2022 · d3488ad · d3488ad
1 parent ba0ad66
commit d3488ad
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/source/.configmaps b/source/.configmaps
@@ -1,7 +1,7 @@
 [
 	{
 		#conditions : [ ],
-		#ts : 3834673800,
+		#ts : 3836548555,
 		#comment : '',
 		#formatVersion : '1.1',
 		#applications : OrderedCollection [
@@ -22,8 +22,8 @@
 			},
 			{
 				#name : 'TonelLoaderModel',
-				#versionName : '1.5.5 c',
-				#ts : 3834492953
+				#versionName : '1.5.6',
+				#ts : 3836546104
 			},
 			{
 				#name : 'TonelReaderModel',
@@ -42,7 +42,7 @@
 			}
 		],
 		#name : 'ENVY/Image Tonel',
-		#versionName : '1.5.5 e'
+		#versionName : ''
 	},
 	{
 		#conditions : [ ],
@@ -72,6 +72,6 @@
 			}
 		],
 		#name : 'Test ENVY/Image Tonel',
-		#versionName : ''
+		#versionName : '1.5.6'
 	}
 ]
diff --git a/source/TonelLoaderModel/TonelLoaderSubApplication.class.st b/source/TonelLoaderModel/TonelLoaderSubApplication.class.st
@@ -300,11 +300,9 @@ TonelLoaderSubApplication >> createEditionIn: parentEmApp underCondition: condit
 { #category : 'loading' }
 TonelLoaderSubApplication >> createFor: parentApp underCondition: conditionCode withRoot: rootApp [
 
-	| aSubApp |
-
-	aSubApp := self createEditionIn: parentApp underCondition: conditionCode withRoot: rootApp.
-	self createSubApplicationsFor: aSubApp withRoot: rootApp.
-	^aSubApp
+	emApplication := self createEditionIn: parentApp underCondition: conditionCode withRoot: rootApp.
+	self createSubApplicationsFor: emApplication withRoot: rootApp.
+	^emApplication
 ]
 
 { #category : 'loading' }
@@ -364,7 +362,8 @@ TonelLoaderSubApplication >> definePoolDictionariesForClassesIn: anApp [
 	(self definedClasses select: [:each | (self emApplication notNil and: [each identifier = self emApplication name]) or: [each identifier = self identifier]]) collect: [
 		:tonelClass |
 		tonelClass loadDeclarationMethodsInto: anApp using: self loader.
-		EmInterface current rebuildNamespaceFor: anApp].
+		EmInterface current rebuildNamespaceFor: self emApplication
+	].
 
 	definedSharedPools notEmpty
 		ifTrue: [
@@ -402,6 +401,13 @@ TonelLoaderSubApplication >> emApplication [
 	^emApplication
 ]
 
+{ #category : 'accessing' }
+TonelLoaderSubApplication >> emApplication: emAppOrSubApp [
+	"Sets the Application/SubApplication instance of receiver."
+
+	emApplication := emAppOrSubApp
+]
+
 { #category : 'querying' }
 TonelLoaderSubApplication >> emClass [
 	"Answers the ENVY/Manager class for receiver."

diff --git a/source/TonelLoaderModel/TonelReaderAbstractClassDefinition.extension.st b/source/TonelLoaderModel/TonelReaderAbstractClassDefinition.extension.st
@@ -173,13 +173,12 @@ TonelReaderAbstractClassDefinition >> loadInto: anApp using: appLoader [
 TonelReaderAbstractClassDefinition >> loadMethodsInto: anApp using: aTonelLoader [
 
 	| concreteClass |
+
 	concreteClass := self concreteClassIn: anApp.
-	self tonelMethods do: 
-			[:aTonelMethod | 
-			aTonelMethod 
-				loadFor: concreteClass
-				into: anApp
-				using: aTonelLoader]
+	self tonelMethods do: [:aTonelMethod |
+		aTonelMethod loadFor: concreteClass into: anApp using: aTonelLoader.
+		aTonelMethod isDeclaration ifTrue: [EmInterface current rebuildNamespaceFor: anApp]
+	]
 ]
 
 { #category : 'loading-changes',