Fixes #61.

instantiations · Nov 5, 2020 · 0fa6ca2 · 0fa6ca2
1 parent 2491f68
commit 0fa6ca2
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 62 deletions.
diff --git a/envy/Tonel.dat b/envy/Tonel.dat
diff --git a/source/.configmaps b/source/.configmaps
@@ -1,4 +1,50 @@
 [
+	{
+		#conditions : [
+			{
+				#condition : 'true',
+				#requiredMaps : [
+					{
+						#name : 'Tonel',
+						#versionName : '1.69',
+						#ts : 3782022304
+					},
+					{
+						#name : 'z.ST: SUnit',
+						#versionName : 'V 9.2.2  [002]',
+						#ts : 3768827234
+					}
+				]
+			}
+		],
+		#ts : 3782022301,
+		#comment : '',
+		#formatVersion : '1.1',
+		#applications : OrderedCollection [
+			{
+				#name : 'EmLibraryToolsApp',
+				#versionName : '1.5',
+				#ts : 3777122976
+			},
+			{
+				#name : 'TonelLoaderTests',
+				#versionName : '1.8',
+				#ts : 3780217002
+			},
+			{
+				#name : 'TonelReaderTests',
+				#versionName : '1.30',
+				#ts : 3758443008
+			},
+			{
+				#name : 'TonelWriterTests',
+				#versionName : '1.34',
+				#ts : 3777113021
+			}
+		],
+		#name : 'Test Tonel',
+		#versionName : '1.20'
+	},
 	{
 		#conditions : [
 			{
@@ -12,7 +58,7 @@
 				]
 			}
 		],
-		#ts : 3781427008,
+		#ts : 3782022304,
 		#comment : '',
 		#formatVersion : '1.1',
 		#applications : OrderedCollection [
@@ -33,8 +79,8 @@
 			},
 			{
 				#name : 'TonelLoaderModel',
-				#versionName : '1.72',
-				#ts : 3781356699
+				#versionName : '1.73',
+				#ts : 3782018939
 			},
 			{
 				#name : 'TonelReaderModel',
@@ -53,52 +99,6 @@
 			}
 		],
 		#name : 'Tonel',
-		#versionName : '1.68'
-	},
-	{
-		#conditions : [
-			{
-				#condition : 'true',
-				#requiredMaps : [
-					{
-						#name : 'Tonel',
-						#versionName : '1.68',
-						#ts : 3781427008
-					},
-					{
-						#name : 'z.ST: SUnit',
-						#versionName : 'V 9.2.2  [002]',
-						#ts : 3768827234
-					}
-				]
-			}
-		],
-		#ts : 3781426995,
-		#comment : '',
-		#formatVersion : '1.1',
-		#applications : OrderedCollection [
-			{
-				#name : 'EmLibraryToolsApp',
-				#versionName : '1.5',
-				#ts : 3777122976
-			},
-			{
-				#name : 'TonelLoaderTests',
-				#versionName : '1.8',
-				#ts : 3780217002
-			},
-			{
-				#name : 'TonelReaderTests',
-				#versionName : '1.30',
-				#ts : 3758443008
-			},
-			{
-				#name : 'TonelWriterTests',
-				#versionName : '1.34',
-				#ts : 3777113021
-			}
-		],
-		#name : 'Test Tonel',
-		#versionName : '1.19'
+		#versionName : '1.69'
 	}
 ]
diff --git a/source/TonelLoaderModel/TonelApplicationLoader.class.st b/source/TonelLoaderModel/TonelApplicationLoader.class.st
@@ -122,7 +122,6 @@ TonelApplicationLoader >> createAndLoadApplication [
 		loadApplication;
 		deleteRemovedSubApplications;
 		versionApplication;
-		initializeApplication;
 		markAsLoaded
 
 
@@ -264,6 +263,7 @@ TonelApplicationLoader >> loader [
   #vaVisibility : 'private' }
 TonelApplicationLoader >> markAsLoaded [
 
+	self tonelApplication notifyLoad.
 	self loader addLoadedApplication: self tonelApplication
 ]
 

diff --git a/source/TonelLoaderModel/TonelLoaderSubApplication.class.st b/source/TonelLoaderModel/TonelLoaderSubApplication.class.st
@@ -436,17 +436,6 @@ TonelLoaderSubApplication >> includesClass: className [
 	^self tonelClasses includesKey: className asSymbol
 ]
 
-{ #category : 'Initialization',
-  #vaVisibility : 'private' }
-TonelLoaderSubApplication >> initialize [
-
-	| theApp |
-
-	theApp := Smalltalk classAt: self identifier.
-	(theApp class includesSelector: #loaded) ifTrue: [theApp loaded].
-	self subApplications do: [:each | each initialize]
-]
-
 { #category : 'Initialization',
   #vaVisibility : 'private' }
 TonelLoaderSubApplication >> initializeConditions [
@@ -602,6 +591,23 @@ TonelLoaderSubApplication >> notes [
 	^self rootTonelApplication notes
 ]
 
+{ #category : 'loading',
+  #vaVisibility : 'private' }
+TonelLoaderSubApplication >> notifyLoad [
+
+	| theApp |
+
+	theApp := Smalltalk classAt: self identifier.
+	self definedClasses do: [:each | 
+		(each concreteClassIn: theApp rootApplication)
+			ifNotNil: [:class |
+				(class includesSelector: #initializeAfterLoad) ifTrue: [class initializeAfterLoad]
+			].
+	].
+	(theApp class includesSelector: #loaded) ifTrue: [theApp loaded].
+	self subApplications do: [:each | each initialize]
+]
+
 { #category : 'accessing' }
 TonelLoaderSubApplication >> packageDefinedClasses [
 	^self packageDefinition definedClasses