Merge pull request #156 from OpenSmock/Issue_0155

src/BaselineOfPyramid/BaselineOfPyramid.class.st

@@ -8,36 +8,115 @@ Class {
 BaselineOfPyramid >> baseline: spec [
 
 	<baseline>
-	spec for: #common do: [
-		spec postLoadDoIt: #postload:package:.
-		self dependencies: spec.
-		spec
-			package: #Pyramid;
-			package: #'Pyramid-IDE' with: [ spec requires: #( #Pyramid ) ];
-			package: #'Pyramid-Bloc'
-			with: [ spec requires: #( #Pyramid #Bloc #BlocSerialization ) ];
-			package: #'Pyramid-Tests'
-			with: [ spec requires: #( #Pyramid #'Pyramid-Bloc' ) ];
-			package: #'Pyramid-Examples'
-			with: [ spec requires: #( #Pyramid ) ];
-			package: #'Pyramid-IDE' with: [ spec requires: #( #Pyramid ) ] ]
+	"Common baseline for all Pharo versions"
+	spec for: #common do: [ self baselineForCommon: spec ]
 ]
 
 { #category : #baselines }
-BaselineOfPyramid >> dependencies: spec [
+BaselineOfPyramid >> baselineForCommon: spec [
 
-		spec
-			baseline: #Bloc
-			with: [
-			spec repository: 'github://pharo-graphics/Bloc:master/src' ].
-		spec
-			baseline: #BlocSerialization
-			with: [
-			spec repository: 'github://OpenSmock/Bloc-Serialization:main/src' ].
+	<baseline>
+	spec preLoadDoIt: #preload:package:.
+	spec postLoadDoIt: #postload:package:.
+
+	"Dependencies"
+	self blocDependencies: spec.
+	self toploDependencies: spec.
+
+	"Packages"
+	self pyramidPackages: spec.
+	self blocPackages: spec.
+	self toploPackages: spec.
+
+	"Groups"
+	spec group: 'default' with: #( 'BlocUI' 'ToploUI' ). "complete version"
+	spec group: 'BlocUI' with: self blocPackagesNames. "only Bloc"
+	spec group: 'ToploUI' with: self toploPackagesNames "only Bloc and Toplo"
+]
+
+{ #category : #dependencies }
+BaselineOfPyramid >> blocDependencies: spec [
+
+	spec
+		baseline: 'Bloc'
+		with: [ spec repository: 'github://pharo-graphics/Bloc:master/src' ].
+	spec
+		baseline: 'BlocSerialization'
+		with: [
+		spec repository: 'github://OpenSmock/Bloc-Serialization:main/src' ]
+]
+
+{ #category : #packages }
+BaselineOfPyramid >> blocPackages: spec [
+
+	spec
+		package: 'Pyramid-Bloc'
+		with: [ spec requires: #( 'Pyramid' 'Bloc' ) ].
+	spec
+		package: 'Pyramid-Tests'
+		with: [ spec requires: #( 'Pyramid-Bloc' ) ].
+	spec
+		package: 'Pyramid-Examples'
+		with: [ spec requires: #( 'Pyramid-Bloc' ) ]
+]
+
+{ #category : #packages }
+BaselineOfPyramid >> blocPackagesNames [
+
+	^ #( 'Pyramid' 'Pyramid-Bloc' 'Pyramid-Tests' 'Pyramid-IDE' 'Pyramid-Examples' )
 ]
 
 { #category : #actions }
 BaselineOfPyramid >> postload: loader package: packageSpec [
 
 	PyramidPluginManager reset
 ]
+
+{ #category : #actions }
+BaselineOfPyramid >> preload: loader package: packageSpec [
+
+]
+
+{ #category : #packages }
+BaselineOfPyramid >> pyramidPackages: spec [
+
+	spec package: 'Pyramid'.
+	spec
+		package: 'Pyramid-IDE'
+		with: [ spec requires: #( 'Pyramid' ) ].
+
+]
+
+{ #category : #dependencies }
+BaselineOfPyramid >> toploDependencies: spec [
+
+	spec
+		baseline: 'Toplo'
+		with: [ spec repository: 'github://pharo-graphics/Toplo:master/src' ].
+	spec
+		baseline: 'ToploSerialization'
+		with: [ spec repository: 'github://OpenSmock/Toplo-Serialization:main/src' ]
+]
+
+{ #category : #packages }
+BaselineOfPyramid >> toploPackages: spec [
+
+	spec
+		package: 'Pyramid-Toplo'
+		with: [ spec requires: #( 'Toplo' 'ToploSerialization') ].
+	spec
+		package: 'Pyramid-Toplo-Tests'
+		with: [ spec requires: #( 'Pyramid-Toplo' ) ].
+	spec
+		package: 'Pyramid-Toplo-Examples'
+		with: [ spec requires: #( 'Pyramid-Toplo' ) ]
+]
+
+{ #category : #packages }
+BaselineOfPyramid >> toploPackagesNames [
+
+	| packages |
+	packages := self blocPackagesNames asOrderedCollection.
+	packages addAll: #( 'Pyramid-Toplo' 'Pyramid-Toplo-Tests' 'Pyramid-Toplo-Examples' ).
+	^ packages asArray
+]

src/Pyramid-Bloc/BlBackground.extension.st

@@ -1,12 +1,5 @@
 Extension { #name : #BlBackground }
 
-{ #category : #'*Pyramid-Bloc' }
-BlBackground >> = aBlBackground [
-
-	aBlBackground == self ifTrue: [ ^ true ].
-	^ aBlBackground class = self class
-]
-
 { #category : #'*Pyramid-Bloc' }
 BlBackground >> asForm [
 

src/Pyramid-Bloc/BlFlowLayout.extension.st

@@ -1,16 +1,5 @@
 Extension { #name : #BlFlowLayout }
 
-{ #category : #'*Pyramid-Bloc' }
-BlFlowLayout >> = anObject [
-
-	self == anObject ifTrue: [ ^ true ].
-	self class = anObject class ifFalse: [ ^ false ].
-	self orientation = anObject orientation ifFalse: [ ^ false ].
-	self horizontalAlignment = anObject horizontalAlignment ifFalse: [ ^ false ].
-	self verticalAlignment = anObject verticalAlignment ifFalse: [ ^ false ].
-	^ true
-]
-
 { #category : #'*Pyramid-Bloc' }
 BlFlowLayout >> asIcon [
 

src/Pyramid-Bloc/BlGradientPaint.extension.st

@@ -1,13 +1,5 @@
 Extension { #name : #BlGradientPaint }
 
-{ #category : #'*Pyramid-Bloc' }
-BlGradientPaint >> = aBlPaint [
-
-	self == aBlPaint ifTrue: [ ^ true ].
-	self class == aBlPaint class ifFalse: [ ^ false ].
-	^ self stops = aBlPaint stops
-]
-
 { #category : #'*Pyramid-Bloc' }
 BlGradientPaint >> asForm [
 

src/Pyramid-Bloc/BlImageBackground.extension.st

@@ -1,12 +1,5 @@
 Extension { #name : #BlImageBackground }
 
-{ #category : #'*Pyramid-Bloc' }
-BlImageBackground >> = aBlBackground [
-
-	super = aBlBackground ifFalse: [ ^ false ].
-	^ self image = aBlBackground image
-]
-
 { #category : #'*Pyramid-Bloc' }
 BlImageBackground >> asForm [
 

src/Pyramid-Bloc/BlLayout.extension.st

@@ -1,12 +1,5 @@
 Extension { #name : #BlLayout }
 
-{ #category : #'*Pyramid-Bloc' }
-BlLayout >> = anObject [
-
-	self == anObject ifTrue: [ ^ true ].
-	^ self class = anObject class
-]
-
 { #category : #'*Pyramid-Bloc' }
 BlLayout >> asIcon [
 

src/Pyramid-Bloc/BlLinearGradientPaint.extension.st

@@ -1,12 +1,5 @@
 Extension { #name : #BlLinearGradientPaint }
 
-{ #category : #'*Pyramid-Bloc' }
-BlLinearGradientPaint >> = aBlPaint [
-
-	super = aBlPaint ifFalse: [ ^ false ].
-	^ self end = aBlPaint end and: [ self start = aBlPaint start ]
-]
-
 { #category : #'*Pyramid-Bloc' }
 BlLinearGradientPaint >> selectOnGradientPaintInput: aPyramidGradientPaintInputPresenter [
 

src/Pyramid-Bloc/BlRadialGradientPaint.extension.st

@@ -1,12 +1,5 @@
 Extension { #name : #BlRadialGradientPaint }
 
-{ #category : #'*Pyramid-Bloc' }
-BlRadialGradientPaint >> = aBlPaint [
-
-	super = aBlPaint ifFalse: [ ^ false ].
-	^ self innerCenter = aBlPaint innerCenter and: [ self innerRadius = aBlPaint innerRadius and: [ self outerCenter = aBlPaint outerCenter and: [ self outerRadius = aBlPaint outerRadius ] ] ]
-]
-
 { #category : #'*Pyramid-Bloc' }
 BlRadialGradientPaint >> selectOnGradientPaintInput: aPyramidGradientPaintInputPresenter [
 

src/Pyramid-Bloc/PyramidOpenFromSpacePlugin.class.st

@@ -0,0 +1,34 @@
+Class {
+	#name : #PyramidOpenFromSpacePlugin,
+	#superclass : #Object,
+	#traits : 'TPyramidPlugin',
+	#classTraits : 'TPyramidPlugin classTrait',
+	#instVars : [
+		'extensions'
+	],
+	#category : #'Pyramid-Bloc-plugin-edit-on-running'
+}
+
+{ #category : #adding }
+PyramidOpenFromSpacePlugin >> addExtension: anExtension [
+
+	self extensions add: anExtension
+]
+
+{ #category : #accessing }
+PyramidOpenFromSpacePlugin >> extensions [
+
+	^ extensions
+]
+
+{ #category : #accessing }
+PyramidOpenFromSpacePlugin >> initialize [
+
+	extensions := OrderedCollection new.
+]
+
+{ #category : #adding }
+PyramidOpenFromSpacePlugin >> removeExetension: anExtension [
+
+	self extensions remove: anExtension
+]

src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st

@@ -48,22 +48,20 @@ PyramidPluginEditOnRunning class >> cleanUp: anObject [
 PyramidPluginEditOnRunning class >> doShortcutAction: anEvent [
 
 	| space editor whenClosedDo |
-
-	self flag:'labordep: this is a temporary processing because this fork is due to a Bloc opened issue'.
-	(shortcutFork notNil and:[ shortcutFork isTerminated not ]) ifTrue:[ ^ self ].
-
-	shortcutFork := [ 
-
-		self editOnRunning ifTrue:[
-			space := anEvent source space.
-			(self canEditSpace: space) ifTrue:[
-				editor := space editWithPyramid.
-				whenClosedDo := editor window whenClosedDo.
-				editor window whenClosedDo: [ whenClosedDo value ].
-			].
-		].
-
-	] forkAt: Processor userBackgroundPriority named: 'Pyramid edit-on-running plugin shortcut'
+	self flag:
+		'labordep: this is a temporary processing because this fork is due to a Bloc opened issue'.
+	(shortcutFork notNil and: [ shortcutFork isTerminated not ]) ifTrue: [
+		^ self ].
+
+	shortcutFork := [
+	                self editOnRunning ifTrue: [
+		                space := anEvent source space.
+		                (self canEditSpace: space) ifTrue: [
+			                editor := space editWithPyramid.
+			                whenClosedDo := editor window whenClosedDo.
+			                editor window whenClosedDo: [ whenClosedDo value ] ] ] ]
+		                forkAt: Processor userBackgroundPriority
+		                named: 'Pyramid edit-on-running plugin shortcut'
 ]
 
 { #category : #accessing }
@@ -151,21 +149,3 @@ PyramidPluginEditOnRunning class >> uninstallBlUniverseListeners [
 
 	Beacon instance unsubscribe: self
 ]
-
-{ #category : #adding }
-PyramidPluginEditOnRunning >> addPanelsOn: aPyramidSimpleWindow [
-
-	"do nothing"
-]
-
-{ #category : #actions }
-PyramidPluginEditOnRunning >> configureBuilder: aPyramidEditorBuilder [
-
-	"do nothing"
-]
-
-{ #category : #connecting }
-PyramidPluginEditOnRunning >> connectOn: aPyramidEditor [
-
-	"do nothing"
-]

src/Pyramid-Bloc/PyramidSpaceBuilder.class.st

@@ -1,8 +1,8 @@
 Class {
 	#name : #PyramidSpaceBuilder,
 	#superclass : #Object,
-	#traits : 'TPyramidEditorTransformation',
-	#classTraits : 'TPyramidEditorTransformation classTrait',
+	#traits : 'TPyramidEditorTransformation + TPyramidEditorSpaceIsReady',
+	#classTraits : 'TPyramidEditorTransformation classTrait + TPyramidEditorSpaceIsReady classTrait',
 	#instVars : [
 		'topMostOverlay',
 		'overlays',
@@ -103,6 +103,7 @@ PyramidSpaceBuilder >> build [
 
 	self signalTransformationChanged.
 	self topMostOverlay buildOn: self space root.
+	self signalSpaceIsReady.
 	^ self space
 ]
 
@@ -111,8 +112,7 @@ PyramidSpaceBuilder >> editor: aPyramidEditor [
 
 	self extensions do: [ :each | each editor: aPyramidEditor ].
 	self extensions do: [ :each |
-		each projectModel: aPyramidEditor projectModel ].
-
+		each projectModel: aPyramidEditor projectModel ]
 ]
 
 { #category : #accessing }

src/Pyramid-Bloc/PyramidSpacePlugin.class.st

@@ -62,7 +62,8 @@ PyramidSpacePlugin >> makePresenterWithBlSpace: aBlSpace [
 	aBlSpace host: host.
 	aBlSpace addEventHandler: (BlEventHandler
 			 on: BlSpaceDestroyedEvent
-			 do: [ :evt | self updateMorphInCaseOfFaillure: morph ]).
+			 do: [ :evt |
+				 self updateMorphInCaseOfFaillure: morph ]).
 
 	self morphicPresenter morph: morph.
 	self morphicPresenter whenDisplayDo: [ aBlSpace show ]