Skip to content

Commit

Permalink
eclipse-capella#2913 Make association source and target reliable in CDB
Browse files Browse the repository at this point in the history 
This commit updates the CDB association edge mapping in the VSM
(source/target mappings and styles) to make association source and
target reliable in CDB, to always have the same source and target, and
to prevent a change in property from changing the source or the target.

This commit also adds a migration to reverse the association edge in the
wrong direction in existing projects.

This commit also adapts the tests
ReconnectRelationshipGroup.ReconnectRelationshipGroupSA,
ReconnectRelationshipGroup.ReconnectRelationshipGroupOA in
org.polarsys.capella.test.diagram.tools.ju.cdb to these changes.

Signed-off-by: Séraphin Costa <[email protected]>
  • Loading branch information
@scosta-obeo
scosta-obeo committed Nov 28, 2024
1 parent ab46da0 commit f94cd78
Show file tree
Hide file tree
Showing 9 changed files with 482 additions and 50 deletions.
3 changes: 3 additions & 0 deletions core/plugins/org.polarsys.capella.core.data.migration/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@
<migrationContributor
class="org.polarsys.capella.core.data.migration.aird.AutoSizeSquareStyleMigrationContributor">
</migrationContributor>
<migrationContributor
class="org.polarsys.capella.core.data.migration.aird.AssociationCDBMigrationContributor">
</migrationContributor>

</extension>

Expand Down
3 changes: 2 additions & 1 deletion ....core.data.migration/src/org/polarsys/capella/core/data/migration/MigrationConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ public class MigrationConstants {
public static final String MIGRATION_KIND__VIEWPOINT = "MIGRATION_KIND__VIEWPOINT";
public static final String MIGRATION_KIND__IMAGE_DEPENDENCIES = "MIGRATION_KIND__IMAGE_DEPENDENCIES";
public static final String MIGRATION_KIND__AUTOSIZE_SQUARE_STYLE = "MIGRATION_KIND__AUTOSIZE_SQUARE_STYLE";
public static final String MIGRATION_KIND__ASSOCIATION_CDB = "MIGRATION_KIND__ASSOCIATION_CDB";

public static final String[] DEFAULT_KIND_ORDER = { MIGRATION_KIND__CHECK_MISSING_VP, MIGRATION_KIND__PATTERN,
MIGRATION_KIND__SEMANTIC, MIGRATION_KIND__DIAGRAM, MIGRATION_KIND__FCDDIAGRAM, MIGRATION_KIND__AFM,
MIGRATION_KIND__VIEWPOINT, MIGRATION_KIND__SCF, MIGRATION_KIND__IMAGE_DEPENDENCIES, MIGRATION_KIND__AUTOSIZE_SQUARE_STYLE };
MIGRATION_KIND__VIEWPOINT, MIGRATION_KIND__SCF, MIGRATION_KIND__IMAGE_DEPENDENCIES, MIGRATION_KIND__AUTOSIZE_SQUARE_STYLE, MIGRATION_KIND__ASSOCIATION_CDB };
}
383 changes: 383 additions & 0 deletions ...src/org/polarsys/capella/core/data/migration/aird/AssociationCDBMigrationContributor.java
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions ...pella.core.data.migration/src/org/polarsys/capella/core/data/migration/aird/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public class Messages extends NLS {
public static String MigrationAction_AutoSizeSquareStyleMigration;
public static String MigrationAction_DiagramMigration;
public static String MigrationAction_ImageProjectDependencies;
public static String MigrationAction_AssociationCDBMigration;
public static String MigrationAction_InvalidEdgeExtremityInvalidType;

static {
// initialize resource bundle
Expand Down
4 changes: 3 additions & 1 deletion ...core.data.migration/src/org/polarsys/capella/core/data/migration/aird/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@
#===============================================================================
MigrationAction_AutoSizeSquareStyleMigration=Auto-size Square style migration
MigrationAction_DiagramMigration=Diagrams migration
MigrationAction_ImageProjectDependencies=Image project dependencies migration
MigrationAction_ImageProjectDependencies=Image project dependencies migration
MigrationAction_AssociationCDBMigration=CDB association direction migration
MigrationAction_InvalidEdgeExtremityInvalidType=The source or target of the edge ''{0}'' in the diagram ''{1}'' should be a DSemanticDecorator. This edge has not been migrated.
10 changes: 5 additions & 5 deletions core/plugins/org.polarsys.capella.core.sirius.analysis/description/common.odesign
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,7 @@
</centerLabelStyleDescription>
</style>
</edgeMappings>
<edgeMappings name="DT_Association" preconditionExpression="aql:self.getAssociationProperties()->size() = 2 and not (self.hasNonPrimitiveEnds())" deletionDescription="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete_DataType']" labelDirectEdit="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='name']" semanticCandidatesExpression="service:diagram.getCDBAssociationSemanticCandidates" semanticElements="aql:self.makeUnion(self, self.ownedMembers, self.navigableMembers)" sourceMapping="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@containerMappings[name='DT_Class']" targetMapping="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@containerMappings[name='DT_Class'] //@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@containerMappings[name='DT_Collection']" targetFinderExpression="aql:self.getAssociationTarget().abstractType" sourceFinderExpression="aql:self.getAssociationSource().abstractType" domainClass="Association" useDomainElement="true" reconnections="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='CB%20Reconnect%20Association%20Source'] //@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='CB%20Reconnect%20Association%20Target']">
<edgeMappings name="DT_Association" preconditionExpression="aql:self.getAssociationProperties()->size() = 2 and not (self.hasNonPrimitiveEnds())" deletionDescription="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete_DataType']" labelDirectEdit="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='name']" semanticCandidatesExpression="service:diagram.getCDBAssociationSemanticCandidates" semanticElements="aql:self.makeUnion(self, self.ownedMembers, self.navigableMembers)" sourceMapping="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@containerMappings[name='DT_Class'] //@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@containerMappings[name='DT_Collection']" targetMapping="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@containerMappings[name='DT_Class'] //@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@containerMappings[name='DT_Collection']" targetFinderExpression="aql:self.getAssociationTarget().abstractType" sourceFinderExpression="aql:self.getAssociationSource().abstractType" domainClass="Association" useDomainElement="true" reconnections="//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='CB%20Reconnect%20Association%20Source'] //@ownedViewpoints[name='Common']/@ownedRepresentations[name='Class%20Diagram%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='CB%20Reconnect%20Association%20Target']">
<style targetArrow="NoDecoration">
<strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
<beginLabelStyleDescription showIcon="false" labelExpression="aql:self.getAssociationBeginRoleLabel(self,self.getAssociationSource(),view)">
Expand All @@ -1868,7 +1868,7 @@
</style>
</conditionnalStyles>
<conditionnalStyles predicateExpression="aql:(self.getAssociationTarget().aggregationKind = information::AggregationKind::ASSOCIATION) and (self.getAssociationSource().aggregationKind = information::AggregationKind::ASSOCIATION) and (self.navigableMembers->includes(self.getAssociationSource())) and (not (self.navigableMembers->includes(self.getAssociationTarget())))">
<style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='_CAP_Association_Color']">
<style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='_CAP_Association_Color']" sourceArrow="InputArrow" targetArrow="NoDecoration">
<beginLabelStyleDescription showIcon="false" labelExpression="aql:self.getAssociationBeginRoleLabel(self,self.getAssociationSource(),view)">
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
</beginLabelStyleDescription>
Expand Down Expand Up @@ -1920,7 +1920,7 @@
</style>
</conditionnalStyles>
<conditionnalStyles predicateExpression="aql:(self.getAssociationTarget().aggregationKind = information::AggregationKind::ASSOCIATION) and (self.getAssociationSource().aggregationKind = information::AggregationKind::AGGREGATION) and (self.navigableMembers->includes(self.getAssociationSource())) and (not (self.navigableMembers->includes(self.getAssociationTarget())))">
<style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='_CAP_Association_Color']" sourceArrow="InputArrowWithDiamond" targetArrow="NoDecoration">
<style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='_CAP_Association_Color']" sourceArrow="InputArrow" targetArrow="Diamond">
<beginLabelStyleDescription showIcon="false" labelExpression="aql:self.getAssociationBeginRoleLabel(self,self.getAssociationSource(),view)">
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
</beginLabelStyleDescription>
Expand All @@ -1946,7 +1946,7 @@
</style>
</conditionnalStyles>
<conditionnalStyles predicateExpression="aql:(self.getAssociationTarget().aggregationKind = information::AggregationKind::ASSOCIATION) and (self.getAssociationSource().aggregationKind = information::AggregationKind::COMPOSITION) and (self.navigableMembers->size() = 0)">
<style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='_CAP_Association_Color']" targetArrow="Diamond">
<style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='_CAP_Association_Color']" targetArrow="FillDiamond">
<beginLabelStyleDescription showIcon="false" labelExpression="aql:self.getAssociationBeginRoleLabel(self,self.getAssociationSource(),view)">
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
</beginLabelStyleDescription>
Expand All @@ -1972,7 +1972,7 @@
</style>
</conditionnalStyles>
<conditionnalStyles predicateExpression="aql:(self.getAssociationTarget().aggregationKind = information::AggregationKind::ASSOCIATION) and (self.getAssociationSource().aggregationKind = information::AggregationKind::COMPOSITION) and (self.navigableMembers->includes(self.getAssociationSource())) and (not (self.navigableMembers->includes(self.getAssociationTarget())))">
<style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='_CAP_Association_Color']" sourceArrow="InputArrowWithDiamond" targetArrow="FillDiamond">
<style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='_CAP_Association_Color']" sourceArrow="InputArrow" targetArrow="FillDiamond">
<beginLabelStyleDescription showIcon="false" labelExpression="aql:self.getAssociationBeginRoleLabel(self,self.getAssociationSource(),view)">
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
</beginLabelStyleDescription>
Expand Down
29 changes: 11 additions & 18 deletions ...re.sirius.analysis/src/org/polarsys/capella/core/sirius/analysis/InformationServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.stream.Stream;

import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
Expand Down Expand Up @@ -749,16 +750,11 @@ private Property getOthers(Property property, Collection<Property> properties) {
* @return
*/
public Property getAssociationSource(Association association) {
int navigableMembersSize = association.getNavigableMembers().size();
if (1 == navigableMembersSize) {
return getOthers(association.getNavigableMembers().get(0), association.getOwnedMembers());
} else if (2 == navigableMembersSize) {
return association.getNavigableMembers().get(1);
} else if (!association.getOwnedMembers().isEmpty()) {
return association.getOwnedMembers().get(0);
} else {
return null;
}
return Stream.concat(association.getNavigableMembers().stream(), association.getOwnedMembers().stream())
// we sort properties by ascending Id to always have the same source
.sorted((prop1, prop2) -> prop1.getId().compareTo(prop2.getId()))
.findFirst()
.orElse(null);
}

/**
Expand All @@ -781,14 +777,11 @@ public Collection<Property> getAssociationProperties(Association association) {
* @return
*/
public Property getAssociationTarget(Association association) {
int navigableMembersSize = association.getNavigableMembers().size();
if ((1 == navigableMembersSize) || (2 == navigableMembersSize)) {
return association.getNavigableMembers().get(0);
} else if (association.getOwnedMembers().size() > 1) {
return association.getOwnedMembers().get(1);
} else {
return null;
}
return Stream.concat(association.getNavigableMembers().stream(), association.getOwnedMembers().stream())
// we sort properties by decreasing Id to always have the same target
.sorted((prop1, prop2) -> prop2.getId().compareTo(prop1.getId()))
.findFirst()
.orElse(null);
}

public AssociationPkg getSourceClassPkg(Class sourceClass) {
Expand Down
55 changes: 45 additions & 10 deletions ...diagram.common.ju/src/org/polarsys/capella/test/diagram/common/ju/context/CDBDiagram.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@
package org.polarsys.capella.test.diagram.common.ju.context;

import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.DDiagramElement;
import org.eclipse.sirius.diagram.DEdge;
import org.eclipse.sirius.diagram.DNodeListElement;
import org.eclipse.sirius.viewpoint.DSemanticDecorator;
import org.polarsys.capella.common.data.modellingcore.ModelElement;
import org.polarsys.capella.core.data.cs.ExchangeItemAllocation;
import org.polarsys.capella.core.data.cs.Interface;
import org.polarsys.capella.core.data.information.Collection;
Expand All @@ -29,6 +33,7 @@
import org.polarsys.capella.core.data.information.Parameter;
import org.polarsys.capella.core.data.information.Property;
import org.polarsys.capella.core.data.information.Service;
import org.polarsys.capella.core.data.information.impl.ClassImpl;
import org.polarsys.capella.core.diagram.helpers.naming.DiagramDescriptionConstants;
import org.polarsys.capella.core.sirius.analysis.constants.IDNDToolNameConstants;
import org.polarsys.capella.core.sirius.analysis.constants.IToolNameConstants;
Expand Down Expand Up @@ -160,26 +165,56 @@ public String createCollectionType(String sourceId, String targetId) {
return getSemanticIdFromView(graphicalElement);
}

public void reconnectRelationshipSource(String id, String oldSourceId, String newSourceId,
RelationshipType relationship) {
new ReconnectTool(this, getReconnectSourceRelationshipName(relationship), id, oldSourceId, newSourceId).run();
public void reconnectRelationshipSource(String id, String newSourceId, RelationshipType relationship) {
if (getView(id) instanceof DEdge dEdge) {
if (dEdge.getSourceNode() instanceof DDiagramElement dde) {
new ReconnectTool(this, getReconnectSourceRelationshipName(relationship), id, getSemanticIdFromView(dde), newSourceId).run();
} else {
fail("The source element of the DEdge must be an instance of DDiagramElement.");
}
} else {
fail("The id used for reconnect must correspond to a DEdge element.");
}
}

public void reconnectRelationshipTarget(String id, String oldTargetId, String newTargetId,
RelationshipType relationship) {
new ReconnectTool(this, getReconnectTargetRelationshipName(relationship), id, oldTargetId, newTargetId).run();
public void reconnectRelationshipTarget(String id, String newTargetId, RelationshipType relationship) {
if (getView(id) instanceof DEdge dEdge) {
if (dEdge.getTargetNode() instanceof DDiagramElement dde) {
new ReconnectTool(this, getReconnectTargetRelationshipName(relationship), id, getSemanticIdFromView(dde), newTargetId).run();
} else {
fail("The target element of the DEdge must be an instance of DDiagramElement.");
}
} else {
fail("The id used for reconnect must correspond to a DEdge element.");
}
}

public void cannotReconnectRelationshipSource(String id, String oldSourceId, String newSourceId,
public void cannotReconnectRelationshipSource(String id, String newSourceId,
RelationshipType relationship) {
new ReconnectTool(this, getReconnectSourceRelationshipName(relationship), id, oldSourceId, newSourceId)
if (getView(id) instanceof DEdge dEdge) {
if (dEdge.getSourceNode() instanceof DDiagramElement dde) {
new ReconnectTool(this, getReconnectSourceRelationshipName(relationship), id, getSemanticIdFromView(dde), newSourceId)
.shouldFail();
} else {
fail("The source element of the DEdge must be an instance of DDiagramElement.");
}
} else {
fail("The id used for reconnect must correspond to a DEdge element.");
}
}

public void cannotReconnectRelationshipTarget(String id, String oldTargetId, String newTargetId,
public void cannotReconnectRelationshipTarget(String id, String newTargetId,
RelationshipType relationship) {
new ReconnectTool(this, getReconnectTargetRelationshipName(relationship), id, oldTargetId, newTargetId)
if (getView(id) instanceof DEdge dEdge) {
if (dEdge.getTargetNode() instanceof DDiagramElement dde) {
new ReconnectTool(this, getReconnectTargetRelationshipName(relationship), id, getSemanticIdFromView(dde), newTargetId)
.shouldFail();
} else {
fail("The target element of the DEdge must be an instance of DDiagramElement.");
}
} else {
fail("The id used for reconnect must correspond to a DEdge element.");
}
}

public String createInterfacePackage() {
Expand Down
Loading

0 comments on commit f94cd78

Please sign in to comment.