Merge pull request #45 from LIonWeb-org/agreed-upon

Updated M3 diagram to reflect current state of discussion

Author: enikao

lioncore/metametamodel.puml

@@ -1,89 +1,76 @@
 @startuml
+hide empty members
 
-
-abstract class AbstractConcept extends MetamodelElement implements FeaturesContainer, NamespaceProvider {
-  allFeatures(): List<Feature>
+class Concept #LightGreen extends FeaturesContainer {
+  abstract: boolean
 }
 
-class Annotation extends AbstractConcept {
-  platformSpecific: String?
-}
+class ConceptInterface #LightGreen extends FeaturesContainer
 
-class Concept extends AbstractConcept {
-  abstract: boolean
-}
+class Containment #LightBlue extends Link
 
-class ConceptInterface extends AbstractConcept
+abstract class DataType #LightPink extends MetamodelElement
 
-class Containment extends Link
+class Enumeration #LightPink extends DataType implements NamespaceProvider
 
-abstract class Datatype extends MetamodelElement
+class EnumerationLiteral #LightPink implements NamespacedEntity
 
-abstract class Feature implements NamespacedEntity {
-  multiplicity: Multiplicity
-  derived: boolean
+abstract class Feature #LightBlue implements NamespacedEntity {
+  optional: boolean
 }
 
-interface FeaturesContainer
+abstract class FeaturesContainer #LightGreen extends MetamodelElement implements NamespaceProvider {
+  allFeatures(): List<Feature>
+}
 
-abstract class Link extends Feature
+abstract class Link #LightBlue extends Feature {
+  multiple: boolean
+}
 
 class Metamodel implements NamespaceProvider {
   qualifiedName: String
 }
 
 abstract class MetamodelElement implements NamespacedEntity
 
-enum Multiplicity {
-  Optional
-  Single
-  ZeroOrMore
-  OneOrMore
+abstract class NamespacedEntity {
+  simpleName: String
+  qualifiedName(): String
 }
 
 interface NamespaceProvider {
   namespaceQualifier(): String
 }
 
-interface NamespacedEntity {
-  simpleName: String
-  qualifiedName(): String
-}
-
-class PrimitiveType extends Datatype
-
-class Property extends Feature
+class PrimitiveType #LightPink extends DataType
 
-class Reference extends Link
-
-class Typedef extends Datatype
+class Property #LightBlue extends Feature
 
+class Reference #LightBlue extends Link
 
 ' relations:
 
-Annotation "*" -- "1" AbstractConcept: target
-
-Concept "*" -- "0..1" Concept: extends
-Concept "*" -- "*" ConceptInterface: implements
-
-ConceptInterface "*" -- "*" ConceptInterface: extends
-
-Containment "*" -- "0..1" Containment: specializes
-
-FeaturesContainer "1" o-- "*" Feature: features
+Concept "*" -> "0..1" Concept: extends
+Concept "*" --> "*" ConceptInterface: implements
 
-Link "*" -- "1" AbstractConcept: type
+ConceptInterface "*" --> "*" ConceptInterface: extends
 
-Metamodel "1" o-- "*" MetamodelElement: elements
-Metamodel "*" -- "*" Metamodel: dependsOn
+EnumerationLiteral "*" -* "1" Enumeration : literals
 
-NamespacedEntity "*" -- "1" NamespaceProvider: container
+Feature "*" -* "1" FeaturesContainer: features
 
-Property "*" -- "1" Datatype: type
+Link "*" --> "1" FeaturesContainer: type
 
-Reference "*" -- "0..1" Reference: specializes
+Metamodel "*" --> "*" Metamodel: dependsOn
+MetamodelElement "*" -* "1" Metamodel: elements
 
-Typedef "*" -- "1" PrimitiveType: constraints
+NamespacedEntity "*" --> "1" NamespaceProvider: container
 
+Property "*" -> "1" DataType: type
 
+legend
+  <#LightGray,#LightGray>| <#LightBlue>Feature |
+  | <#LightGreen>Feature Container |
+  | <#LightPink>DataType |
+end legend
 @enduml

lioncore/metametamodel.svg

@@ -1,73 +1,10 @@
 @startuml
 
-' classes
+!include metametamodel.puml
 
-class Metamodel  {
-  qualifiedName: String
-}
-
-class Concept extends AbstractConcept {
-  abstract: boolean
-}
-
-class ConceptInterface extends AbstractConcept
-
-class PrimitiveType extends Datatype
-
-class Typedef extends Datatype
-
-class Annotation extends AbstractConcept  {
-  platformSpecific: String?
-}
-
-class Containment extends Link
-
-class Reference extends Link
-
-class Property extends Feature
-
-' Abstract classes
-
-abstract class MetamodelElement
-
-abstract class AbstractConcept extends MetamodelElement {
-  allFeatures(): List<Feature>
-}
-
-abstract class Datatype extends MetamodelElement
-
-abstract class Feature {
-  multiplicity: Multiplicity
-  calculated: boolean
-}
-
-abstract class Link extends Feature {
-}
-
-' Relations
-
-Metamodel "1" o-- "*" MetamodelElement: elements
-Metamodel "*" -- "*" Metamodel: dependsOn
-
-Concept "0..1" -- "*" Concept: extends
-Concept "*" -- "*" ConceptInterface: implements
-
-ConceptInterface "*" -- "*" ConceptInterface: extends
-
-Annotation "*" -- "1" AbstractConcept: target
-
-Containment "1" -- "*" Containment: specializes
-
-Reference "1" -- "*" Reference: specializes
-
-Property "*" -- "1" Datatype: type
-
-Link "*" -- "1" AbstractConcept: type
-
-NamespacedEntity "*" -- "1" NamespaceProvider: container
-
-FeaturesContainer "1" o-- "*" Feature: features
-
-Typedef "*" -- "1" PrimitiveType: constraints
+remove NamespacedEntity
+remove NamespaceProvider
+remove Typedef
+remove Annotation
 
 @enduml