Fix cycling edition, refactoring open/close editor, plugin access fro…

…m plugin class
OpenSmock · Nov 17, 2023 · 22d9d6c · 22d9d6c
1 parent 84ce56d
commit 22d9d6c
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 24 deletions.
diff --git a/src/Pyramid-Bloc/PyramidSavePlugin.class.st b/src/Pyramid-Bloc/PyramidSavePlugin.class.st
@@ -27,7 +27,7 @@ PyramidSavePlugin class >> openOn: aCollectionOfBlElement saveModel: aSaveModel
 	savePlugin := savePlugin asArray first.
 	editor projectModel roots addAll: aCollectionOfBlElement.
 	savePlugin openOn: aSaveModel.
-	editor window open
+	editor open
 ]
 
 { #category : #adding }

diff --git a/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st b/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st
@@ -89,6 +89,7 @@ PyramidSpaceBuilder >> addOverlayNamed: aString [
 PyramidSpaceBuilder >> build [
 
 	self space: BlSpace new.
+	self space userData at: #isPyramidEditor put: true.
 
 	self overlays ifEmpty: [ ^ self space ].
 

diff --git a/src/Pyramid-Tests/PyramidEditorTest.class.st b/src/Pyramid-Tests/PyramidEditorTest.class.st
@@ -22,7 +22,7 @@ PyramidEditorTest >> openFromBlSpace [
 	self assert: (editor projectModel roots includes: element).
 	self deny: (space root children includes: element).
 
-	editor window close.
+	editor close.
 	(Duration milliSeconds: 10) wait.
 
 	self assert: editor window isClosed.
@@ -35,13 +35,15 @@ PyramidEditorTest >> openNewEditor [
 
 	| editor spec |
 	editor := PyramidEditor buildEditor.
-	spec := editor window open.
+	editor open.
+
+	spec := editor window spec.
 	(Duration milliSeconds: 10) wait.
 	self currentWorld doOneCycle.
 	self assert: editor window isOpen.
 	self assert: spec window isInWorld.
 
-	editor window close.
+	editor close.
 	(Duration milliSeconds: 10) wait.
 	self currentWorld doOneCycle.
 	self assert: editor window isClosed.

diff --git a/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st b/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
@@ -54,6 +54,21 @@ PyramidPluginEditOnRunningTest >> testBlSpaceShortcutAddAndRemove [
 	self closeSpace: space.
 ]
 
+{ #category : #tests }
+PyramidPluginEditOnRunningTest >> testCannotEditTheEditor [
+	| space editor |
+
+	PyramidPluginEditOnRunning editOnRunning: true.
+
+	editor := PyramidEditor buildEditor.
+	"get the space of the editor"
+	space := (editor getPlugin: PyramidSpacePlugin) builder space.
+
+	"check than the shortcut is not installed" 
+	self deny: (PyramidPluginEditOnRunning spaceIds includes: space id).
+	self deny: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
+]
+
 { #category : #tests }
 PyramidPluginEditOnRunningTest >> testEditOnRunning [
 
@@ -71,23 +86,6 @@ PyramidPluginEditOnRunningTest >> testKeyCombination [
 
 ]
 
-{ #category : #tests }
-PyramidPluginEditOnRunningTest >> testNotEditEditor [
-	| space |
-
-	PyramidPluginEditOnRunning editOnRunning: true.
-
-	space := PyramidEditor new.
-	self deny: (PyramidPluginEditOnRunning spaceIds includes: space id).
-	self deny: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
-
-	space show.	
-	self assert: (PyramidPluginEditOnRunning spaceIds includes: space id).
-	self assert: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
-
-	self closeSpace: space.
-]
-
 { #category : #tests }
 PyramidPluginEditOnRunningTest >> testShortcut [
 

diff --git a/src/Pyramid/PyramidEditor.class.st b/src/Pyramid/PyramidEditor.class.st
@@ -20,7 +20,21 @@ PyramidEditor class >> buildEditor [
 PyramidEditor class >> open [
 	<script>
 
-	self buildEditor window open	
+	self buildEditor open
+]
+
+{ #category : #'open/close' }
+PyramidEditor >> close [
+
+	self window ifNil: [ ^ self ].
+	self window isClosed ifTrue:[ ^ self ].
+	self window close
+]
+
+{ #category : #plugins }
+PyramidEditor >> getPlugin: aPluginClass [
+
+	^ self plugins detect:[ :p | p class = aPluginClass ] ifNone:[ ]
 ]
 
 { #category : #initialization }
@@ -33,13 +47,21 @@ PyramidEditor >> initialize [
 	plugins := {  }
 ]
 
-{ #category : #accessing }
+{ #category : #'open/close' }
+PyramidEditor >> open [
+
+	self window ifNil: [ ^ self ].
+	self window isOpen ifTrue:[ ^ self ].
+	self window open
+]
+
+{ #category : #plugins }
 PyramidEditor >> plugins [
 
 	^ plugins
 ]
 
-{ #category : #accessing }
+{ #category : #plugins }
 PyramidEditor >> plugins: aCollection [
 
 	plugins := aCollection

diff --git a/src/Pyramid/PyramidPluginEditOnRunning.class.st b/src/Pyramid/PyramidPluginEditOnRunning.class.st
@@ -21,6 +21,9 @@ PyramidPluginEditOnRunning class >> addShortcutInSpace: aSpace [
 	aSpace ifNil: [ ^ self ].
 	(self spaceIds includes: aSpace id) ifTrue:[ ^ self ].
 
+	"Not edit the editor space to prevent cycling"
+	aSpace userData at: #isPyramidEditor ifPresent:[ ^ self ].
+
 	self spaceIds add: aSpace id.
 	aSpace root addShortcut: shortcut 
 ]

diff --git a/src/Pyramid/PyramidWindow.class.st b/src/Pyramid/PyramidWindow.class.st
@@ -118,6 +118,12 @@ PyramidWindow >> services [
 	^ services
 ]
 
+{ #category : #accessing }
+PyramidWindow >> spec [
+
+	^ spec
+]
+
 { #category : #'api - showing' }
 PyramidWindow >> title [