Skip to content

Commit b32edbe

Browse files
Policy property page not showing fix
1 parent 92a619d commit b32edbe

File tree

5 files changed

+28
-16
lines changed

5 files changed

+28
-16
lines changed

ToscaDesigner/src/main/conf/module.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ propertydefinition.PropertiesType1Table.any.description=
6161
propertydefinition.PropertiesType1Table.any.label=any
6262
propertydefinition.PropertiesType1Table.propertyMappings.description=
6363
propertydefinition.PropertiesType1Table.propertyMappings.label=propertyMappings
64+
propertydefinition.PropertyDefinitionTypeTable.PropertyTypeDefinition3.description=
65+
propertydefinition.PropertyDefinitionTypeTable.PropertyTypeDefinition3.label=PropertyTypeDefinition3
6466
propertydefinition.PropertyDefinitionTypeTable.description.description=
6567
propertydefinition.PropertyDefinitionTypeTable.description.label=description
6668
propertydefinition.PropertyDefinitionTypeTable.required.description=
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package fr.softeam.toscadesigner.api;
2+
3+
import java.util.ArrayList;
4+
import java.util.List;
5+
6+
import org.modelio.metamodel.uml.infrastructure.ModelElement;
7+
import org.modelio.metamodel.uml.statik.DataType;
8+
9+
public class ToscaDesignerAbstractProxy {
10+
11+
public static List<ModelElement> getDataTypes() {
12+
List<ModelElement> result = new ArrayList<>();
13+
14+
15+
return result;
16+
}
17+
}

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.modeliosoft.modelio.javadesigner.annotations.objid;
44
import fr.softeam.toscadesigner.api.tosca.standard.attribute.PropertyDefinitionType;
55
import org.modelio.api.module.propertiesPage.IModulePropertyTable;
6+
import org.modelio.metamodel.uml.statik.GeneralClass;
67

78
@objid ("a3b5d0b2-7de4-4957-810a-595d7066797d")
89
public class PropertyDefinitionTypePropertyPage<T extends PropertyDefinitionType> extends ToscaElementPropertyPage<T> {
@@ -21,7 +22,7 @@ public void changeProperty(int row, String value) {
2122
break;
2223

2324
case 2:
24-
this._element.getElement().setValue(value);
25+
//this._element.getElement().setType(TypeFactory.);
2526
break;
2627
case 3:
2728
this._element.setDescription(value);
@@ -43,19 +44,6 @@ public void update(IModulePropertyTable table) {
4344
table.addProperty("Required", _element.getRequired());
4445
}
4546

46-
@objid ("915258a4-5b23-4051-bc26-e761c29f2c6f")
47-
enum PrimitiveType {
48-
@objid ("77454dff-3ad4-4093-87ce-f70b78654b34")
49-
IntType,
50-
@objid ("6443c68e-9de1-4584-b551-a0fd09f2aa25")
51-
StringType,
52-
@objid ("2f91d615-9fc1-4abd-a71a-a54825f4dabe")
53-
BooleanType,
54-
@objid ("012dedda-c9f4-4986-9e79-f35c041e322e")
55-
FloatType,
56-
@objid ("9feb232d-e11f-46e0-9726-d5ce37f4174e")
57-
DoubleType;
58-
59-
}
47+
6048

6149
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public void update(IModulePropertyTable table) {
7070
table.addProperty("Notifications", _element.getNotifications());
7171

7272
// Operations
73+
7374
List<ModelElement> members_elt = extractModelElements(this._element.getOperation());
7475
List<ModelElement> operationsList = (TOperation.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
7576
? TOperation.MdaTypes.STEREOTYPE_ELT.getExtendedElement()

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ protected String[] getAddRemove(List<ModelElement> allElt, List<? extends ModelE
127127
@objid ("ac7eb6c0-cb5e-4daf-b518-1c8946b4d8e8")
128128
protected String getToscaValue(List<? extends ModelElement> elts) {
129129
String result = "";
130+
if (elts!=null) {
130131
Iterator<? extends ModelElement> it = elts.iterator();
131132

132133
if (it.hasNext()) {
@@ -136,8 +137,11 @@ protected String getToscaValue(List<? extends ModelElement> elts) {
136137
while (it.hasNext()) {
137138
result += this._eltSeparator + getToscaName(it.next());
138139
}
140+
}
139141
return result;
140142
}
143+
144+
141145

142146
@objid ("18768d2d-a3f7-4f9c-8ce4-758b26c49d07")
143147
protected ModelElement getToscalElt(List<? extends ModelElement> elts, String toscaName) {
@@ -166,7 +170,7 @@ public static <T> List<ModelElement> extractModelElements(List<T> members) {
166170
}
167171
return members_elt;
168172
}
169-
173+
170174
@objid ("7abe5676-a085-4685-be19-0288c928a683")
171175
public static <T> List<Attribute> extractAttributes(List<T> members) {
172176
List<Attribute> members_elt = new ArrayList<>();

0 commit comments

Comments
 (0)