Plugin registry fixes

Author: JanBliznicenko

repository/OpenPonk-Core/OPPlugin.class.st

@@ -20,6 +20,12 @@ Class {
 	#tag : 'Plugin'
 }
 
+{ #category : 'testing' }
+OPPlugin class >> isTestingOnly [
+
+	^ false
+]
+
 { #category : 'accessing' }
 OPPlugin >> diagramClass [
 	self
@@ -55,7 +61,7 @@ OPPlugin >> layouterClass [
 	^ self subclassResponsibility
 ]
 
-{ #category : 'as yet unclassified' }
+{ #category : 'model updates' }
 OPPlugin >> mergeModels: aModelsCollection [
 
 	self notYetImplemented

repository/OpenPonk-Core/OPPluginRegistry.class.st

@@ -26,16 +26,26 @@ OPPluginRegistry class >> default [
 
 { #category : 'singleton' }
 OPPluginRegistry class >> resetDefault [
+
 	<script>
-	^ Default := nil
+	^ self setDefault: nil
 ]
 
 { #category : 'singleton' }
 OPPluginRegistry class >> setDefault: aDefault [
-	<script>
+
 	^ Default := aDefault
 ]
 
+{ #category : 'singleton' }
+OPPluginRegistry class >> setDefaultForTesting [
+
+	<script>
+	^ self setDefault: (self new
+			   add: OPTestPlugin new;
+			   yourself)
+]
+
 { #category : 'instance creation' }
 OPPluginRegistry class >> withAll [
 	^ self new
@@ -50,12 +60,11 @@ OPPluginRegistry >> add: aPlugin [
 
 { #category : 'adding' }
 OPPluginRegistry >> addAll [
-	plugins := OrderedCollection new.
-	OPPlugin
-		allSubclassesWithLevelDo: [ :each :level | 
-			level > 0
-				ifTrue: [ plugins add: each new ] ]
-		startingLevel: 0
+
+	plugins := OPPlugin allSubclasses
+		           reject: [ :each |
+		           each isAbstract or: [ each isTestingOnly ] ]
+		           thenCollect: [ :each | each new ]
 ]
 
 { #category : 'accessing' }

repository/OpenPonk-Core/OPProjectControllerTest.class.st

@@ -12,10 +12,11 @@ Class {
 
 { #category : 'running' }
 OPProjectControllerTest >> setUp [
+
 	controller := OPProjectController new.
 	project := OPProject new.
 	controller project: project.
-	OPPluginRegistry setDefault: (OPPluginRegistry new add: OPTestPlugin new)
+	OPPluginRegistry setDefaultForTesting
 ]
 
 { #category : 'running' }

repository/OpenPonk-Core/OPProjectDirectoryMaterializerTest.class.st

@@ -14,8 +14,9 @@ Class {
 
 { #category : 'running' }
 OPProjectDirectoryMaterializerTest >> setUp [
+
 	super setUp.
-	OPPluginRegistry setDefault: (OPPluginRegistry new add: OPTestPlugin new).
+	OPPluginRegistry setDefaultForTesting.
 	reader := OPProjectDirectoryMaterializer new.
 	self setUpBasicProject
 ]

repository/OpenPonk-Core/OPProjectDirectorySerializerTest.class.st

@@ -11,9 +11,10 @@ Class {
 
 { #category : 'running' }
 OPProjectDirectorySerializerTest >> setUp [
+
 	super setUp.
 	persistence := OPProjectDirectorySerializer new.
-	OPPluginRegistry setDefault: (OPPluginRegistry new add: OPTestPlugin new)
+	OPPluginRegistry setDefaultForTesting
 ]
 
 { #category : 'running' }

repository/OpenPonk-Core/OPTestPlugin.class.st

@@ -6,12 +6,18 @@ Instead set & reset the default of DCPluginRegistry.
 "
 Class {
 	#name : 'OPTestPlugin',
-	#superclass : 'Object',
+	#superclass : 'OPPlugin',
 	#category : 'OpenPonk-Core-Tests',
 	#package : 'OpenPonk-Core',
 	#tag : 'Tests'
 }
 
+{ #category : 'testing' }
+OPTestPlugin class >> isTestingOnly [
+
+	^ true
+]
+
 { #category : 'accessing' }
 OPTestPlugin >> diagramControllerClass [
 	^ OPTestDiagramController
@@ -27,6 +33,13 @@ OPTestPlugin >> isPluginFor: aModel [
 	^ self modelClass = aModel class
 ]
 
+{ #category : 'accessing' }
+OPTestPlugin >> layouterClass [
+	"Create your own subclass of OPLayouter or use OPNoLayouter which does nothing"
+
+	^ OPNoLayouter
+]
+
 { #category : 'accessing' }
 OPTestPlugin >> modelClass [
 	^ OPTestContainerModel

repository/OpenPonk-Spec/OPModelTreeWidget.class.st

@@ -64,7 +64,6 @@ OPModelTreeWidget >> doubleClick [
 	OPPluginRegistry default plugins
 		detect: [ :each | each modelClass = element class ]
 		ifFound: [ self openCommand: element ]
-		ifNone: [  ]
 ]
 
 { #category : 'menu commands' }

repository/OpenPonk-Spec/OPRoassalShapeCommand.class.st

@@ -26,26 +26,6 @@ OPRoassalShapeCommand class >> contextMenuActivation [
 	^ CmdContextMenuActivation byRootGroupItemFor: OPCanvasPresenter
 ]
 
-{ #category : 'example' }
-OPRoassalShapeCommand class >> example [
-	| proj model |
-	proj := OPProject new.
-	model := OPTestContainerModel new.
-	model entities add: OPTestEntityModel new.
-	proj addModel: model.
-	proj open
-]
-
-{ #category : 'example' }
-OPRoassalShapeCommand class >> example2 [
-	| c a |
-	c := OPCanvasPresenter new.
-	a := CmdContextMenuActivation
-		buildContextMenuFor: c
-		inContext: (OPRoassalShapeContext for: c).
-	a openInWindow
-]
-
 { #category : 'testing' }
 OPRoassalShapeCommand class >> isAbstract [
 	^ self = OPRoassalShapeCommand