diff --git a/sources/uml/UMLClassDefinitionListComposite.cls b/sources/uml/UMLClassDefinitionListComposite.cls index 1544d5a..d0b21eb 100644 --- a/sources/uml/UMLClassDefinitionListComposite.cls +++ b/sources/uml/UMLClassDefinitionListComposite.cls @@ -51,7 +51,7 @@ showImplementationsOf: anUMLClass implementationsPresenter model: (ListModel on: (anUMLClass implementations asSortedCollection: [:a :b | a name <= b name])). - instVarPresenter model: (ListModel on: (anUMLClass basicVariables asSortedCollection: [:a :b | a name <= b name])). + instVarPresenter model: (ListModel on: (anUMLClass basicAndObjectVariables asSortedCollection: [:a :b | a name <= b name])). relationsPresenter model: (ListModel on: (anUMLClass relations asSortedCollection: [:a :b | a printName <= b printName])).! ! !UMLClassDefinitionListComposite categoriesFor: #classes!public! ! diff --git a/sources/uml/UMLObjectBehavior.cls b/sources/uml/UMLObjectBehavior.cls index 708c7b4..438438a 100644 --- a/sources/uml/UMLObjectBehavior.cls +++ b/sources/uml/UMLObjectBehavior.cls @@ -57,13 +57,17 @@ atVariableName: stringName atVariableName: stringName ifAbsent: aBlock ^instancesVariables at: stringName asSymbol ifAbsent: [instancesVariables at: stringName asString ifAbsent: aBlock]! +basicAndObjectVariables + + ^instancesVariables reject: [:each | each hasMultipleInstances]! + basicImplementationNamed: aSymbol ^implementations at: aSymbol ifAbsent: [nil]! basicVariables - ^instancesVariables reject: [:each | each hasMultipleInstances]! + ^instancesVariables select: [:each | each isBasic]! belongToVirtualMachine @@ -317,6 +321,7 @@ vmPerform: aSymbol withArguments: anArray parentSnapshot: anUMLExecutionSnapsho !UMLObjectBehavior categoriesFor: #attributes!instance variables!public! ! !UMLObjectBehavior categoriesFor: #atVariableName:!instance variables!public! ! !UMLObjectBehavior categoriesFor: #atVariableName:ifAbsent:!instance variables!public! ! +!UMLObjectBehavior categoriesFor: #basicAndObjectVariables!instance variables!public! ! !UMLObjectBehavior categoriesFor: #basicImplementationNamed:!behavior!public! ! !UMLObjectBehavior categoriesFor: #basicVariables!instance variables!public! ! !UMLObjectBehavior categoriesFor: #belongToVirtualMachine!public! ! diff --git a/sources/uml/UMLSmalltalkMapper.cls b/sources/uml/UMLSmalltalkMapper.cls index 3ae9903..317a1f4 100644 --- a/sources/uml/UMLSmalltalkMapper.cls +++ b/sources/uml/UMLSmalltalkMapper.cls @@ -392,7 +392,7 @@ getAspectsForStClass: aidaWebClass aspect: aspectSymbol ifFalse: [(aspectObject smalltalkObject first umlClass getImplementationsFor: UMLGUICollectionAspectsCategory current) collect: [:each | each name]]. aspectsArray := '#('. aspectsNames isEmpty "ifNone: display basicVariables. ifNone then the collection aspects has not been configured" - ifTrue: [aspectsNames := aspectObject umlClass basicVariables collect: [:each | each name]]. + ifTrue: [aspectsNames := aspectObject umlClass basicAndObjectVariables collect: [:each | each name]]. aspectsNames do: [:each | aspectsArray := aspectsArray, each, ' ']. aspectsArray := aspectsArray, ')'. ^aspectsArray .