Skip to content

Commit 88fed06

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Fixing "NONE" not working when selecting no element in a property page
1 parent 00957be commit 88fed06

19 files changed

+386
-298
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,19 @@ public void changeProperty(int row, String value) {
3333
if (value.contains(nodet.getUuid())) {
3434
this._element.setTopologyTemplate(
3535
TTopologyTemplate.instantiate((org.modelio.metamodel.uml.statik.Package) nodet));
36-
}
37-
}
36+
break;
37+
} else {
38+
this._element.setTopologyTemplate(null);
39+
} }
3840
break;
3941
case 3:
4042
for (ModelElement nodet : TPlans.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
4143
if (value.contains(nodet.getUuid())) {
4244
this._element.setPlans(TPlans.instantiate((org.modelio.metamodel.uml.statik.Class) nodet));
43-
}
45+
break;
46+
} else {
47+
this._element.setPlans(null);
48+
}
4449
}
4550
break;
4651

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ public void changeProperty(int row, String value) {
3434
for (ModelElement el : TEntityType.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
3535
if (value.contains(el.getUuid())) {
3636
this._element.setDerivedFrom(TEntityType.instantiate((org.modelio.metamodel.uml.statik.Class) el));
37-
}
37+
break;
38+
} else {
39+
this._element.setDerivedFrom(null);
40+
}
3841
}
3942
break;
4043
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ public void changeProperty(int row, String value) {
3737
for (ModelElement dep : TGroupType.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
3838
if (value.contains(dep.getUuid())) {
3939
this._element.setType(TGroupType.instantiate((org.modelio.metamodel.uml.statik.Class) dep));
40-
}
41-
}
40+
break;
41+
} else {
42+
this._element.setType(null);
43+
} }
4244
break;
4345

4446
case 3:

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ public void changeProperty(int row, String value) {
2828
for (ModelElement el : TGroupType.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
2929
if (value.contains(el.getUuid())) {
3030
this._element.setDerivedFrom(TGroupType.instantiate((org.modelio.metamodel.uml.statik.Class) el));
31-
}
31+
break;
32+
} else {
33+
this._element.setDerivedFrom(null);
34+
}
3235
}
3336
break;
3437
}

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

Lines changed: 112 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -19,117 +19,120 @@
1919
import org.modelio.vcore.session.api.model.IMObjectFilter;
2020
import org.modelio.vcore.smkernel.mapi.MObject;
2121

22-
@objid ("d99db68d-87e1-475a-91b7-c224c33cb0cc")
22+
@objid("d99db68d-87e1-475a-91b7-c224c33cb0cc")
2323
public class TPolicyPropertyPage<T extends TPolicy> extends ToscaElementPropertyPage<T> {
24-
@objid ("bfa8ecd2-9c97-48db-bf33-ccbcdc2e2903")
25-
public TPolicyPropertyPage(T elt) {
26-
super(elt);
27-
// TODO Auto-generated constructor stub
28-
}
24+
@objid("bfa8ecd2-9c97-48db-bf33-ccbcdc2e2903")
25+
public TPolicyPropertyPage(T elt) {
26+
super(elt);
27+
// TODO Auto-generated constructor stub
28+
}
2929

30-
@objid ("fd527354-ffa4-4097-b4f5-53c5337a1cee")
31-
@Override
32-
public void changeProperty(int row, String value) {
33-
switch (row) {
34-
35-
case 1:
36-
this._element.getElement().setName(value);
37-
38-
break;
39-
case 2:
40-
this._element.setDescription(value);
41-
42-
break;
43-
case 3:
44-
for (ModelElement el : TPolicyType.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
45-
if (value.contains(el.getUuid())) {
46-
this._element.setType(TPolicyType.instantiate((org.modelio.metamodel.uml.statik.Class) el));
47-
}
48-
}
49-
break;
50-
case 4:
51-
Class elt2 = (Class) getModelElt(TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
52-
if ((elt2 != null)
53-
&& (elt2.isStereotyped(IToscaDesignerPeerModule.MODULE_NAME, TNodeTemplate.STEREOTYPE_NAME))) {
54-
Object pc = ToscaDesignerProxyFactory.instantiate(elt2);
55-
if (value.startsWith(this._add)) {
56-
this._element.addTargets((TNodeTemplate) pc);
57-
} else {
58-
this._element.removeTargets((TNodeTemplate) pc);
59-
}
60-
}
61-
break;
62-
case 5:
63-
Class elt4 = (Class) getModelElt(Trigger.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
64-
if ((elt4 != null) && (elt4.isStereotyped(IToscaDesignerPeerModule.MODULE_NAME, Trigger.STEREOTYPE_NAME))) {
65-
Object pc = ToscaDesignerProxyFactory.instantiate(elt4);
66-
if (value.startsWith(this._add)) {
67-
this._element.addTriggers((Trigger) pc);
68-
} else {
69-
this._element.removeTriggers((Trigger) pc);
70-
}
71-
}
72-
break;
73-
74-
case 6:
75-
Attribute elt3 = (Attribute) getModelElt(TPropertyDef.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
76-
if ((elt3 != null)
77-
&& (elt3.isStereotyped(IToscaDesignerPeerModule.MODULE_NAME, TPropertyDef.STEREOTYPE_NAME))) {
78-
Object pc = ToscaDesignerProxyFactory.instantiate(elt3);
79-
if (value.startsWith(this._add)) {
80-
this._element.addProperties((TPropertyDef) pc);
81-
} else {
82-
this._element.removeProperties((TPropertyDef) pc);
83-
}
84-
}
85-
break;
86-
87-
case 7:
88-
this._element.setPolicyRef(value);
89-
break;
90-
91-
}
92-
}
30+
@objid("fd527354-ffa4-4097-b4f5-53c5337a1cee")
31+
@Override
32+
public void changeProperty(int row, String value) {
33+
switch (row) {
9334

94-
@objid ("57cdfc80-a690-495d-ab16-2e8759bdd7e0")
95-
@Override
96-
public void update(IModulePropertyTable table) {
97-
super.update(table);
98-
table.addProperty("Name", _element.getElement().getName());
99-
table.addProperty("Description", _element.getDescription());
100-
table.addProperty("Policy Type", this._element.getType() != null ? this._element.getType().getElement() : null,
101-
Arrays.asList(Metamodel.getMClass("Class")), new IMObjectFilter() {
102-
@Override
103-
public boolean accept(MObject element) {
104-
return TPolicyType.canInstantiate(element);
105-
}
106-
});
107-
108-
// Targets
109-
List<ModelElement> members_elt = extractModelElements(this._element.getTargets());
110-
List<ModelElement> nodeTemplateList = (TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
111-
? TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
112-
: Collections.emptyList();
113-
table.addProperty("Targets", getToscaValue(members_elt),
114-
getAddRemove(nodeTemplateList, extractModelElements(this._element.getTargets())));
115-
116-
// Triggers
117-
members_elt = extractModelElements(this._element.getTriggers());
118-
List<ModelElement> triggersList = (Trigger.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
119-
? Trigger.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
120-
: Collections.emptyList();
121-
table.addProperty("Triggers", getToscaValue(members_elt),
122-
getAddRemove(triggersList, extractModelElements(this._element.getTriggers())));
123-
124-
// Properties
125-
members_elt = extractModelElements(this._element.getProperties());
126-
List<ModelElement> propertiesList = (Trigger.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
127-
? TPropertyDef.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
128-
: Collections.emptyList();
129-
table.addProperty("Properties", getToscaValue(members_elt),
130-
getAddRemove(propertiesList, extractModelElements(this._element.getProperties())));
131-
132-
table.addProperty("Policy Ref", _element.getPolicyRef());
133-
}
35+
case 1:
36+
this._element.getElement().setName(value);
37+
38+
break;
39+
case 2:
40+
this._element.setDescription(value);
41+
42+
break;
43+
case 3:
44+
for (ModelElement el : TPolicyType.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
45+
if (value.contains(el.getUuid())) {
46+
this._element.setType(TPolicyType.instantiate((org.modelio.metamodel.uml.statik.Class) el));
47+
break;
48+
} else {
49+
this._element.setType(null);
50+
}
51+
}
52+
break;
53+
case 4:
54+
Class elt2 = (Class) getModelElt(TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
55+
if ((elt2 != null)
56+
&& (elt2.isStereotyped(IToscaDesignerPeerModule.MODULE_NAME, TNodeTemplate.STEREOTYPE_NAME))) {
57+
Object pc = ToscaDesignerProxyFactory.instantiate(elt2);
58+
if (value.startsWith(this._add)) {
59+
this._element.addTargets((TNodeTemplate) pc);
60+
} else {
61+
this._element.removeTargets((TNodeTemplate) pc);
62+
}
63+
}
64+
break;
65+
case 5:
66+
Class elt4 = (Class) getModelElt(Trigger.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
67+
if ((elt4 != null) && (elt4.isStereotyped(IToscaDesignerPeerModule.MODULE_NAME, Trigger.STEREOTYPE_NAME))) {
68+
Object pc = ToscaDesignerProxyFactory.instantiate(elt4);
69+
if (value.startsWith(this._add)) {
70+
this._element.addTriggers((Trigger) pc);
71+
} else {
72+
this._element.removeTriggers((Trigger) pc);
73+
}
74+
}
75+
break;
76+
77+
case 6:
78+
Attribute elt3 = (Attribute) getModelElt(TPropertyDef.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
79+
if ((elt3 != null)
80+
&& (elt3.isStereotyped(IToscaDesignerPeerModule.MODULE_NAME, TPropertyDef.STEREOTYPE_NAME))) {
81+
Object pc = ToscaDesignerProxyFactory.instantiate(elt3);
82+
if (value.startsWith(this._add)) {
83+
this._element.addProperties((TPropertyDef) pc);
84+
} else {
85+
this._element.removeProperties((TPropertyDef) pc);
86+
}
87+
}
88+
break;
89+
90+
case 7:
91+
this._element.setPolicyRef(value);
92+
break;
93+
94+
}
95+
}
96+
97+
@objid("57cdfc80-a690-495d-ab16-2e8759bdd7e0")
98+
@Override
99+
public void update(IModulePropertyTable table) {
100+
super.update(table);
101+
table.addProperty("Name", _element.getElement().getName());
102+
table.addProperty("Description", _element.getDescription());
103+
table.addProperty("Policy Type", this._element.getType() != null ? this._element.getType().getElement() : null,
104+
Arrays.asList(Metamodel.getMClass("Class")), new IMObjectFilter() {
105+
@Override
106+
public boolean accept(MObject element) {
107+
return TPolicyType.canInstantiate(element);
108+
}
109+
});
110+
111+
// Targets
112+
List<ModelElement> members_elt = extractModelElements(this._element.getTargets());
113+
List<ModelElement> nodeTemplateList = (TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
114+
? TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
115+
: Collections.emptyList();
116+
table.addProperty("Targets", getToscaValue(members_elt),
117+
getAddRemove(nodeTemplateList, extractModelElements(this._element.getTargets())));
118+
119+
// Triggers
120+
members_elt = extractModelElements(this._element.getTriggers());
121+
List<ModelElement> triggersList = (Trigger.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
122+
? Trigger.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
123+
: Collections.emptyList();
124+
table.addProperty("Triggers", getToscaValue(members_elt),
125+
getAddRemove(triggersList, extractModelElements(this._element.getTriggers())));
126+
127+
// Properties
128+
members_elt = extractModelElements(this._element.getProperties());
129+
List<ModelElement> propertiesList = (Trigger.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
130+
? TPropertyDef.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
131+
: Collections.emptyList();
132+
table.addProperty("Properties", getToscaValue(members_elt),
133+
getAddRemove(propertiesList, extractModelElements(this._element.getProperties())));
134+
135+
table.addProperty("Policy Ref", _element.getPolicyRef());
136+
}
134137

135138
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ public void changeProperty(int row, String value) {
2828
if (value.contains(el.getUuid())) {
2929
this._element.setName(
3030
PropertyDefinitionType.instantiate((org.modelio.metamodel.uml.statik.Attribute) el));
31-
}
31+
break;
32+
} else {
33+
this._element.setName(null);
34+
}
3235
}
3336
break;
3437

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ public void changeProperty(int row, String value) {
3737
if (value.contains(dep.getUuid())) {
3838
this._element.setCapabilityType(
3939
TCapabilityType.instantiate((org.modelio.metamodel.uml.statik.Class) dep));
40-
}
40+
break;
41+
} else {
42+
this._element.setCapabilityType(null);
43+
}
4144
}
4245
break;
4346

0 commit comments

Comments
 (0)