Upgrading to a new version

src/BaselineOfMolecule/BaselineOfMolecule.class.st

@@ -2,7 +2,7 @@ Class {
 	#name : #BaselineOfMolecule,
 	#superclass : #BaselineOf,
 	#instVars : [
-		'previousDynamicContractUpdateActivated'
+		'isPreviouslyAutoComponentTypeUpdateActivated'
 	],
 	#category : #BaselineOfMolecule
 }
@@ -31,12 +31,17 @@ BaselineOfMolecule >> baseline: spec [
 BaselineOfMolecule >> postload: loader package: packageSpec [
 	"Reload new Molecule tools"
 
-	(Smalltalk globals includesKey: #MolComponentManager) ifFalse:[ ^self ].
-	(Smalltalk globals classNamed: #MolComponentManager) cleanUp.
-	"Rebuild all components"
+	| componentManagerClass |
+	componentManagerClass := RGClassDefinition named: #MolComponentManager.
+	componentManagerClass isDefined ifFalse:[ ^ self ].
+	componentManagerClass realClass cleanUp.
+
+	"Define all components after loading"
 	MolComponentFactory defineAllComponents.
-	"Reactive dynamic contract update if necessary"
-	(previousDynamicContractUpdateActivated ifNil:[false]) ifFalse:[
+	MolSystemObserver active.
+
+	"Active auto ComponentType update if necessary"
+	(isPreviouslyAutoComponentTypeUpdateActivated ifNil:[ false ]) ifFalse:[
 		MolComponentFactory default activateDynamicContractUpdate.	
 	].
 ]
@@ -45,9 +50,12 @@ BaselineOfMolecule >> postload: loader package: packageSpec [
 BaselineOfMolecule >> preload: loader package: packageSpec [
 	"If a Molecule component system is running, confirm loading and cleanUp before installation of the new version"
 
-	(Smalltalk globals includesKey: #MolComponentManager) ifFalse:[ ^self ].
-	previousDynamicContractUpdateActivated := false.
-	(Smalltalk globals classNamed: #MolComponentManager) isRunningComponents ifTrue:[ 
+	| componentManagerClass |
+	componentManagerClass := RGClassDefinition named: #MolComponentManager.
+	componentManagerClass isDefined ifFalse:[ ^ self ].
+
+	isPreviouslyAutoComponentTypeUpdateActivated := false.
+	componentManagerClass realClass isRunningComponents ifTrue:[ 
 		(Smalltalk ui theme
 		proceedIn: Morph new 
 		text: 'Warning, you are going to modify Molecule then components are started, do you want to continue ?'
@@ -57,7 +65,8 @@ BaselineOfMolecule >> preload: loader package: packageSpec [
 		].
 	].
 
-	(Smalltalk globals classNamed: #MolComponentManager) cleanUp.
-	previousDynamicContractUpdateActivated := MolComponentFactory default isDynamicContractUpdateActivated.
+	componentManagerClass realClass cleanUp.
+	isPreviouslyAutoComponentTypeUpdateActivated := MolComponentFactory default isDynamicContractUpdateActivated.
 	MolComponentFactory default deactivateDynamicContractUpdate.
+	MolSystemObserver deactive.
 ]

src/Molecule-IDE/MolWorld.class.st

@@ -7,6 +7,17 @@ Class {
 	#category : #'Molecule-IDE-Menus'
 }
 
+{ #category : #accessing }
+MolWorld class >> componentFactoryClass [
+
+	| class |
+	class := RGClassDefinition named: #MolComponentFactory.
+
+	class isDefined
+		ifTrue: [ ^ class realClass ]
+		ifFalse: [ ^ nil ]
+]
+
 { #category : #scripts }
 MolWorld class >> defineAComponent [
 
@@ -171,6 +182,17 @@ MolWorld class >> menu60ReportBugOn: aBuilder [
 		action: [WebBrowser openOn: 'https://github.com/OpenSmock/Molecule/issues/new']
 ]
 
+{ #category : #accessing }
+MolWorld class >> molUtilsClass [
+
+	| class |
+	class := RGClassDefinition named: #MolUtils.
+
+	class isDefined
+		ifTrue: [ ^ class realClass ]
+		ifFalse: [ ^ nil ]
+]
+
 { #category : #scripts }
 MolWorld class >> openDefineComponentDialog [
 
@@ -234,7 +256,10 @@ This action may be necessary if your system is broken.'
 { #category : #'menu - tools' }
 MolWorld class >> toolsMenu20ToggleLogsOn: aBuilder [
 	<worldMenu>
-	MolUtils isLogActive 
+
+	| utilsClass |
+	utilsClass := self molUtilsClass ifNil:[ ^ self ].
+	utilsClass isLogActive 
 		ifFalse: [ 
 			(aBuilder item: #TurnOffMolLogs)
 				parent: #MoleculeDebug;
@@ -256,7 +281,10 @@ MolWorld class >> toolsMenu20ToggleLogsOn: aBuilder [
 { #category : #'menu - tools' }
 MolWorld class >> toolsMenu30ToggleDynamicContractUpdate: aBuilder [
 	<worldMenu>
-	MolComponentFactory default isDynamicContractUpdateActivated 
+
+	| factoryClass |
+	factoryClass := self componentFactoryClass ifNil:[ ^ self ].
+	factoryClass default isDynamicContractUpdateActivated 
 		ifFalse: [ 
 			(aBuilder item: #TurnOffMolLogs)
 				parent: #MoleculeDebug;

src/Molecule-Tests/MolComponentFactoryTest.class.st

@@ -798,17 +798,19 @@ MolComponentFactoryTest >> testDefineComponentTypeImplementors [
 
 { #category : #tests }
 MolComponentFactoryTest >> testDefineDirtyComponents [
-	self assert: MolComponentFactory default dirtyComponentTypes isEmpty.
+
+	self assert: MolComponentFactory dirtyComponentTypeList isEmpty.
 
 	"Add a dirty component type manually"
-	MolComponentFactory default dirtyComponentTypes add: MolMyClientComponent.
-	MolComponentFactory default dirtyComponents add: MolMyClientComponentImpl.
-	self assert: MolComponentFactory default dirtyComponentTypes notEmpty.
-	self assert: MolComponentFactory default dirtyComponents notEmpty.
-
+	MolComponentFactory dirtyComponentTypeList add: MolMyClientComponent.
+	MolComponentFactory dirtyComponentImplList add:
+		MolMyClientComponentImpl.
+	self assert: MolComponentFactory dirtyComponentTypeList notEmpty.
+	self assert: MolComponentFactory dirtyComponentImplList notEmpty.
+
 	MolComponentFactory defineDirtyComponents.
-	self assert: MolComponentFactory default dirtyComponentTypes isEmpty.
-	self assert: MolComponentFactory default dirtyComponents isEmpty.
+	self assert: MolComponentFactory dirtyComponentTypeList isEmpty.
+	self assert: MolComponentFactory dirtyComponentImplList isEmpty
 ]
 
 { #category : #tests }

src/Molecule/MCPackageLoader.extension.st

@@ -0,0 +1,40 @@
+Extension { #name : #MCPackageLoader }
+
+{ #category : #'*Molecule' }
+MCPackageLoader >> announceLoad: aString do: aBlock [
+	| returnValue |
+	returnValue := nil.
+	[ self announceLoadStart: aString ] ensure: [ 
+		[ returnValue := aBlock value ] ensure: [ 
+			self announceLoadStop: aString ] ].
+	^ returnValue
+]
+
+{ #category : #'*Molecule' }
+MCPackageLoader >> announceLoadStart: aString [
+	SystemAnnouncer uniqueInstance announce: (MCPackageLoaderStarted new
+		packageLoader: self;
+		label: aString; 
+		yourself)
+]
+
+{ #category : #'*Molecule' }
+MCPackageLoader >> announceLoadStop: aString [
+	SystemAnnouncer uniqueInstance announce: (MCPackageLoaderStarted new
+		packageLoader: self;
+		label: aString; 
+		yourself)
+]
+
+{ #category : #'*Molecule' }
+MCPackageLoader >> basicLoadWithNameLike: baseName [
+
+	self validate.
+	self useNewChangeSetNamedLike: baseName during: [self basicLoad].
+]
+
+{ #category : #'*Molecule' }
+MCPackageLoader >> loadWithNameLike: aString [
+
+	^ self announceLoad: aString do: [ self basicLoadWithNameLike: aString ]
+]

src/Molecule/MCPackageLoaderStarted.class.st

@@ -0,0 +1,33 @@
+Class {
+	#name : #MCPackageLoaderStarted,
+	#superclass : #Announcement,
+	#instVars : [
+		'packageLoader',
+		'label'
+	],
+	#category : #'Molecule-Announcers'
+}
+
+{ #category : #accessing }
+MCPackageLoaderStarted >> label [
+
+	^ label
+]
+
+{ #category : #accessing }
+MCPackageLoaderStarted >> label: anObject [
+
+	label := anObject
+]
+
+{ #category : #accessing }
+MCPackageLoaderStarted >> packageLoader [
+
+	^ packageLoader
+]
+
+{ #category : #accessing }
+MCPackageLoaderStarted >> packageLoader: anObject [
+
+	packageLoader := anObject
+]

src/Molecule/MCPackageLoaderStopped.class.st

@@ -0,0 +1,31 @@
+Class {
+	#name : #MCPackageLoaderStopped,
+	#superclass : #Announcement,
+	#instVars : [
+		'packageLoader',
+		'label'
+	],
+	#category : #'Molecule-Announcers'
+}
+
+{ #category : #accessing }
+MCPackageLoaderStopped >> label [
+	^ label
+]
+
+{ #category : #accessing }
+MCPackageLoaderStopped >> label: anObject [
+	label := anObject
+]
+
+{ #category : #accessing }
+MCPackageLoaderStopped >> packageLoader [
+
+	^ packageLoader
+]
+
+{ #category : #accessing }
+MCPackageLoaderStopped >> packageLoader: anObject [
+
+	packageLoader := anObject
+]