diff --git a/repository/OpenPonk-ClassEditor/OPAbstractUmlCompartmentableShapeTest.class.st b/repository/OpenPonk-ClassEditor/OPAbstractUmlCompartmentableShapeTest.class.st index e496fab0..f8692002 100644 --- 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 index 0903fa96..d5d4ffa4 100644 --- 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 index 545dfe46..1c4bdeed 100644 --- 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 index dacd306e..a591fc3c 100644 --- 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 index 650372ed..3a1af151 100644 --- 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 index 7209b1a1..54a091f6 100644 --- 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 index 9e0e37bd..505778a5 100644 --- 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 index d0e5f03c..32c7d85a 100644 --- 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 index 273a39fd..db828f7d 100644 --- 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 index 373ed6da..232cdc9f 100644 --- 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 index a1981084..bc7ba132 100644 --- 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 index bc742a4f..9dd85cd6 100644 --- 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 index 5530d13b..891ec95e 100644 --- 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 index 56b431f7..f53f1280 100644 --- 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 index ef0e9310..cb4b3a85 100644 --- 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 index b74a2922..8c37270a 100644 --- 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 index f434e9af..b115eeba 100644 --- 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 index 13be9120..768fea0a 100644 --- 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 index d36253b4..195ea940 100644 --- 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 index 02671f33..5b0b2a9a 100644 --- 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 index 8f8e5e63..d0026a3e 100644 --- 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 index 86094e6e..50d7109a 100644 --- 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 index 74a99e76..5a6cbef1 100644 --- 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 index 2080d0ed..0d891c4d 100644 --- 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 index 96503080..a4ad12e5 100644 --- 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 index 0a8738a3..190a03cd 100644 --- 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 index 9ccfb92b..ba4ef452 100644 --- 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 index 5b5074ea..6b7b2dc6 100644 --- 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 index 5a2d70b2..66fdf12d 100644 --- 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 index edb0044d..6fc44fd5 100644 --- 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' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlDiagramHideEndLabelsFigureCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlDiagramHideEndLabelsFigureCommand.class.st deleted file mode 100644 index 7734e199..00000000 --- a/repository/OpenPonk-ClassEditor/OPUmlDiagramHideEndLabelsFigureCommand.class.st +++ /dev/null @@ -1,31 +0,0 @@ -Class { - #name : 'OPUmlDiagramHideEndLabelsFigureCommand', - #superclass : 'OPUmlDiagramSetEndLabelsFigureCommand', - #category : 'OpenPonk-ClassEditor-Commands', - #package : 'OpenPonk-ClassEditor', - #tag : 'Commands' -} - -{ #category : 'hooks' } -OPUmlDiagramHideEndLabelsFigureCommand class >> styleState [ - - ^ #show -] - -{ #category : 'accessing' } -OPUmlDiagramHideEndLabelsFigureCommand >> basicMenuItemName [ - - ^ 'Hide all' -] - -{ #category : 'accessing' } -OPUmlDiagramHideEndLabelsFigureCommand >> defaultMenuIconFormSet [ - - ^ FormSet form: OPCoreIcons opHideLabelsIcon -] - -{ #category : 'accessing' } -OPUmlDiagramHideEndLabelsFigureCommand >> description [ - - ^ 'Hide all association end labels' -] diff --git a/repository/OpenPonk-ClassEditor/OPUmlDiagramHideSameAsClassEndLabelsFigureCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlDiagramHideSameAsClassEndLabelsFigureCommand.class.st deleted file mode 100644 index 54b0e502..00000000 --- a/repository/OpenPonk-ClassEditor/OPUmlDiagramHideSameAsClassEndLabelsFigureCommand.class.st +++ /dev/null @@ -1,31 +0,0 @@ -Class { - #name : 'OPUmlDiagramHideSameAsClassEndLabelsFigureCommand', - #superclass : 'OPUmlDiagramSetEndLabelsFigureCommand', - #category : 'OpenPonk-ClassEditor-Commands', - #package : 'OpenPonk-ClassEditor', - #tag : 'Commands' -} - -{ #category : 'hooks' } -OPUmlDiagramHideSameAsClassEndLabelsFigureCommand class >> styleState [ - - ^ #hideSame -] - -{ #category : 'accessing' } -OPUmlDiagramHideSameAsClassEndLabelsFigureCommand >> basicMenuItemName [ - - ^ 'Hide same as class name' -] - -{ #category : 'accessing' } -OPUmlDiagramHideSameAsClassEndLabelsFigureCommand >> defaultMenuIconFormSet [ - - ^ FormSet form: OPCoreIcons opHideSomeLabelsIcon -] - -{ #category : 'accessing' } -OPUmlDiagramHideSameAsClassEndLabelsFigureCommand >> description [ - - ^ 'Hide association end labels with same text as name of its connected class' -] diff --git a/repository/OpenPonk-ClassEditor/OPUmlDiagramShowEndLabelsFigureCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlDiagramShowEndLabelsFigureCommand.class.st deleted file mode 100644 index 64205e0b..00000000 --- a/repository/OpenPonk-ClassEditor/OPUmlDiagramShowEndLabelsFigureCommand.class.st +++ /dev/null @@ -1,31 +0,0 @@ -Class { - #name : 'OPUmlDiagramShowEndLabelsFigureCommand', - #superclass : 'OPUmlDiagramSetEndLabelsFigureCommand', - #category : 'OpenPonk-ClassEditor-Commands', - #package : 'OpenPonk-ClassEditor', - #tag : 'Commands' -} - -{ #category : 'hooks' } -OPUmlDiagramShowEndLabelsFigureCommand class >> styleState [ - - ^ #hide -] - -{ #category : 'accessing' } -OPUmlDiagramShowEndLabelsFigureCommand >> basicMenuItemName [ - - ^ 'Show all' -] - -{ #category : 'accessing' } -OPUmlDiagramShowEndLabelsFigureCommand >> defaultMenuIconFormSet [ - - ^ FormSet form: OPCoreIcons opShowLabelsIcon -] - -{ #category : 'accessing' } -OPUmlDiagramShowEndLabelsFigureCommand >> description [ - - ^ 'Show all association end labels' -] diff --git a/repository/OpenPonk-ClassEditor/OPUmlEdge.class.st b/repository/OpenPonk-ClassEditor/OPUmlEdge.class.st index 4778d242..60a7164e 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlEdge.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEdge.class.st @@ -3,9 +3,9 @@ Class { #superclass : 'OPEdge', #traits : 'OPTColoredAsStroke', #classTraits : 'OPTColoredAsStroke classTrait', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'accessing' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlEdgeLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlEdgeLabel.class.st index ee417b52..2b352be3 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlEdgeLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEdgeLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlEdgeLabel', #superclass : 'OPEdgeLabel', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'adding' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlDiagramEndLabelsFigureCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlEndLabelsRoassalShapeCommand.class.st similarity index 57% rename from repository/OpenPonk-ClassEditor/OPUmlDiagramEndLabelsFigureCommand.class.st rename to repository/OpenPonk-ClassEditor/OPUmlEndLabelsRoassalShapeCommand.class.st index d0730b76..73707ff3 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlDiagramEndLabelsFigureCommand.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEndLabelsRoassalShapeCommand.class.st @@ -1,6 +1,6 @@ Class { - #name : 'OPUmlDiagramEndLabelsFigureCommand', - #superclass : 'OPDiagramFigureCommand', + #name : 'OPUmlEndLabelsRoassalShapeCommand', + #superclass : 'OPRoassalShapeCommand', #instVars : [ 'relevantDiagramElements' ], @@ -10,7 +10,7 @@ Class { } { #category : 'testing' } -OPUmlDiagramEndLabelsFigureCommand class >> canBeExecutedInContext: aToolContext [ +OPUmlEndLabelsRoassalShapeCommand class >> canBeExecutedInContext: aToolContext [ ^ (super canBeExecutedInContext: aToolContext) and: [ aToolContext diagramElements anySatisfy: [ :any | @@ -18,29 +18,29 @@ OPUmlDiagramEndLabelsFigureCommand class >> canBeExecutedInContext: aToolContext ] { #category : 'activation' } -OPUmlDiagramEndLabelsFigureCommand class >> contextMenuActivation [ +OPUmlEndLabelsRoassalShapeCommand class >> contextMenuActivation [ ^ CmdContextMenuActivation - byItemOf: OPUmlDiagramEndLabelsFigureMenuGroup + byItemOf: OPUmlEndLabelsRoassalShapeMenuGroup for: OPCanvasPresenter ] { #category : 'as yet unclassified' } -OPUmlDiagramEndLabelsFigureCommand class >> defaultResultingShowState [ +OPUmlEndLabelsRoassalShapeCommand class >> defaultResultingShowState [ - ^ OPUmlDiagramHideSameAsClassEndLabelsFigureCommand + ^ OPUmlHideSameAsClassEndLabelsRoassalShapeCommand styleState ] { #category : 'testing' } -OPUmlDiagramEndLabelsFigureCommand class >> isAbstract [ +OPUmlEndLabelsRoassalShapeCommand class >> isAbstract [ - ^ self = OPUmlDiagramEndLabelsFigureCommand + ^ self = OPUmlEndLabelsRoassalShapeCommand ] { #category : 'as yet unclassified' } -OPUmlDiagramEndLabelsFigureCommand >> applicableDiagramElements [ +OPUmlEndLabelsRoassalShapeCommand >> applicableDiagramElements [ ^ relevantDiagramElements ifNil: [ relevantDiagramElements := diagramElements select: [ :each | @@ -48,13 +48,13 @@ OPUmlDiagramEndLabelsFigureCommand >> applicableDiagramElements [ ] { #category : 'accessing' } -OPUmlDiagramEndLabelsFigureCommand >> basicMenuItemName [ +OPUmlEndLabelsRoassalShapeCommand >> basicMenuItemName [ ^ '' ] { #category : 'accessing' } -OPUmlDiagramEndLabelsFigureCommand >> defaultMenuItemName [ +OPUmlEndLabelsRoassalShapeCommand >> defaultMenuItemName [ | basicName | basicName := self basicMenuItemName. @@ -67,25 +67,25 @@ OPUmlDiagramEndLabelsFigureCommand >> defaultMenuItemName [ ] { #category : 'as yet unclassified' } -OPUmlDiagramEndLabelsFigureCommand >> defaultResultingShowState [ +OPUmlEndLabelsRoassalShapeCommand >> defaultResultingShowState [ ^ self class defaultResultingShowState ] { #category : 'testing' } -OPUmlDiagramEndLabelsFigureCommand >> isCurrentlyActive [ +OPUmlEndLabelsRoassalShapeCommand >> isCurrentlyActive [ ^ false ] { #category : 'testing' } -OPUmlDiagramEndLabelsFigureCommand >> isCurrentlySelected [ +OPUmlEndLabelsRoassalShapeCommand >> isCurrentlySelected [ ^ self applicableDiagramElements anySatisfy: [ :any | self isCurrentlySelectedByStyle: any localStyle ] ] { #category : 'testing' } -OPUmlDiagramEndLabelsFigureCommand >> isCurrentlySelectedByStyle: aStyle [ +OPUmlEndLabelsRoassalShapeCommand >> isCurrentlySelectedByStyle: aStyle [ ^ self subclassResponsibility ] diff --git a/repository/OpenPonk-ClassEditor/OPUmlDiagramEndLabelsFigureMenuGroup.class.st b/repository/OpenPonk-ClassEditor/OPUmlEndLabelsRoassalShapeMenuGroup.class.st similarity index 67% rename from repository/OpenPonk-ClassEditor/OPUmlDiagramEndLabelsFigureMenuGroup.class.st rename to repository/OpenPonk-ClassEditor/OPUmlEndLabelsRoassalShapeMenuGroup.class.st index 537885cb..c63101a9 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlDiagramEndLabelsFigureMenuGroup.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEndLabelsRoassalShapeMenuGroup.class.st @@ -1,5 +1,5 @@ Class { - #name : 'OPUmlDiagramEndLabelsFigureMenuGroup', + #name : 'OPUmlEndLabelsRoassalShapeMenuGroup', #superclass : 'CmdMenuGroup', #category : 'OpenPonk-ClassEditor-Commands', #package : 'OpenPonk-ClassEditor', @@ -7,7 +7,7 @@ Class { } { #category : 'accessing' } -OPUmlDiagramEndLabelsFigureMenuGroup >> name [ +OPUmlEndLabelsRoassalShapeMenuGroup >> name [ ^ 'Association end labels' ] diff --git a/repository/OpenPonk-ClassEditor/OPUmlEnumerationController.class.st b/repository/OpenPonk-ClassEditor/OPUmlEnumerationController.class.st index 7a49fd50..4088587b 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlEnumerationController.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEnumerationController.class.st @@ -32,7 +32,7 @@ OPUmlEnumerationController >> createLiteralAdornmentBy: builder [ self diagramController editor palette selectTool: tool. tool whenCreated: [ :ctrl | OPRenameElementCommand executeOn: ctrl. - ctrl refreshFigure ]. + ctrl modelChanged ]. tool selectedControllers: { self } ] ] diff --git a/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralController.class.st b/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralController.class.st index 3a8f01b6..4c326503 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralController.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralController.class.st @@ -59,11 +59,11 @@ OPUmlEnumerationLiteralController >> registerModelInContainer: aParentModel [ aParentModel ownedLiterals add: self model ] -{ #category : 'removing' } +{ #category : 'destruction' } OPUmlEnumerationLiteralController >> removeDiagramElement [ self diagramElement ifNotExists: [ ^ self ]. - self ownerDiagramElement removeLiteral: self diagramElement. + self diagramElementOwnerWithPossibleController removeLiteral: self diagramElement. self diagramElement: nil ] @@ -74,3 +74,14 @@ OPUmlEnumerationLiteralController >> removeModel [ self model enumeration: nil. super removeModel ] + +{ #category : 'validation' } +OPUmlEnumerationLiteralController >> validate [ + + super validate. + self model ifNil: [ ^ self ]. + self model enumeration ifNotNil: [ ^ self ]. + OPModelInvalid signal: (String streamContents: [ :s | + self model printOn: s. + s << ' has no owning enumeration' ]) +] diff --git a/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralLabel.class.st index b7e161cc..d9a8c293 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEnumerationLiteralLabel.class.st @@ -1,7 +1,7 @@ Class { #name : 'OPUmlEnumerationLiteralLabel', #superclass : 'OPUmlClassifierItemLabel', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlEnumerationShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlEnumerationShape.class.st index c9567710..1435f0cf 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlEnumerationShape.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEnumerationShape.class.st @@ -4,9 +4,9 @@ Class { #instVars : [ 'literals' ], - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'ston-core' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlEnumerationStereotypeLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlEnumerationStereotypeLabel.class.st index 4086087d..152ea155 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlEnumerationStereotypeLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlEnumerationStereotypeLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlEnumerationStereotypeLabel', #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/OPUmlExtensionRequiredLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlExtensionRequiredLabel.class.st index 149ce43a..ca077fdf 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlExtensionRequiredLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlExtensionRequiredLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlExtensionRequiredLabel', #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/OPUmlExtensionShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlExtensionShape.class.st index 10ab3aa5..11f6a7b3 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlExtensionShape.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlExtensionShape.class.st @@ -4,9 +4,9 @@ I represent an Extension shape Class { #name : 'OPUmlExtensionShape', #superclass : 'OPUmlAssociationShape', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'initialization' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlFeaturesListCompartment.class.st b/repository/OpenPonk-ClassEditor/OPUmlFeaturesListCompartment.class.st index 5c5073d4..b3cd4bc4 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlFeaturesListCompartment.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlFeaturesListCompartment.class.st @@ -1,7 +1,7 @@ Class { #name : 'OPUmlFeaturesListCompartment', #superclass : 'OPUmlClassItemListCompartment', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlGeneralizationLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationLabel.class.st index d5126104..b09c8b59 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlGeneralizationLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlGeneralizationLabel', #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/OPUmlGeneralizationSetsEditor.class.st b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationSetsEditor.class.st index d69eb65f..457f1926 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlGeneralizationSetsEditor.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationSetsEditor.class.st @@ -113,7 +113,7 @@ OPUmlGeneralizationSetsEditor >> processRemovalIn: originalSets basedOn: newSetC OPUmlGeneralizationSetsEditor >> relevantGeneralizationSets [ | allElements packagedSets usedSets allSets | - allElements := controller diagramController allShowableElements. + allElements := controller diagramController allModelElementsWithPossibleController. packagedSets := (allElements select: [ :each | each oclIsKindOf: #GeneralizationSet ]) asSet. usedSets := (allElements select: [ :each | diff --git a/repository/OpenPonk-ClassEditor/OPUmlGeneralizationShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationShape.class.st index 85482ced..fd7b2d7c 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlGeneralizationShape.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlGeneralizationShape.class.st @@ -4,9 +4,9 @@ I represent a direct generalization line. Class { #name : 'OPUmlGeneralizationShape', #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/OPUmlHideEndLabelsRoassalShapeCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlHideEndLabelsRoassalShapeCommand.class.st new file mode 100644 index 00000000..4a5ce307 --- /dev/null +++ b/repository/OpenPonk-ClassEditor/OPUmlHideEndLabelsRoassalShapeCommand.class.st @@ -0,0 +1,31 @@ +Class { + #name : 'OPUmlHideEndLabelsRoassalShapeCommand', + #superclass : 'OPUmlSetEndLabelsRoassalShapeCommand', + #category : 'OpenPonk-ClassEditor-Commands', + #package : 'OpenPonk-ClassEditor', + #tag : 'Commands' +} + +{ #category : 'hooks' } +OPUmlHideEndLabelsRoassalShapeCommand class >> styleState [ + + ^ #show +] + +{ #category : 'accessing' } +OPUmlHideEndLabelsRoassalShapeCommand >> basicMenuItemName [ + + ^ 'Hide all' +] + +{ #category : 'accessing' } +OPUmlHideEndLabelsRoassalShapeCommand >> defaultMenuIconFormSet [ + + ^ FormSet form: OPCoreIcons opHideLabelsIcon +] + +{ #category : 'accessing' } +OPUmlHideEndLabelsRoassalShapeCommand >> description [ + + ^ 'Hide all association end labels' +] diff --git a/repository/OpenPonk-ClassEditor/OPUmlHideSameAsClassEndLabelsRoassalShapeCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlHideSameAsClassEndLabelsRoassalShapeCommand.class.st new file mode 100644 index 00000000..2806ba31 --- /dev/null +++ b/repository/OpenPonk-ClassEditor/OPUmlHideSameAsClassEndLabelsRoassalShapeCommand.class.st @@ -0,0 +1,31 @@ +Class { + #name : 'OPUmlHideSameAsClassEndLabelsRoassalShapeCommand', + #superclass : 'OPUmlSetEndLabelsRoassalShapeCommand', + #category : 'OpenPonk-ClassEditor-Commands', + #package : 'OpenPonk-ClassEditor', + #tag : 'Commands' +} + +{ #category : 'hooks' } +OPUmlHideSameAsClassEndLabelsRoassalShapeCommand class >> styleState [ + + ^ #hideSame +] + +{ #category : 'accessing' } +OPUmlHideSameAsClassEndLabelsRoassalShapeCommand >> basicMenuItemName [ + + ^ 'Hide same as class name' +] + +{ #category : 'accessing' } +OPUmlHideSameAsClassEndLabelsRoassalShapeCommand >> defaultMenuIconFormSet [ + + ^ FormSet form: OPCoreIcons opHideSomeLabelsIcon +] + +{ #category : 'accessing' } +OPUmlHideSameAsClassEndLabelsRoassalShapeCommand >> description [ + + ^ 'Hide association end labels with same text as name of its connected class' +] diff --git a/repository/OpenPonk-ClassEditor/OPUmlKeywordLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlKeywordLabel.class.st index 506c9a4c..1aa4031c 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlKeywordLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlKeywordLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlKeywordLabel', #superclass : 'OPUmlLabel', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'accessing' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlLabel.class.st index 55fff01d..d4bbd0a6 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlLabel', #superclass : 'OPLabel', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'accessing' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlListCompartment.class.st b/repository/OpenPonk-ClassEditor/OPUmlListCompartment.class.st index 703065c6..613f5992 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlListCompartment.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlListCompartment.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlListCompartment', #superclass : 'OPUmlCompartment', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'rendering' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlMultiplicityLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlMultiplicityLabel.class.st index 39e6e7fc..a0a78138 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlMultiplicityLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlMultiplicityLabel.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' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlNameLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlNameLabel.class.st index 7bfae611..c6b5b60b 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlNameLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlNameLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlNameLabel', #superclass : 'OPUmlLabel', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'accessing' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlOperationController.class.st b/repository/OpenPonk-ClassEditor/OPUmlOperationController.class.st index eb09f378..7283e32d 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlOperationController.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlOperationController.class.st @@ -62,11 +62,22 @@ OPUmlOperationController >> registerModelInContainer: aParentModel [ aParentModel ownedOperations add: self model ] -{ #category : 'removing' } +{ #category : 'destruction' } OPUmlOperationController >> removeDiagramElement [ self diagramElement ifNotExists: [ ^ self ]. - self ownerDiagramElement ifNotNil: [ :owner | + self diagramElementOwnerWithPossibleController ifNotNil: [ :owner | owner removeOperation: self diagramElement ]. self diagramElement: nil ] + +{ #category : 'validation' } +OPUmlOperationController >> validate [ + + super validate. + self model ifNil: [ ^ self ]. + self model owningClass ifNotNil: [ ^ self ]. + OPModelInvalid signal: (String streamContents: [ :s | + self model printOn: s. + s << ' has no owning class' ]) +] diff --git a/repository/OpenPonk-ClassEditor/OPUmlOperationLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlOperationLabel.class.st index af2a02b8..68663877 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlOperationLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlOperationLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlOperationLabel', #superclass : 'OPUmlClassItemLabel', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'emphasis' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlPackageDiagramController.class.st b/repository/OpenPonk-ClassEditor/OPUmlPackageDiagramController.class.st index 0d4bcff6..c5c54bd6 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlPackageDiagramController.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlPackageDiagramController.class.st @@ -23,34 +23,18 @@ OPUmlPackageDiagramController >> allGeneralizationSets [ flatCollect: [ :each | each generalizationSets ]) ] ] -{ #category : 'as yet unclassified' } -OPUmlPackageDiagramController >> allPackages [ - - ^ (Set with: self model) , (self allPackagesIn: self model) -] - -{ #category : 'as yet unclassified' } -OPUmlPackageDiagramController >> allPackagesIn: aPackage [ - - | innerPackages | - innerPackages := aPackage packagedElements select: [ :each | - each oclIsKindOf: #Package ]. - ^ innerPackages asSet - , - (innerPackages flatCollectAsSet: [ :each | - self allPackagesIn: each ]) -] - -{ #category : 'as yet unclassified' } -OPUmlPackageDiagramController >> allShowableElements [ - "Should return all elements that could be directly hidden on diagram" +{ #category : 'enumerating' } +OPUmlPackageDiagramController >> allModelElementsWithPossibleController [ + "all elements that could be directly hidden on diagram" - ^ Array streamContents: [ :stream | - self allShowableElementsIn: self model on: stream ] + ^ (Array streamContents: [ :stream | + self + allModelElementsWithPossibleControllerIn: self model + on: stream ]) asSet ] -{ #category : 'as yet unclassified' } -OPUmlPackageDiagramController >> allShowableElementsIn: aPackage on: aCollectionStream [ +{ #category : 'enumerating' } +OPUmlPackageDiagramController >> allModelElementsWithPossibleControllerIn: aPackage on: aCollectionStream [ "Should return all elements that could be directly hidden on diagram" | elementsToShow | @@ -70,7 +54,38 @@ OPUmlPackageDiagramController >> allShowableElementsIn: aPackage on: aCollection aPackage packagedElements select: [ :each | each oclIsKindOf: #Package ] thenDo: [ :each | - self allShowableElementsIn: each on: aCollectionStream ] + self allModelElementsWithPossibleControllerIn: each on: aCollectionStream ] +] + +{ #category : 'enumerating' } +OPUmlPackageDiagramController >> allModelElementsWithPossibleDiagramElement [ + "all model elements that can have diagram elements (even if cannot have controller)" + + | onesWithPossibleController | + onesWithPossibleController := self + allModelElementsWithPossibleController. + ^ onesWithPossibleController + , ((onesWithPossibleController select: [ :each | + each oclIsKindOf: #Association ]) flatCollect: [ :each | + each ownedEnds ]) +] + +{ #category : 'enumerating' } +OPUmlPackageDiagramController >> allPackages [ + + ^ (Set with: self model) , (self allPackagesIn: self model) +] + +{ #category : 'enumerating' } +OPUmlPackageDiagramController >> allPackagesIn: aPackage [ + + | innerPackages | + innerPackages := aPackage packagedElements select: [ :each | + each oclIsKindOf: #Package ]. + ^ innerPackages asSet + , + (innerPackages flatCollectAsSet: [ :each | + self allPackagesIn: each ]) ] { #category : 'adding' } @@ -81,7 +96,7 @@ OPUmlPackageDiagramController >> canBeTargetFor: aController [ or: [ aController isKindOf: OPUmlEnumerationController ] ] ] ] -{ #category : 'as yet unclassified' } +{ #category : 'accessing' } OPUmlPackageDiagramController >> commonModelClassPrefix [ ^ 'OPUML' ] @@ -159,7 +174,7 @@ OPUmlPackageDiagramController >> descriptionGeneralizationSets [ yourself ] -{ #category : 'as yet unclassified' } +{ #category : 'forms' } OPUmlPackageDiagramController >> descriptionStereotype [ @@ -172,14 +187,14 @@ OPUmlPackageDiagramController >> disableRefresh [ self flag: #todo. install := [ :cls | | link | - (cls includesSelector: #refreshFigure) + (cls includesSelector: #modelChanged) ifTrue: [ link := MetaLink new metaObject: self; selector: #yourself; arguments: #(); control: #instead. - (cls >> #refreshFigure) ast link: link ] ]. + (cls >> #modelChanged) ast link: link ] ]. OPUmlElementController withAllSubAndSuperclassesDo: [ :each | install value: each ] ] @@ -237,8 +252,8 @@ OPUmlPackageDiagramController >> enableRefresh [ | uninstall | self flag: #todo. uninstall := [ :cls | - (cls includesSelector: #refreshFigure) - ifTrue: [ (cls >> #refreshFigure) ast links + (cls includesSelector: #modelChanged) + ifTrue: [ (cls >> #modelChanged) ast links ifNotNil: [ :l | l asSet do: #uninstall ] ] ]. OPUmlElementController withAllSubAndSuperclassesDo: [ :each | uninstall value: each ] @@ -372,7 +387,7 @@ OPUmlPackageDiagramController >> initializeProfilesPalette: aPalette [ self initializeProfile: each appliedProfile palette: aPalette ] ] -{ #category : 'as yet unclassified' } +{ #category : 'forms' } OPUmlPackageDiagramController >> maEdit [ OPUmlAllGeneralizationSetsEditor new @@ -428,7 +443,7 @@ OPUmlPackageDiagramController >> rebuildPalette [ rebuildWidget ] -{ #category : 'as yet unclassified' } +{ #category : 'accessing' } OPUmlPackageDiagramController >> typeOfModel: aModel [ ^ OPModelObjectType named: (aModel umlClassName splitCamelCase joinUsing: ' ') diff --git a/repository/OpenPonk-ClassEditor/OPUmlPackageImportLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlPackageImportLabel.class.st index abf68923..c2ee3698 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlPackageImportLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlPackageImportLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlPackageImportLabel', #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/OPUmlPackageImportShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlPackageImportShape.class.st index 1e46a093..c0ecf332 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlPackageImportShape.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlPackageImportShape.class.st @@ -4,9 +4,9 @@ I represent a import line from importing to imported package. Class { #name : 'OPUmlPackageImportShape', #superclass : 'OPUmlEdge', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'hooks' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlPackageShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlPackageShape.class.st index f755ec09..9d52aeb6 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlPackageShape.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlPackageShape.class.st @@ -12,9 +12,9 @@ Class { 'ear', 'innerRoassalShapesBlock' ], - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'rendering' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlPropertyMagritteDescriptions.class.st b/repository/OpenPonk-ClassEditor/OPUmlPropertyMagritteDescriptions.class.st index 8727c91a..a43b4a13 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlPropertyMagritteDescriptions.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlPropertyMagritteDescriptions.class.st @@ -76,7 +76,7 @@ OPUmlPropertyMagritteDescriptions >> descriptionDefaultValue [ OPUMLOpaqueExpression) ifTrue: [ (reader value: me) defaultValue bodies: (newValue ifEmpty: [ { } ] ifNotEmpty: [ { newValue } ]) ]. - me refreshFigure ]); + me modelChanged ]); label: labelPrefix , 'Default Value'; priority: 42; yourself diff --git a/repository/OpenPonk-ClassEditor/OPUmlDiagramSetEndLabelsFigureCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlSetEndLabelsRoassalShapeCommand.class.st similarity index 61% rename from repository/OpenPonk-ClassEditor/OPUmlDiagramSetEndLabelsFigureCommand.class.st rename to repository/OpenPonk-ClassEditor/OPUmlSetEndLabelsRoassalShapeCommand.class.st index 36cf85b7..a174f41b 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlDiagramSetEndLabelsFigureCommand.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlSetEndLabelsRoassalShapeCommand.class.st @@ -1,39 +1,39 @@ Class { - #name : 'OPUmlDiagramSetEndLabelsFigureCommand', - #superclass : 'OPUmlDiagramEndLabelsFigureCommand', + #name : 'OPUmlSetEndLabelsRoassalShapeCommand', + #superclass : 'OPUmlEndLabelsRoassalShapeCommand', #category : 'OpenPonk-ClassEditor-Commands', #package : 'OpenPonk-ClassEditor', #tag : 'Commands' } { #category : 'testing' } -OPUmlDiagramSetEndLabelsFigureCommand class >> isAbstract [ +OPUmlSetEndLabelsRoassalShapeCommand class >> isAbstract [ - ^ self = OPUmlDiagramSetEndLabelsFigureCommand + ^ self = OPUmlSetEndLabelsRoassalShapeCommand ] { #category : 'hooks' } -OPUmlDiagramSetEndLabelsFigureCommand class >> styleState [ +OPUmlSetEndLabelsRoassalShapeCommand class >> styleState [ ^ #'' ] { #category : 'execution' } -OPUmlDiagramSetEndLabelsFigureCommand >> execute [ +OPUmlSetEndLabelsRoassalShapeCommand >> execute [ self applicableDiagramElements do: [ :each | each showAssociationEndLabels: self styleState ] ] { #category : 'testing' } -OPUmlDiagramSetEndLabelsFigureCommand >> isCurrentlyActive [ +OPUmlSetEndLabelsRoassalShapeCommand >> isCurrentlyActive [ ^ self applicableDiagramElements anySatisfy: [ :any | any showAssociationEndLabels = self styleState ] ] { #category : 'testing' } -OPUmlDiagramSetEndLabelsFigureCommand >> isCurrentlySelected [ +OPUmlSetEndLabelsRoassalShapeCommand >> isCurrentlySelected [ ^ super isCurrentlySelected or: [ self applicableDiagramElements allSatisfy: [ :each | @@ -42,7 +42,7 @@ OPUmlDiagramSetEndLabelsFigureCommand >> isCurrentlySelected [ ] { #category : 'testing' } -OPUmlDiagramSetEndLabelsFigureCommand >> isCurrentlySelectedByStyle: aStyle [ +OPUmlSetEndLabelsRoassalShapeCommand >> isCurrentlySelectedByStyle: aStyle [ aStyle ifNil: [ ^ false ]. ^ aStyle @@ -52,7 +52,7 @@ OPUmlDiagramSetEndLabelsFigureCommand >> isCurrentlySelectedByStyle: aStyle [ ] { #category : 'hooks' } -OPUmlDiagramSetEndLabelsFigureCommand >> styleState [ +OPUmlSetEndLabelsRoassalShapeCommand >> styleState [ ^ self class styleState ] diff --git a/repository/OpenPonk-ClassEditor/OPUmlShowEndLabelsRoassalShapeCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlShowEndLabelsRoassalShapeCommand.class.st new file mode 100644 index 00000000..99c23f01 --- /dev/null +++ b/repository/OpenPonk-ClassEditor/OPUmlShowEndLabelsRoassalShapeCommand.class.st @@ -0,0 +1,31 @@ +Class { + #name : 'OPUmlShowEndLabelsRoassalShapeCommand', + #superclass : 'OPUmlSetEndLabelsRoassalShapeCommand', + #category : 'OpenPonk-ClassEditor-Commands', + #package : 'OpenPonk-ClassEditor', + #tag : 'Commands' +} + +{ #category : 'hooks' } +OPUmlShowEndLabelsRoassalShapeCommand class >> styleState [ + + ^ #hide +] + +{ #category : 'accessing' } +OPUmlShowEndLabelsRoassalShapeCommand >> basicMenuItemName [ + + ^ 'Show all' +] + +{ #category : 'accessing' } +OPUmlShowEndLabelsRoassalShapeCommand >> defaultMenuIconFormSet [ + + ^ FormSet form: OPCoreIcons opShowLabelsIcon +] + +{ #category : 'accessing' } +OPUmlShowEndLabelsRoassalShapeCommand >> description [ + + ^ 'Show all association end labels' +] diff --git a/repository/OpenPonk-ClassEditor/OPUmlStereotypeOfStereotypeLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlStereotypeOfStereotypeLabel.class.st index 2e4bfd77..0c88daf6 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlStereotypeOfStereotypeLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlStereotypeOfStereotypeLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlStereotypeOfStereotypeLabel', #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/OPUmlStereotypeShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlStereotypeShape.class.st index 809a4e72..3d95dc8d 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlStereotypeShape.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlStereotypeShape.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlStereotypeShape', #superclass : 'OPUmlClassShape', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'rendering' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlStereotypesLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlStereotypesLabel.class.st index 351cf14a..00b16a42 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlStereotypesLabel.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlStereotypesLabel.class.st @@ -1,9 +1,9 @@ Class { #name : 'OPUmlStereotypesLabel', #superclass : 'OPUmlKeywordLabel', - #category : 'OpenPonk-ClassEditor-Shapes', + #category : 'OpenPonk-ClassEditor-DiagramElements', #package : 'OpenPonk-ClassEditor', - #tag : 'Shapes' + #tag : 'DiagramElements' } { #category : 'accessing' } diff --git a/repository/OpenPonk-ClassEditor/OPUmlDiagramUnsetEndLabelsFigureCommand.class.st b/repository/OpenPonk-ClassEditor/OPUmlUnsetEndLabelsRoassalShapeCommand.class.st similarity index 63% rename from repository/OpenPonk-ClassEditor/OPUmlDiagramUnsetEndLabelsFigureCommand.class.st rename to repository/OpenPonk-ClassEditor/OPUmlUnsetEndLabelsRoassalShapeCommand.class.st index e1558ae9..a6d608ef 100644 --- a/repository/OpenPonk-ClassEditor/OPUmlDiagramUnsetEndLabelsFigureCommand.class.st +++ b/repository/OpenPonk-ClassEditor/OPUmlUnsetEndLabelsRoassalShapeCommand.class.st @@ -1,13 +1,13 @@ Class { - #name : 'OPUmlDiagramUnsetEndLabelsFigureCommand', - #superclass : 'OPUmlDiagramEndLabelsFigureCommand', + #name : 'OPUmlUnsetEndLabelsRoassalShapeCommand', + #superclass : 'OPUmlEndLabelsRoassalShapeCommand', #category : 'OpenPonk-ClassEditor-Commands', #package : 'OpenPonk-ClassEditor', #tag : 'Commands' } { #category : 'testing' } -OPUmlDiagramUnsetEndLabelsFigureCommand class >> canBeExecutedInContext: aToolContext [ +OPUmlUnsetEndLabelsRoassalShapeCommand class >> canBeExecutedInContext: aToolContext [ ^ (super canBeExecutedInContext: aToolContext) and: [ aToolContext diagramElements anySatisfy: [ :any | @@ -15,19 +15,19 @@ OPUmlDiagramUnsetEndLabelsFigureCommand class >> canBeExecutedInContext: aToolCo ] { #category : 'accessing' } -OPUmlDiagramUnsetEndLabelsFigureCommand >> basicMenuItemName [ +OPUmlUnsetEndLabelsRoassalShapeCommand >> basicMenuItemName [ ^ 'Use diagram-level setting' ] { #category : 'accessing' } -OPUmlDiagramUnsetEndLabelsFigureCommand >> description [ +OPUmlUnsetEndLabelsRoassalShapeCommand >> description [ ^ 'Adopt option picked for the entire diagram, instead of overriding it' ] { #category : 'execution' } -OPUmlDiagramUnsetEndLabelsFigureCommand >> execute [ +OPUmlUnsetEndLabelsRoassalShapeCommand >> execute [ self applicableDiagramElements select: [ :each | each owningElement exists ] @@ -35,7 +35,7 @@ OPUmlDiagramUnsetEndLabelsFigureCommand >> execute [ ] { #category : 'testing' } -OPUmlDiagramUnsetEndLabelsFigureCommand >> isCurrentlySelectedByStyle: aStyle [ +OPUmlUnsetEndLabelsRoassalShapeCommand >> isCurrentlySelectedByStyle: aStyle [ aStyle ifNil: [ ^ true ]. ^ (aStyle includesKey: