Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -513,16 +513,15 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
}

def void _createChildren(IOutlineNode parentNode, Type type) {
//ImplicitFieldAdapter.getOrCreateAdapter(type).
createImplicitGeneralizationNodes(parentNode, type)
_createChildren(parentNode, type as Namespace)
createImplicitBindingConnectorNodes(parentNode, type)
createImplicitSpecializationNodes(parentNode, type)
if (type instanceof Feature) {
createImplicitTypeFeaturingNodes(parentNode, type)
}
_createChildren(parentNode, type as Namespace)
createImplicitBindingConnectorNodes(parentNode, type)
}

def createImplicitGeneralizationNodes(IOutlineNode parentNode, Type type) {
def createImplicitSpecializationNodes(IOutlineNode parentNode, Type type) {
TypeUtil.forEachImplicitGeneralTypeOf(type, [eClass, generalType |
/*
* TODO here image dispatcher should be called with a type that
Expand Down Expand Up @@ -597,8 +596,6 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
}

def void _createChildren(IOutlineNode parentNode, OperatorExpression expression) {
createImplicitGeneralizationNodes(parentNode, expression)
createImplicitTypeFeaturingNodes(parentNode, expression)
for (Relationship relationship : expression.ownedRelationship) {
createNode(parentNode, relationship,
_image(relationship),
Expand All @@ -608,6 +605,8 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
);
}
createImplicitBindingConnectorNodes(parentNode, expression)
createImplicitSpecializationNodes(parentNode, expression)
createImplicitTypeFeaturingNodes(parentNode, expression)
}

override _createNode(DocumentRootNode parentNode, EObject modelElement) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,14 +286,14 @@ public void forEachImplicitBindingConnector(Consumer<BindingConnector> consumer)

/**
* Executes the given consumer function with all implicit binding connectors and
* their corresponding membership type (Membership or FeatureMembership)
* their corresponding membership type (OwningMembership or FeatureMembership)
*/
public void forEachImplicitBindingConnector(BiConsumer<BindingConnector, EClass> consumer) {
for (BindingConnector connector : implicitFeatureBindingConnectors) {
consumer.accept(connector, SysMLPackage.Literals.FEATURE_MEMBERSHIP);
}
for (BindingConnector connector : implicitMemberBindingConnectors) {
consumer.accept(connector, SysMLPackage.Literals.MEMBERSHIP);
consumer.accept(connector, SysMLPackage.Literals.OWNING_MEMBERSHIP);
}
}

Expand Down
Loading