Skip to content

Safran 1223 unify naming #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VincBou wants to merge 2 commits into
base: v5.x-aql7
Choose a base branch
from
Open

Safran 1223 unify naming #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d533c92
[SAFRAN-1223] Database :: Add '_' to name creation when needed
VincBou Nov 26, 2025
b756527
[SAFRAN-1223] Change relations naming for classes-type diagrams
VincBou Dec 19, 2025
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
12 changes: 6 additions & 6 deletions ...ork.tools.classdiagramgenerator.editor/description/StructuredTypesDiagramTemplate.odesign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences">
<subModelOperations xsi:type="tool_1:SetValue" featureName="referencedType" valueExpression="var:target"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).manageCaseRelation(source)"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="navigable" valueExpression="true"/>
</subModelOperations>
Expand All @@ -333,7 +333,7 @@
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences">
<subModelOperations xsi:type="tool_1:SetValue" featureName="referencedType" valueExpression="var:target"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).manageCaseRelation(source)"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="isComposite" valueExpression="true"/>
Expand Down Expand Up @@ -365,14 +365,14 @@
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences" variableName="firstReference">
<subModelOperations xsi:type="tool_1:SetValue" featureName="referencedType" valueExpression="var:target"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="isComposite" valueExpression="false"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).manageCaseRelation(source)"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences" variableName="secondReference">
<subModelOperations xsi:type="tool_1:SetValue" featureName="referencedType" valueExpression="var:source"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="isComposite" valueExpression="false"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.oclAsType(environment::StructuredType).manageCaseRelation(target)"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="oppositeOf" valueExpression="var:firstReference"/>
Expand All @@ -393,14 +393,14 @@
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences" variableName="firstReference">
<subModelOperations xsi:type="tool_1:SetValue" featureName="referencedType" valueExpression="var:target"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="isComposite" valueExpression="true"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).manageCaseRelation(source)"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences" variableName="secondReference">
<subModelOperations xsi:type="tool_1:SetValue" featureName="referencedType" valueExpression="var:source"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="isComposite" valueExpression="false"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.oclAsType(environment::StructuredType).manageCaseRelation(target)"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="oppositeOf" valueExpression="var:firstReference"/>
Expand Down
12 changes: 6 additions & 6 deletions designs/database/plugins/org.obeonetwork.dsl.database.design/description/database.odesign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="database::Table" referenceName="tables">
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Table' + self.eContainer(database::TableContainer).tables->size()"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Table_' + self.eContainer(database::TableContainer).tables->size()"/>
</subModelOperations>
</firstModelOperations>
</initialOperation>
Expand All @@ -115,7 +115,7 @@
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="database::View" referenceName="tables">
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'View' + self.eContainer(database::DataBase).tables->size()"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'View_' + self.eContainer(database::DataBase).tables->size()"/>
</subModelOperations>
</firstModelOperations>
</initialOperation>
Expand All @@ -126,7 +126,7 @@
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="database::Column" referenceName="columns">
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'column' + self.eContainer(database::Table).columns->size()"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'column_' + self.eContainer(database::Table).columns->size()"/>
</subModelOperations>
</firstModelOperations>
</initialOperation>
Expand All @@ -137,7 +137,7 @@
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="database::Column" referenceName="columns">
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'column' + self.eContainer(database::Table).columns->size()"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'column_' + self.eContainer(database::Table).columns->size()"/>
<subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.addToPrimaryKey()"/>
</subModelOperations>
</firstModelOperations>
Expand Down Expand Up @@ -358,7 +358,7 @@
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="database::Schema" referenceName="schemas">
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Schema' + self.eContainer(database::DataBase).schemas->size()"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Schema_' + self.eContainer(database::DataBase).schemas->size()"/>
</subModelOperations>
</firstModelOperations>
</initialOperation>
Expand Down Expand Up @@ -468,7 +468,7 @@
<initialOperation>
<firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
<subModelOperations xsi:type="tool_1:CreateInstance" typeName="database::Index" referenceName="indexes">
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Index' + self.eContainer(database::Table).indexes->size()"/>
<subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Index_' + self.eContainer(database::Table).indexes->size()"/>
</subModelOperations>
</firstModelOperations>
</initialOperation>
Expand Down
12 changes: 6 additions & 6 deletions designs/entity/plugins/org.obeonetwork.dsl.entity.design/description/entity.odesign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
<firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
<subModelOperations xsi:type="tool:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences">
<subModelOperations xsi:type="tool:SetValue" featureName="referencedType" valueExpression="var:target"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).manageCaseRelation(source)"/>
<subModelOperations xsi:type="tool:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool:SetValue" featureName="navigable" valueExpression="true"/>
</subModelOperations>
Expand All @@ -353,7 +353,7 @@
<firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
<subModelOperations xsi:type="tool:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences">
<subModelOperations xsi:type="tool:SetValue" featureName="referencedType" valueExpression="var:target"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).manageCaseRelation(source)"/>
<subModelOperations xsi:type="tool:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool:SetValue" featureName="isComposite" valueExpression="true"/>
Expand Down Expand Up @@ -385,14 +385,14 @@
<subModelOperations xsi:type="tool:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences" variableName="firstReference">
<subModelOperations xsi:type="tool:SetValue" featureName="referencedType" valueExpression="var:target"/>
<subModelOperations xsi:type="tool:SetValue" featureName="isComposite" valueExpression="false"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).manageCaseRelation(source)"/>
<subModelOperations xsi:type="tool:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
<subModelOperations xsi:type="tool:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences" variableName="secondReference">
<subModelOperations xsi:type="tool:SetValue" featureName="referencedType" valueExpression="var:source"/>
<subModelOperations xsi:type="tool:SetValue" featureName="isComposite" valueExpression="false"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:source.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:source.oclAsType(environment::StructuredType).manageCaseRelation(target)"/>
<subModelOperations xsi:type="tool:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool:SetValue" featureName="oppositeOf" valueExpression="var:firstReference"/>
Expand All @@ -413,14 +413,14 @@
<subModelOperations xsi:type="tool:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences" variableName="firstReference">
<subModelOperations xsi:type="tool:SetValue" featureName="referencedType" valueExpression="var:target"/>
<subModelOperations xsi:type="tool:SetValue" featureName="isComposite" valueExpression="true"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.oclAsType(environment::StructuredType).manageCaseRelation(source)"/>
<subModelOperations xsi:type="tool:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
<subModelOperations xsi:type="tool:CreateInstance" typeName="environment.Reference" referenceName="ownedReferences" variableName="secondReference">
<subModelOperations xsi:type="tool:SetValue" featureName="referencedType" valueExpression="var:source"/>
<subModelOperations xsi:type="tool:SetValue" featureName="isComposite" valueExpression="false"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:source.oclAsType(environment::StructuredType).name.trim() + 's'"/>
<subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:source.oclAsType(environment::StructuredType).manageCaseRelation(target)"/>
<subModelOperations xsi:type="tool:SetValue" featureName="multiplicity" valueExpression="ZERO_STAR"/>
<subModelOperations xsi:type="tool:SetValue" featureName="navigable" valueExpression="true"/>
<subModelOperations xsi:type="tool:SetValue" featureName="oppositeOf" valueExpression="var:firstReference"/>
Expand Down
29 changes: 29 additions & 0 deletions ...ervices/src/org/obeonetwork/dsl/environment/design/services/EnvironmentLabelServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

import static java.util.stream.Collectors.joining;

import javax.swing.text.html.parser.Entity;

import org.eclipse.emf.ecore.EObject;
import org.obeonetwork.dsl.environment.Attribute;
import org.obeonetwork.dsl.environment.EnvironmentPackage;
Expand Down Expand Up @@ -78,6 +80,33 @@ public String caseStructuredType(StructuredType object) {
}
return label;
}

/**
* Get name of relation between target and source based on target name and turn
* all consecutive upper letter at the beginning into lower case
*
* @param target of the relation
* @param source of the relation
* @return the name for the relation
*/
public String manageCaseRelation(StructuredType target, StructuredType source) {
char[] nameArray = target.getName().toCharArray();
int i = 0;
// Replace consecutive upper case with lower
while (i < nameArray.length && Character.isUpperCase(nameArray[i])) {
nameArray[i] = Character.toLowerCase(nameArray[i]);
i++;
}
String relationName = new String(nameArray).trim() + "s";
// search existing relations in source with the same target
int sizeRef = source.getOwnedReferences().stream().filter(ref -> target.equals(ref.getReferencedType()))
.toList().size();
if (sizeRef > 1) {
relationName += sizeRef;
}
return relationName;
}


}

Loading