Pass over pre/post actions in BaselineOfGToolkitPrerequisites [#3736]

feenkcom · May 15, 2024 · 6392d0a · 6392d0a
1 parent 35a1177
commit 6392d0a
Showing 1 changed file with 26 additions and 13 deletions.
diff --git a/src/BaselineOfGToolkitPrerequisites/BaselineOfGToolkitPrerequisites.class.st b/src/BaselineOfGToolkitPrerequisites/BaselineOfGToolkitPrerequisites.class.st
@@ -8,13 +8,32 @@ Class {
 	#category : #BaselineOfGToolkitPrerequisites
 }
 
+{ #category : #accessing }
+BaselineOfGToolkitPrerequisites >> applyPatchForJob [
+	self 
+		forPharo12: [] 
+		forPharo11AndPharo10: [ Job addSlot: #announcer ] 
+]
+
+{ #category : #accessing }
+BaselineOfGToolkitPrerequisites >> applyPatchForWeakArray [
+	self 
+		forPharo12: [] 
+		forPharo11AndPharo10: [ 
+			WeakArray
+				addClassVarNamed: 'MournLoopProcess';
+				addClassVarNamed: 'StopRequested';
+				addClassVarNamed: 'StoppedSemaphore';
+				initialize ]
+]
+
 { #category : #accessing }
 BaselineOfGToolkitPrerequisites >> baseline: spec [
 
 	<baseline>
 	spec for: #common do: [ 
-		spec preLoadDoIt: #preLoadGToolkit:.
-		spec postLoadDoIt: #postLoadGToolkit:.
+		spec preLoadDoIt: #preLoadGToolkitPrerequisites:.
+		spec postLoadDoIt: #postLoadGToolkitPrerequisites:.
 		spec
 			package: 'GToolkit-Pharo9-Deprecations';
 			package: 'GToolkit-Pharo9-Subscriptions' ;
@@ -23,25 +42,19 @@ BaselineOfGToolkitPrerequisites >> baseline: spec [
 ]
 
 { #category : #accessing }
-BaselineOfGToolkitPrerequisites >> postLoadGToolkit: spec [
+BaselineOfGToolkitPrerequisites >> postLoadGToolkitPrerequisites: spec [
 	(PostLoaded isNotNil and: [ PostLoaded ]) ifTrue: [ ^ self ].
 	PostLoaded := true.
 
-	WeakArray
-		addClassVarNamed: 'MournLoopProcess';
-		addClassVarNamed: 'StopRequested';
-		addClassVarNamed: 'StoppedSemaphore';
-		initialize.
+	self applyPatchForJob.
+	self applyPatchForWeakArray.
 ]
 
 { #category : #accessing }
-BaselineOfGToolkitPrerequisites >> preLoadGToolkit: spec [
+BaselineOfGToolkitPrerequisites >> preLoadGToolkitPrerequisites: spec [
 	(PreLoaded isNotNil and: [ PreLoaded ])
 		ifTrue: [ ^ self ].
 	PreLoaded := true. 
 
-	self 
-		forPharo12: [] 
-		forPharo11: [ Job addSlot: #announcer ] 
-		forPharo10: [ Job addSlot: #announcer ]
+
 ]