Skip to content

Commit e17eb04

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Adding missing property "derivedFrom" of following types ( in profile + propertypages):
entitytype Capability definition Requirement definition Requirement type Node type Relationshiptype Group type policyType + New TCapabilityType property page
1 parent 4d2b44b commit e17eb04

21 files changed

+371
-209
lines changed

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/IPropertyContent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
*/
2929
package fr.softeam.toscadesigner.handlers.propertypages;
3030

31-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
3231
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
3332

33+
import com.modeliosoft.modelio.javadesigner.annotations.objid;
34+
3435
/**
3536
* This interface defines the contract of all property pages
3637
*/

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/ToscaDesignerPropertyPageFactory.java‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,6 @@
66
*/
77
package fr.softeam.toscadesigner.handlers.propertypages;
88

9-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
10-
import fr.softeam.toscadesigner.api.IToscaDesignerPeerModule;
11-
import fr.softeam.toscadesigner.api.tosca.standard.package_.TGroup;
12-
import fr.softeam.toscadesigner.handlers.propertypages.core.MetadataPropertyPage;
13-
import fr.softeam.toscadesigner.handlers.propertypages.core.PropertyDefinitionTypePropertyPage;
14-
import fr.softeam.toscadesigner.handlers.propertypages.core.TGroupPropertyPage;
15-
import fr.softeam.toscadesigner.handlers.propertypages.core.TGroupTypePropertyPage;
16-
import fr.softeam.toscadesigner.handlers.propertypages.core.TPolicyPropertyPage;
17-
import fr.softeam.toscadesigner.handlers.propertypages.core.TPolicyTypePropertyPage;
18-
import fr.softeam.toscadesigner.handlers.propertypages.core.TPropertyDefPropertyPage;
19-
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TCapabilityDefinitionPropertyPage;
20-
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TCapabilityDefinitionsTypePropertyPage;
21-
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TNodeTypePropertyPage;
22-
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TRelationshipTypePropertyPage;
23-
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TRequirementDefinitionPropertyPage;
24-
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TRequirementDefinitionTypePropertyPage;
25-
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TTopologyTemplatePropertyPage;
26-
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.RequirementsTypePropertyPage;
27-
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.TDeploymentArtifactPropertyPage;
28-
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.TDeploymentArtifactsPropertyPage;
29-
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.TNodeTemplatePropertyPage;
30-
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.TRequirementPropertyPage;
319
import org.modelio.metamodel.diagrams.ClassDiagram;
3210
import org.modelio.metamodel.mda.ModuleComponent;
3311
import org.modelio.metamodel.uml.infrastructure.Dependency;
@@ -51,6 +29,30 @@
5129
import org.modelio.metamodel.visitors.IDefaultModelVisitor;
5230
import org.modelio.metamodel.visitors.IInfrastructureVisitor;
5331

32+
import com.modeliosoft.modelio.javadesigner.annotations.objid;
33+
34+
import fr.softeam.toscadesigner.api.IToscaDesignerPeerModule;
35+
import fr.softeam.toscadesigner.api.tosca.standard.package_.TGroup;
36+
import fr.softeam.toscadesigner.handlers.propertypages.core.MetadataPropertyPage;
37+
import fr.softeam.toscadesigner.handlers.propertypages.core.PropertyDefinitionTypePropertyPage;
38+
import fr.softeam.toscadesigner.handlers.propertypages.core.TGroupPropertyPage;
39+
import fr.softeam.toscadesigner.handlers.propertypages.core.TGroupTypePropertyPage;
40+
import fr.softeam.toscadesigner.handlers.propertypages.core.TPolicyPropertyPage;
41+
import fr.softeam.toscadesigner.handlers.propertypages.core.TPolicyTypePropertyPage;
42+
import fr.softeam.toscadesigner.handlers.propertypages.core.TPropertyDefPropertyPage;
43+
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TCapabilityDefinitionPropertyPage;
44+
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TCapabilityDefinitionsTypePropertyPage;
45+
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TNodeTypePropertyPage;
46+
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TRelationshipTypePropertyPage;
47+
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TRequirementDefinitionPropertyPage;
48+
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TRequirementDefinitionTypePropertyPage;
49+
import fr.softeam.toscadesigner.handlers.propertypages.serviceTemplate.TTopologyTemplatePropertyPage;
50+
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.RequirementsTypePropertyPage;
51+
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.TDeploymentArtifactPropertyPage;
52+
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.TDeploymentArtifactsPropertyPage;
53+
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.TNodeTemplatePropertyPage;
54+
import fr.softeam.toscadesigner.handlers.propertypages.topologyTemplate.TRequirementPropertyPage;
55+
5456
@objid ("548a9154-c8a7-486f-9adb-ba13d312251a")
5557
public class ToscaDesignerPropertyPageFactory {
5658
@objid ("9c7aba2f-0c37-4d81-908a-ddfd5a54e213")

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/ToscaPropertyPageHandler.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package fr.softeam.toscadesigner.handlers.propertypages;
22

33
import java.util.List;
4-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
4+
55
import org.modelio.api.module.IModule;
66
import org.modelio.api.module.propertiesPage.AbstractModulePropertyPage;
77
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
88
import org.modelio.metamodel.uml.infrastructure.ModelElement;
99
import org.modelio.vcore.smkernel.mapi.MObject;
1010

11+
import com.modeliosoft.modelio.javadesigner.annotations.objid;
12+
1113
@objid ("5635dc32-d607-44ef-bf38-78a08ccba98b")
1214
public class ToscaPropertyPageHandler extends AbstractModulePropertyPage {
1315
@objid ("f74ce1e1-4019-4519-b1cc-99ce2aa23c8f")

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/ImportElementPropertyPage.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package fr.softeam.toscadesigner.handlers.propertypages.core;
22

3+
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
4+
35
import com.modeliosoft.modelio.javadesigner.annotations.objid;
6+
47
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.ImportElement;
5-
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
68

79
@objid ("94f8b8ec-54e8-454c-9e1f-32ca5a0dea62")
810
public class ImportElementPropertyPage<T extends ImportElement> extends ToscaElementPropertyPage<T> {

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/MetadataPropertyPage.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package fr.softeam.toscadesigner.handlers.propertypages.core;
22

3+
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
4+
35
import com.modeliosoft.modelio.javadesigner.annotations.objid;
6+
47
import fr.softeam.toscadesigner.api.tosca.standard.attribute.Metadata;
5-
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
68

79
@objid ("daed0c47-9098-44e5-8818-b0edc0798342")
810
public class MetadataPropertyPage<T extends Metadata> extends ToscaElementPropertyPage<T> {

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/PropertyDefinitionTypePropertyPage.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package fr.softeam.toscadesigner.handlers.propertypages.core;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
3+
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
4+
55
import com.modeliosoft.modelio.javadesigner.annotations.objid;
6+
67
import fr.softeam.toscadesigner.api.tosca.standard.attribute.PropertyDefinitionType;
7-
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
8-
import org.modelio.metamodel.uml.infrastructure.ModelElement;
9-
import org.modelio.metamodel.uml.statik.DataType;
108

119
@objid ("1c6a520c-04ce-41e5-9556-bd2f87af180b")
1210
public class PropertyDefinitionTypePropertyPage<T extends PropertyDefinitionType> extends ToscaElementPropertyPage<T> {

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/TEntityTemplatePropertyPage.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package fr.softeam.toscadesigner.handlers.propertypages.core;
22

3+
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
4+
35
import com.modeliosoft.modelio.javadesigner.annotations.objid;
6+
47
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TEntityTemplate;
5-
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
68

79
@objid ("00b0f9d7-831b-4f11-9a40-328724e84ef9")
810
public abstract class TEntityTemplatePropertyPage<T extends TEntityTemplate> extends ToscaElementPropertyPage<T> {

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/TEntityTypePropertyPage.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package fr.softeam.toscadesigner.handlers.propertypages.core;
22

33
import java.util.Arrays;
4-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
5-
import fr.softeam.toscadesigner.api.tosca.standard.class_.TEntityType;
6-
import fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicyType;
4+
75
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
86
import org.modelio.metamodel.Metamodel;
97
import org.modelio.metamodel.uml.infrastructure.ModelElement;
108
import org.modelio.vcore.session.api.model.IMObjectFilter;
119
import org.modelio.vcore.smkernel.mapi.MObject;
1210

11+
import com.modeliosoft.modelio.javadesigner.annotations.objid;
12+
13+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TEntityType;
14+
1315
@objid ("2838ec68-e4d6-477b-9ba1-a3596be3ed41")
1416
public abstract class TEntityTypePropertyPage<T extends TEntityType> extends ToscaElementPropertyPage<T> {
1517
@objid ("2000cd5e-4ed6-4455-a13d-9069a6cb5c6a")

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/TGroupPropertyPage.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package fr.softeam.toscadesigner.handlers.propertypages.core;
22

33
import java.util.Arrays;
4-
import java.util.Collections;
54
import java.util.List;
65

76
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
@@ -13,8 +12,8 @@
1312

1413
import fr.softeam.toscadesigner.api.IToscaDesignerPeerModule;
1514
import fr.softeam.toscadesigner.api.ToscaDesignerProxyFactory;
16-
import fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate;
1715
import fr.softeam.toscadesigner.api.tosca.standard.class_.TGroupType;
16+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate;
1817
import fr.softeam.toscadesigner.api.tosca.standard.package_.TGroup;
1918

2019
public class TGroupPropertyPage<T extends TGroup> extends ToscaElementPropertyPage<T> {

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/TGroupTypePropertyPage.java‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package fr.softeam.toscadesigner.handlers.propertypages.core;
22

3-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
3+
import java.util.Arrays;
44

5-
import fr.softeam.toscadesigner.api.tosca.standard.class_.TGroupType;
65
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
6+
import org.modelio.metamodel.Metamodel;
7+
import org.modelio.metamodel.uml.infrastructure.ModelElement;
8+
import org.modelio.vcore.session.api.model.IMObjectFilter;
9+
import org.modelio.vcore.smkernel.mapi.MObject;
10+
11+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TGroupType;
712

813

914
public class TGroupTypePropertyPage<T extends TGroupType> extends ToscaElementPropertyPage<T> {
@@ -20,15 +25,29 @@ public void changeProperty(int row, String value) {
2025
case 1:
2126
this._element.getElement().setName(value);
2227
break;
23-
28+
case 2:
29+
for (ModelElement el : TGroupType.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
30+
if (value.contains(el.getUuid())) {
31+
this._element
32+
.setDerivedFrom(TGroupType.instantiate((org.modelio.metamodel.uml.statik.Class) el));
33+
}
34+
}
35+
break;
2436
}
2537
}
2638

2739
@Override
2840
public void update(IModulePropertyTable table) {
2941
super.update(table);
3042
table.addProperty("Name", _element.getElement().getName());
31-
43+
table.addProperty("Derived From",
44+
this._element.getDerivedFrom() != null ? this._element.getDerivedFrom().getElement() : null,
45+
Arrays.asList(Metamodel.getMClass("Class")), new IMObjectFilter() {
46+
@Override
47+
public boolean accept(MObject element) {
48+
return TGroupType.canInstantiate(element);
49+
}
50+
});
3251
}
3352

3453
}

0 commit comments

Comments
 (0)