Merge 2ffa3d0

.smalltalk.ston

@@ -4,7 +4,7 @@ SmalltalkCISpec {
 			#platforms : [
 				#pharo
 			],
-			#baseline : 'ClassEditor',
+			#baseline : 'OpenPonkClassEditor',
 			#directory : 'repository',
 			#onConflict : #useIncoming,
 			#load : [ 'complete' ]
@@ -13,15 +13,13 @@ SmalltalkCISpec {
 	#preLoading : 'ci-scripts/.github/scripts/preLoad.st',
 	#postLoading : 'ci-scripts/.github/scripts/postLoad.st',
 	#testing : {
+		#packages : [
+			'OpenPonk*'
+		],
 		#coverage : {
 			#packages : [
 				'OpenPonk-ClassEditor*'
 			]
-		},
-		#packages : [
-			'OpenPonk*',
-			'OP-*',
-			'OntoUML*'
-		]
+		}
 	}
 }

README.md

@@ -7,7 +7,7 @@
 
 ```smalltalk
 Metacello new
-	baseline: 'ClassEditor';
+	baseline: 'OpenPonkClassEditor';
 	repository: 'github://OpenPonk/class-editor/repository';
 	load: 'complete'.
 ```

repository/BaselineOfOpenPonkClassEditor/BaselineOfOpenPonkClassEditor.class.st

@@ -0,0 +1,74 @@
+"
+Baseline for https://github.com/OpenPonk/class-editor
+"
+Class {
+	#name : 'BaselineOfOpenPonkClassEditor',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfOpenPonkClassEditor',
+	#package : 'BaselineOfOpenPonkClassEditor'
+}
+
+{ #category : 'plugins' }
+BaselineOfOpenPonkClassEditor class >> loadPlugins [
+	self new loadPlugins
+]
+
+{ #category : 'baselines' }
+BaselineOfOpenPonkClassEditor >> baseline: spec [
+
+	<baseline>
+	spec for: #common do: [
+		spec
+			baseline: 'OpenPonkUMLXMI'
+			with: [ spec repository: 'github://openponk/uml-xmi' ].
+		spec
+			baseline: 'OpenPonkUMLBootstrapGenerator'
+			with: [
+			spec repository: 'github://openponk/uml-bootstrap-generator' ].
+		spec
+			baseline: 'OpenPonk'
+			with: [ spec repository: 'github://openponk/openponk' ].
+		spec
+			baseline: 'OpenPonkUMLProfiles'
+			with: [ spec repository: 'github://openponk/uml-profiles' ].
+		spec package: 'OpenPonk-ClassEditor' with: [
+			spec requires: #( 'OpenPonkUMLXMI' 'OpenPonkUMLBootstrapGenerator'
+				   'OpenPonkUMLProfiles' ) ].
+
+		spec group: 'plugin' with: #( 'OpenPonk-ClassEditor' ).
+		(Smalltalk globals includesKey:
+			 #BaselineOfOpenPonkOntoUMLVerifications)
+			ifTrue: [ spec group: 'complete-plugin' with: #( plugin ) ]
+			ifFalse: [
+				self plugins: spec.
+				spec package: 'OpenPonk-ClassEditor-Plugins' with: [
+					spec requires:
+						#( 'OpenPonkOntoUMLVerifications' OpenPonkOntoUMLPatterns
+						   OpenPonkGit OpenPonkOntoUMLTransformations ) ].
+				spec
+					group: 'complete-plugin'
+					with: #( plugin 'OpenPonk-ClassEditor-Plugins' ) ].
+		spec group: 'complete' with: #( OpenPonk 'complete-plugin' ).
+		spec group: 'default' with: #( OpenPonk plugin ) ]
+]
+
+{ #category : 'baselines' }
+BaselineOfOpenPonkClassEditor >> plugins: spec [
+
+	spec baseline: 'OpenPonkOntoUMLVerifications' with: [
+		spec
+			repository: 'github://openponk/ontouml-verifications';
+			loads: 'plugin' ].
+	spec baseline: 'OpenPonkOntoUMLTransformations' with: [
+		spec
+			repository:
+				'github://openponk/openponk-ontouml-to-uml-transformation';
+			loads: 'plugin' ].
+	spec
+		baseline: 'OpenPonkGit'
+		with: [ spec repository: 'github://openponk/openponk-git' ].
+	spec baseline: 'OpenPonkOntoUMLPatterns' with: [
+		spec
+			repository: 'github://openponk/ontouml-patterns';
+			loads: 'plugin' ]
+]

repository/BaselineOfOpenPonkClassEditor/package.st

@@ -0,0 +1 @@
+Package { #name : 'BaselineOfOpenPonkClassEditor' }

repository/OpenPonk-ClassEditor-Plugins/OPClassEditorPluginsMeta.class.st

@@ -0,0 +1,6 @@
+Class {
+	#name : 'OPClassEditorPluginsMeta',
+	#superclass : 'Object',
+	#category : 'OpenPonk-ClassEditor-Plugins',
+	#package : 'OpenPonk-ClassEditor-Plugins'
+}

repository/OpenPonk-ClassEditor-Plugins/package.st

@@ -0,0 +1 @@
+Package { #name : 'OpenPonk-ClassEditor-Plugins' }

repository/OpenPonk-ClassEditor/OPUmlCompartmentableShapeTest.class.st → repository/OpenPonk-ClassEditor/OPAbstractUmlCompartmentableShapeTest.class.st

@@ -1,18 +1,18 @@
 Class {
-	#name : 'OPUmlCompartmentableShapeTest',
+	#name : 'OPAbstractUmlCompartmentableShapeTest',
 	#superclass : 'OPAbstractUmlShapeTest',
 	#category : 'OpenPonk-ClassEditor-Tests - Shapes',
 	#package : 'OpenPonk-ClassEditor',
 	#tag : 'Tests - Shapes'
 }
 
 { #category : 'hooks' }
-OPUmlCompartmentableShapeTest >> shapeClass [
+OPAbstractUmlCompartmentableShapeTest >> shapeClass [
 	^ OPUmlCompartmentableShape
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testEmptyRoassalShape [
+OPAbstractUmlCompartmentableShapeTest >> testEmptyRoassalShape [
 
 	| roassalShape |
 	shape renderIn: RSCanvas new.
@@ -21,15 +21,15 @@ OPUmlCompartmentableShapeTest >> testEmptyRoassalShape [
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testFigures [
+OPAbstractUmlCompartmentableShapeTest >> testFigures [
 
 	shape renderIn: RSCanvas new.
 
 	self assert: shape canvas nodes isNotEmpty
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testFigures1 [
+OPAbstractUmlCompartmentableShapeTest >> testFigures1 [
 
 	| lbl |
 	(lbl := OPUmlLabel new) owningElement: shape.
@@ -38,7 +38,7 @@ OPUmlCompartmentableShapeTest >> testFigures1 [
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testFigures2 [
+OPAbstractUmlCompartmentableShapeTest >> testFigures2 [
 
 	| lbl comp1 |
 	(lbl := OPUmlLabel new) owningElement: shape.
@@ -52,7 +52,7 @@ OPUmlCompartmentableShapeTest >> testFigures2 [
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testFigures3 [
+OPAbstractUmlCompartmentableShapeTest >> testFigures3 [
 
 	| lbl comp compLbl |
 	(lbl := OPUmlLabel new) owningElement: shape.
@@ -65,18 +65,16 @@ OPUmlCompartmentableShapeTest >> testFigures3 [
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testRemoveExtentChanged [
+OPAbstractUmlCompartmentableShapeTest >> testRemoveExtentChanged [
 
-	| compartment compLbl canvas fullExtent labelContainer |
-	shape modelElement: OPTestEntityModel new.
+	| compartment compLbl fullExtent labelContainer |
 	labelContainer := OPUmlCompartmentableLabel in: shape.
 	OPUmlNameLabel in: labelContainer.
 	compartment := OPUmlCompartment in: shape.
 	5 timesRepeat: [ 
 		compLbl := (OPUmlLabel in: compartment)
 			           text: 'testx';
 			           yourself ].
-	canvas := RSCanvas new.
 	shape renderIn: canvas.
 	fullExtent := shape extent.
 	compLbl remove.
@@ -85,7 +83,7 @@ OPUmlCompartmentableShapeTest >> testRemoveExtentChanged [
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testRemoveFromOwnership [
+OPAbstractUmlCompartmentableShapeTest >> testRemoveFromOwnership [
 
 	| lbl |
 	(lbl := OPUmlLabel new) owningElement: shape.
@@ -97,7 +95,7 @@ OPUmlCompartmentableShapeTest >> testRemoveFromOwnership [
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testRemoveFromViewEmpty [
+OPAbstractUmlCompartmentableShapeTest >> testRemoveFromViewEmpty [
 
 	| canvas |
 	canvas := RSCanvas new.
@@ -107,7 +105,7 @@ OPUmlCompartmentableShapeTest >> testRemoveFromViewEmpty [
 ]
 
 { #category : 'tests' }
-OPUmlCompartmentableShapeTest >> testRemoveOwnedElement [
+OPAbstractUmlCompartmentableShapeTest >> testRemoveOwnedElement [
 
 	| lbl |
 	(lbl := OPUmlLabel new) owningElement: shape.

repository/OpenPonk-ClassEditor/OPUmlEdgeTest.class.st → repository/OpenPonk-ClassEditor/OPAbstractUmlEdgeTest.class.st

@@ -1,13 +1,13 @@
 Class {
-	#name : 'OPUmlEdgeTest',
+	#name : 'OPAbstractUmlEdgeTest',
 	#superclass : 'OPAbstractEdgeTest',
 	#category : 'OpenPonk-ClassEditor-Tests - Shapes',
 	#package : 'OpenPonk-ClassEditor',
 	#tag : 'Tests - Shapes'
 }
 
 { #category : 'running' }
-OPUmlEdgeTest >> setUp [
+OPAbstractUmlEdgeTest >> setUp [
 	| source target |
 	super setUp.
 	source := OPUmlLabel new.
@@ -19,12 +19,12 @@ OPUmlEdgeTest >> setUp [
 ]
 
 { #category : 'hooks' }
-OPUmlEdgeTest >> shapeClass [
+OPAbstractUmlEdgeTest >> shapeClass [
 	^ OPUmlEdge
 ]
 
 { #category : 'tests' }
-OPUmlEdgeTest >> testRemove [
+OPAbstractUmlEdgeTest >> testRemove [
 
 	| lbl |
 	(lbl := OPUmlLabel new) owningElement: shape.
@@ -34,7 +34,7 @@ OPUmlEdgeTest >> testRemove [
 ]
 
 { #category : 'tests' }
-OPUmlEdgeTest >> testRemoveDetachFromEnds [
+OPAbstractUmlEdgeTest >> testRemoveDetachFromEnds [
 
 	| source target |
 	source := OPUmlLabel new.
@@ -47,9 +47,10 @@ OPUmlEdgeTest >> testRemoveDetachFromEnds [
 ]
 
 { #category : 'tests' }
-OPUmlEdgeTest >> testRemoveFromView [
+OPAbstractUmlEdgeTest >> testRemoveFromView [
 
 	| lbl |
+	shape modelElement: model.
 	(lbl := OPUmlLabel new)
 		text: 'x';
 		owningElement: shape.

repository/OpenPonk-ClassEditor/OPAbstractUmlShapeTest.class.st

@@ -1,6 +1,6 @@
 Class {
 	#name : 'OPAbstractUmlShapeTest',
-	#superclass : 'OPAbstractShapeTest',
+	#superclass : 'OPAbstractNodeTest',
 	#category : 'OpenPonk-ClassEditor-Tests - Shapes',
 	#package : 'OpenPonk-ClassEditor',
 	#tag : 'Tests - Shapes'
@@ -48,7 +48,7 @@ OPAbstractUmlShapeTest >> testAddSelfEdge [
 
 { #category : 'tests' }
 OPAbstractUmlShapeTest >> testEmpty [
-	self assert: shape modelElement isNil.
+	super testEmpty.
 	self assert: shape owningElement doesNotExist.
 	self assert: shape ownedElements isEmpty.
 	self assert: shape sourceEdges isEmpty.

repository/OpenPonk-ClassEditor/OPDiagram.extension.st

@@ -0,0 +1,8 @@
+Extension { #name : 'OPDiagram' }
+
+{ #category : '*OpenPonk-ClassEditor' }
+OPDiagram >> supportsHidingLabelEnds [
+
+	^ self modelElement isNotNil and: [
+		  self modelElement isKindOf: OPUMLPackage ]
+]