Skip to content

Commit a7e4cb6

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
TArtifact template property page added + Formatting code
1 parent 0f956f6 commit a7e4cb6

File tree

47 files changed

+2467
-2373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2467
-2373
lines changed

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,24 @@
3434
/**
3535
* This interface defines the contract of all property pages
3636
*/
37-
@objid ("35d19e45-5906-45ec-b5f7-428a42329c72")
37+
@objid("35d19e45-5906-45ec-b5f7-428a42329c72")
3838
public interface IPropertyContent {
39-
/**
40-
* This method handles the changes of the given property, identified by its row index, of a selected element
41-
* to a new value.
42-
* @param row : the row of the changed property
43-
* @param value : the new value of the property
44-
*/
45-
@objid ("ec859bac-8856-4ecd-899a-6b21df6dd192")
46-
void changeProperty(int row, String value);
39+
/**
40+
* This method handles the changes of the given property, identified by its row
41+
* index, of a selected element to a new value.
42+
*
43+
* @param row : the row of the changed property
44+
* @param value : the new value of the property
45+
*/
46+
@objid("ec859bac-8856-4ecd-899a-6b21df6dd192")
47+
void changeProperty(int row, String value);
4748

48-
/**
49-
* This method handles the construction of the property table of a selected element
50-
* @param table : the property table to fulfill
51-
*/
52-
@objid ("e428b814-eb93-407d-a165-cd7885464aa1")
53-
void update(IModulePropertyTable table);
49+
/**
50+
* This method handles the construction of the property table of a selected
51+
* element
52+
*
53+
* @param table : the property table to fulfill
54+
*/
55+
@objid("e428b814-eb93-407d-a165-cd7885464aa1")
56+
void update(IModulePropertyTable table);
5457
}
55-

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

Lines changed: 300 additions & 243 deletions
Large diffs are not rendered by default.

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

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,51 +8,51 @@
88
import org.modelio.metamodel.uml.infrastructure.ModelElement;
99
import org.modelio.vcore.smkernel.mapi.MObject;
1010

11-
@objid ("5635dc32-d607-44ef-bf38-78a08ccba98b")
11+
@objid("5635dc32-d607-44ef-bf38-78a08ccba98b")
1212
public class ToscaPropertyPageHandler extends AbstractModulePropertyPage {
13-
@objid ("f74ce1e1-4019-4519-b1cc-99ce2aa23c8f")
14-
public ToscaPropertyPageHandler(final IModule module, final String name, final String label, final String bitmap) {
15-
super(module, name, label, bitmap);
16-
}
17-
18-
@objid ("89b5f73a-8bd7-4f39-b06a-e0e66d31b574")
19-
@Override
20-
public void update(final List<MObject> selectedElements, final IModulePropertyTable table) {
21-
if ((selectedElements != null) && (selectedElements.size() > 0)
22-
&& (selectedElements.get(0) != null)
23-
&& (selectedElements.get(0) instanceof ModelElement)){
24-
25-
ModelElement selectedElement = ((ModelElement) selectedElements.get(0));
26-
27-
IPropertyContent propertyPage = getPropertyPage(selectedElement);
28-
29-
if (propertyPage != null) {
30-
propertyPage.update(table);
31-
}
32-
}
33-
}
34-
35-
@objid ("5e770529-3f99-4217-bae9-012284fe56df")
36-
@Override
37-
public void changeProperty(final List<MObject> selectedElements, final int row, final String value) {
38-
if ((selectedElements != null) && (selectedElements.size() > 0) && (selectedElements.get(0) instanceof ModelElement)){
39-
ModelElement selectedElement = ((ModelElement) selectedElements.get(0));
40-
41-
IPropertyContent propertyPage = getPropertyPage(selectedElement);
42-
43-
if (propertyPage != null) {
44-
propertyPage.changeProperty(row, value);
45-
}
46-
}
47-
}
48-
49-
@objid ("4a688c5f-1d34-4778-aa11-ca313898aab3")
50-
private IPropertyContent getPropertyPage(ModelElement elt) {
51-
Object result = ToscaDesignerPropertyPageFactory.instantiatePropertyPage(elt);
52-
if (result instanceof IPropertyContent) {
53-
return (IPropertyContent) result;
54-
}
55-
return null;
56-
}
13+
@objid("f74ce1e1-4019-4519-b1cc-99ce2aa23c8f")
14+
public ToscaPropertyPageHandler(final IModule module, final String name, final String label, final String bitmap) {
15+
super(module, name, label, bitmap);
16+
}
17+
18+
@objid("89b5f73a-8bd7-4f39-b06a-e0e66d31b574")
19+
@Override
20+
public void update(final List<MObject> selectedElements, final IModulePropertyTable table) {
21+
if ((selectedElements != null) && (selectedElements.size() > 0) && (selectedElements.get(0) != null)
22+
&& (selectedElements.get(0) instanceof ModelElement)) {
23+
24+
ModelElement selectedElement = ((ModelElement) selectedElements.get(0));
25+
26+
IPropertyContent propertyPage = getPropertyPage(selectedElement);
27+
28+
if (propertyPage != null) {
29+
propertyPage.update(table);
30+
}
31+
}
32+
}
33+
34+
@objid("5e770529-3f99-4217-bae9-012284fe56df")
35+
@Override
36+
public void changeProperty(final List<MObject> selectedElements, final int row, final String value) {
37+
if ((selectedElements != null) && (selectedElements.size() > 0)
38+
&& (selectedElements.get(0) instanceof ModelElement)) {
39+
ModelElement selectedElement = ((ModelElement) selectedElements.get(0));
40+
41+
IPropertyContent propertyPage = getPropertyPage(selectedElement);
42+
43+
if (propertyPage != null) {
44+
propertyPage.changeProperty(row, value);
45+
}
46+
}
47+
}
48+
49+
@objid("4a688c5f-1d34-4778-aa11-ca313898aab3")
50+
private IPropertyContent getPropertyPage(ModelElement elt) {
51+
Object result = ToscaDesignerPropertyPageFactory.instantiatePropertyPage(elt);
52+
if (result instanceof IPropertyContent) {
53+
return (IPropertyContent) result;
54+
}
55+
return null;
56+
}
5757

5858
}

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

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,19 @@
1313
import fr.softeam.toscadesigner.api.tosca.standard.class_.TCapability;
1414
import fr.softeam.toscadesigner.api.tosca.standard.class_.Trigger;
1515

16-
17-
public class CapabilitiesTypePropertyPage <T extends CapabilitiesType> extends ToscaElementPropertyPage<T>{
16+
public class CapabilitiesTypePropertyPage<T extends CapabilitiesType> extends ToscaElementPropertyPage<T> {
1817

1918
public CapabilitiesTypePropertyPage(T elt) {
2019
super(elt);
2120
// TODO Auto-generated constructor stub
2221
}
2322

24-
25-
@Override
26-
public void changeProperty(int row, String value) {
27-
switch (row) {
28-
case 1:
29-
this._element.getElement().setName(value);
30-
break;
23+
@Override
24+
public void changeProperty(int row, String value) {
25+
switch (row) {
26+
case 1:
27+
this._element.getElement().setName(value);
28+
break;
3129
case 2:
3230
Class elt2 = (Class) getModelElt(TCapability.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
3331
if ((elt2 != null)
@@ -39,25 +37,22 @@ public void changeProperty(int row, String value) {
3937
this._element.removeCapability((TCapability) pc);
4038
}
4139
}
42-
break;
43-
}
44-
}
45-
46-
@Override
47-
public void update(IModulePropertyTable table) {
48-
super.update(table);
49-
table.addProperty("Name", _element.getElement().getName());
50-
51-
//Capability
40+
break;
41+
}
42+
}
43+
44+
@Override
45+
public void update(IModulePropertyTable table) {
46+
super.update(table);
47+
table.addProperty("Name", _element.getElement().getName());
48+
49+
// Capability
5250
List<ModelElement> members_elt = extractModelElements(this._element.getCapability());
53-
List<ModelElement> capabilityList = (TCapability.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
51+
List<ModelElement> capabilityList = (TCapability.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
5452
? TCapability.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
55-
: Collections.emptyList();
56-
table.addProperty(
57-
"Capability",
58-
getToscaValue(members_elt),
59-
getAddRemove(capabilityList, extractModelElements(this._element.getCapability()))
60-
);
61-
62-
}
53+
: Collections.emptyList();
54+
table.addProperty("Capability", getToscaValue(members_elt),
55+
getAddRemove(capabilityList, extractModelElements(this._element.getCapability())));
56+
57+
}
6358
}

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
44
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.ImportElement;
55
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
66

7-
@objid ("94f8b8ec-54e8-454c-9e1f-32ca5a0dea62")
7+
@objid("94f8b8ec-54e8-454c-9e1f-32ca5a0dea62")
88
public class ImportElementPropertyPage<T extends ImportElement> extends ToscaElementPropertyPage<T> {
9-
@objid ("eef08305-8700-4461-a3b0-c470c3bf1c5e")
10-
public ImportElementPropertyPage(T elt) {
11-
super(elt);
12-
// TODO Auto-generated constructor stub
13-
}
9+
@objid("eef08305-8700-4461-a3b0-c470c3bf1c5e")
10+
public ImportElementPropertyPage(T elt) {
11+
super(elt);
12+
// TODO Auto-generated constructor stub
13+
}
1414

15-
@objid ("3d9f2e19-eae9-42f6-bd1e-d796ed37a418")
16-
@Override
17-
public void changeProperty(int row, String value) {
18-
switch (row) {
19-
case 1:
20-
this._element.setFile(value);
21-
break;
22-
23-
case 2:
24-
this._element.setNamespace_prefix(value);
25-
break;
26-
27-
case 3:
28-
this._element.setNamespace_uri(value);
29-
break;
30-
}
31-
}
15+
@objid("3d9f2e19-eae9-42f6-bd1e-d796ed37a418")
16+
@Override
17+
public void changeProperty(int row, String value) {
18+
switch (row) {
19+
case 1:
20+
this._element.setFile(value);
21+
break;
3222

33-
@objid ("77a5a715-3493-4ac3-9144-97ca6520ddf7")
34-
@Override
35-
public void update(IModulePropertyTable table) {
36-
super.update(table);
37-
table.addProperty("Name", _element.getElement().getName());
38-
table.addProperty("Namespace Prefix", _element.getNamespace_prefix());
39-
table.addProperty("Namespace Uri", _element.getNamespace_uri());
40-
}
23+
case 2:
24+
this._element.setNamespace_prefix(value);
25+
break;
26+
27+
case 3:
28+
this._element.setNamespace_uri(value);
29+
break;
30+
}
31+
}
32+
33+
@objid("77a5a715-3493-4ac3-9144-97ca6520ddf7")
34+
@Override
35+
public void update(IModulePropertyTable table) {
36+
super.update(table);
37+
table.addProperty("Name", _element.getElement().getName());
38+
table.addProperty("Namespace Prefix", _element.getNamespace_prefix());
39+
table.addProperty("Namespace Uri", _element.getNamespace_uri());
40+
}
4141

4242
}

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

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,35 @@
44
import fr.softeam.toscadesigner.api.tosca.standard.attribute.Metadata;
55
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
66

7-
@objid ("daed0c47-9098-44e5-8818-b0edc0798342")
7+
@objid("daed0c47-9098-44e5-8818-b0edc0798342")
88
public class MetadataPropertyPage<T extends Metadata> extends ToscaElementPropertyPage<T> {
9-
@objid ("99e1297d-9d84-4961-8ed3-eb570b26f595")
10-
public MetadataPropertyPage(T elt) {
11-
super(elt);
12-
// TODO Auto-generated constructor stub
13-
}
9+
@objid("99e1297d-9d84-4961-8ed3-eb570b26f595")
10+
public MetadataPropertyPage(T elt) {
11+
super(elt);
12+
// TODO Auto-generated constructor stub
13+
}
1414

15-
@objid ("68738775-cb8a-4888-b13c-3fc51bebdb41")
16-
@Override
17-
public void changeProperty(int row, String value) {
18-
switch (row) {
19-
case 1:
20-
this._element.getElement().setName(value);;
21-
break;
22-
case 2:
23-
this._element.getElement().setValue(value);
24-
break;
25-
26-
}
27-
}
15+
@objid("68738775-cb8a-4888-b13c-3fc51bebdb41")
16+
@Override
17+
public void changeProperty(int row, String value) {
18+
switch (row) {
19+
case 1:
20+
this._element.getElement().setName(value);
21+
;
22+
break;
23+
case 2:
24+
this._element.getElement().setValue(value);
25+
break;
2826

29-
@objid ("fc930dd6-9b36-4aa8-a092-b0d6400ca528")
30-
@Override
31-
public void update(IModulePropertyTable table) {
32-
super.update(table);
33-
table.addProperty("Name", _element.getElement().getName());
34-
table.addProperty("Value", _element.getElement().getValue());
35-
}
27+
}
28+
}
29+
30+
@objid("fc930dd6-9b36-4aa8-a092-b0d6400ca528")
31+
@Override
32+
public void update(IModulePropertyTable table) {
33+
super.update(table);
34+
table.addProperty("Name", _element.getElement().getName());
35+
table.addProperty("Value", _element.getElement().getValue());
36+
}
3637

3738
}

0 commit comments

Comments
 (0)