multiple multi-diagram project fixes, shapes naming unification

OpenPonk · Dec 4, 2024 · 459cd61 · 459cd61
1 parent 496ea4a
commit 459cd61
Show file tree

Hide file tree

Showing 68 changed files with 326 additions and 274 deletions.
diff --git a/repository/OpenPonk-ClassEditor/OPAbstractUmlCompartmentableShapeTest.class.st b/repository/OpenPonk-ClassEditor/OPAbstractUmlCompartmentableShapeTest.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPAbstractUmlCompartmentableShapeTest',
 	#superclass : 'OPAbstractUmlShapeTest',
-	#category : 'OpenPonk-ClassEditor-Tests - Shapes',
+	#category : 'OpenPonk-ClassEditor-Tests - DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Tests - Shapes'
+	#tag : 'Tests - DiagramElements'
 }
 
 { #category : 'hooks' }

diff --git a/repository/OpenPonk-ClassEditor/OPAbstractUmlEdgeTest.class.st b/repository/OpenPonk-ClassEditor/OPAbstractUmlEdgeTest.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPAbstractUmlEdgeTest',
 	#superclass : 'OPAbstractEdgeTest',
-	#category : 'OpenPonk-ClassEditor-Tests - Shapes',
+	#category : 'OpenPonk-ClassEditor-Tests - DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Tests - Shapes'
+	#tag : 'Tests - DiagramElements'
 }
 
 { #category : 'running' }

diff --git a/repository/OpenPonk-ClassEditor/OPAbstractUmlShapeTest.class.st b/repository/OpenPonk-ClassEditor/OPAbstractUmlShapeTest.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPAbstractUmlShapeTest',
 	#superclass : 'OPAbstractNodeTest',
-	#category : 'OpenPonk-ClassEditor-Tests - Shapes',
+	#category : 'OpenPonk-ClassEditor-Tests - DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Tests - Shapes'
+	#tag : 'Tests - DiagramElements'
 }
 
 { #category : 'tests' }

diff --git a/repository/OpenPonk-ClassEditor/OPDiagramElement.extension.st b/repository/OpenPonk-ClassEditor/OPDiagramElement.extension.st
@@ -6,7 +6,7 @@ OPDiagramElement >> showAssociationEndLabels [
 	^ self
 		  stylePropertyNamed: self showAssociationEndLabelsKey
 		  ifAbsent: [
-		  OPUmlDiagramEndLabelsFigureCommand defaultResultingShowState ]
+		  OPUmlEndLabelsRoassalShapeCommand defaultResultingShowState ]
 ]
 
 { #category : '*OpenPonk-ClassEditor' }

diff --git a/repository/OpenPonk-ClassEditor/OPRSCairoMetricsProvider.class.st b/repository/OpenPonk-ClassEditor/OPRSCairoMetricsProvider.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPRSCairoMetricsProvider',
 	#superclass : 'RSCairoMetricsProvider',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'hooks' }

diff --git a/repository/OpenPonk-ClassEditor/OPTUmlAutoAccomodatingShape.trait.st b/repository/OpenPonk-ClassEditor/OPTUmlAutoAccomodatingShape.trait.st
@@ -1,8 +1,8 @@
 Trait {
 	#name : 'OPTUmlAutoAccomodatingShape',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'rendering' }

diff --git a/repository/OpenPonk-ClassEditor/OPTUmlBaseController.trait.st b/repository/OpenPonk-ClassEditor/OPTUmlBaseController.trait.st
@@ -136,6 +136,9 @@ OPTUmlBaseController >> validationFailedPropertyWithoutOwner: aProperty [
 			 s << 'Property "' << aProperty name asString << '" with type '
 			 << aProperty type asString << ' has no owner' ]).
 
-	"Attempt to create an ownership"
-	aProperty type ifNotNil: [ aProperty owningClass: aProperty type ]
+	"Attempt to create an ownership if possible"
+	aProperty type ifNil: [ ^ self ].
+	(self diagramController allModelElementsWithPossibleController includes: aProperty type)
+		ifFalse: [ ^ self ].
+	aProperty owningClass: aProperty type
 ]
diff --git a/repository/OpenPonk-ClassEditor/OPTUmlPackageableShape.trait.st b/repository/OpenPonk-ClassEditor/OPTUmlPackageableShape.trait.st
@@ -3,9 +3,9 @@ Trait {
 	#instVars : [
 		'hiddenPackages'
 	],
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-ClassEditor/OPTUmlStereotypedElementController.trait.st b/repository/OpenPonk-ClassEditor/OPTUmlStereotypedElementController.trait.st
@@ -56,14 +56,14 @@ OPTUmlStereotypedElementController >> removeStereotypesIn: aModel [
 		whileTrue: [ aModel unapplyStereotype: aModel appliedStereotypes first ]
 ]
 
-{ #category : 'accessing' }
+{ #category : 'forms' }
 OPTUmlStereotypedElementController >> stereotypeMagritteDescription [
 	| descriptions |
 	descriptions := OPUmlStereotypeDescriptions new controller: self.
 	^ descriptions descriptions
 ]
 
-{ #category : 'as yet unclassified' }
+{ #category : 'enumerating' }
 OPTUmlStereotypedElementController >> stereotypesIn: aProfile for: aModel [
 
 	^ (aProfile ownedStereotype reject: #isAbstract) select: [ :stereo | 

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAppliedStereotypesLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlAppliedStereotypesLabel.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlAppliedStereotypesLabel',
 	#superclass : 'OPUmlStereotypesLabel',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAssociationEndLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlAssociationEndLabel.class.st
@@ -4,9 +4,9 @@ Class {
 	#instVars : [
 		'atSource'
 	],
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'ston-core' }
@@ -42,11 +42,11 @@ OPUmlAssociationEndLabel >> defaultText [
 
 	| type typeName defaultText |
 	self showAssociationEndLabels
-	= OPUmlDiagramHideEndLabelsFigureCommand styleState ifTrue: [
+	= OPUmlHideEndLabelsRoassalShapeCommand styleState ifTrue: [
 		^ '' ].
 	defaultText := self modelElement notationStringAsRoleName.
 	self showAssociationEndLabels
-	= OPUmlDiagramShowEndLabelsFigureCommand styleState ifTrue: [
+	= OPUmlShowEndLabelsRoassalShapeCommand styleState ifTrue: [
 		^ defaultText ].
 	type := self modelElement type.
 	type ifNil: [ ^ defaultText ].

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAssociationLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlAssociationLabel.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlAssociationLabel',
 	#superclass : 'OPUmlEdgeLabel',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'as yet unclassified' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAssociationPropertiesLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlAssociationPropertiesLabel.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlAssociationPropertiesLabel',
 	#superclass : 'OPUmlEdgeLabel',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'as yet unclassified' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAssociationShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlAssociationShape.class.st
@@ -4,9 +4,9 @@ I am a shape composition to accomodate for the most common UML Association shape
 Class {
 	#name : 'OPUmlAssociationShape',
 	#superclass : 'OPUmlEdge',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'initialization' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAssociationShapeTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlAssociationShapeTest.class.st
@@ -7,9 +7,9 @@ Class {
 		'ownedComment',
 		'owningElement'
 	],
-	#category : 'OpenPonk-ClassEditor-Tests - Shapes',
+	#category : 'OpenPonk-ClassEditor-Tests - DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Tests - Shapes'
+	#tag : 'Tests - DiagramElements'
 }
 
 { #category : 'instance creation' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAssociationStereotypesLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlAssociationStereotypesLabel.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlAssociationStereotypesLabel',
 	#superclass : 'OPUmlEdgeLabel',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'as yet unclassified' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAttributeController.class.st b/repository/OpenPonk-ClassEditor/OPUmlAttributeController.class.st
@@ -216,11 +216,11 @@ OPUmlAttributeController >> registerModelInContainer: aClass [
 	aClass ownedAttributes add: self model
 ]
 
-{ #category : 'removing' }
+{ #category : 'destruction' }
 OPUmlAttributeController >> removeDiagramElement [
 
 	self diagramElement ifNotExists: [ ^ self ].
-	self ownerDiagramElement ifExists: [ :owner |
+	self diagramElementOwnerWithPossibleController ifExists: [ :owner |
 		owner removeAttribute: self diagramElement ].
 	self diagramElement: nil
 ]

diff --git a/repository/OpenPonk-ClassEditor/OPUmlAttributeLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlAttributeLabel.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : 'OPUmlAttributeLabel',
 	#superclass : 'OPUmlClassItemLabel',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassItemLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassItemLabel.class.st
@@ -3,9 +3,9 @@ Class {
 	#superclass : 'OPUmlClassifierItemLabel',
 	#traits : 'OPTColoredAsFont',
 	#classTraits : 'OPTColoredAsFont classTrait',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassItemListCompartment.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassItemListCompartment.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlClassItemListCompartment',
 	#superclass : 'OPUmlListCompartment',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'sorting' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassShape.class.st
@@ -8,9 +8,9 @@ Class {
 		'attributes',
 		'operations'
 	],
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'ston-core' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassShapeTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassShapeTest.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlClassShapeTest',
 	#superclass : 'OPAbstractUmlCompartmentableShapeTest',
-	#category : 'OpenPonk-ClassEditor-Tests - Shapes',
+	#category : 'OpenPonk-ClassEditor-Tests - DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Tests - Shapes'
+	#tag : 'Tests - DiagramElements'
 }
 
 { #category : 'instance creation' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassifierItemLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassifierItemLabel.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlClassifierItemLabel',
 	#superclass : 'OPUmlNameLabel',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'as yet unclassified' }
@@ -14,6 +14,12 @@ OPUmlClassifierItemLabel >> addedByMouseClickTo: aPoint [
 
 ]
 
+{ #category : 'accessing' }
+OPUmlClassifierItemLabel >> canHaveController [
+
+	^ true
+]
+
 { #category : 'as yet unclassified' }
 OPUmlClassifierItemLabel >> isPositionableByUser [
 

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassifierNameLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassifierNameLabel.class.st
@@ -4,9 +4,9 @@ Class {
 	#instVars : [
 		'labeled'
 	],
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'removing' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassifierShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassifierShape.class.st
@@ -8,9 +8,9 @@ Class {
 		'commentIcon',
 		'adornmentCreationBlock'
 	],
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'ston-core' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlCommentIcon.class.st b/repository/OpenPonk-ClassEditor/OPUmlCommentIcon.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlCommentIcon',
 	#superclass : 'OPUmlCompartmentableContent',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'rendering' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlCompartment.class.st b/repository/OpenPonk-ClassEditor/OPUmlCompartment.class.st
@@ -3,9 +3,9 @@ Class {
 	#superclass : 'OPUmlCompartmentableContent',
 	#traits : 'OPTUmlAutoAccomodatingShape',
 	#classTraits : 'OPTUmlAutoAccomodatingShape classTrait',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'rendering' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlCompartmentableContent.class.st b/repository/OpenPonk-ClassEditor/OPUmlCompartmentableContent.class.st
@@ -1,11 +1,17 @@
 Class {
 	#name : 'OPUmlCompartmentableContent',
 	#superclass : 'OPNode',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
+{ #category : 'accessing' }
+OPUmlCompartmentableContent >> canHaveController [
+
+	^ false
+]
+
 { #category : 'rendering' }
 OPUmlCompartmentableContent >> layoutOwnedElements [
 

diff --git a/repository/OpenPonk-ClassEditor/OPUmlCompartmentableLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlCompartmentableLabel.class.st
@@ -1,9 +1,9 @@
 Class {
 	#name : 'OPUmlCompartmentableLabel',
 	#superclass : 'OPUmlCompartmentableContent',
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlCompartmentableShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlCompartmentableShape.class.st
@@ -6,9 +6,9 @@ Class {
 	#instVars : [
 		'separators'
 	],
-	#category : 'OpenPonk-ClassEditor-Shapes',
+	#category : 'OpenPonk-ClassEditor-DiagramElements',
 	#package : 'OpenPonk-ClassEditor',
-	#tag : 'Shapes'
+	#tag : 'DiagramElements'
 }
 
 { #category : 'accessing' }