Skip to content

Commit 1b3c9f2

Browse files
TNode template property page added
1 parent 6d098e5 commit 1b3c9f2

File tree

62 files changed

+794
-579
lines changed

Some content is hidden

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

62 files changed

+794
-579
lines changed

ToscaDesigner/src/main/conf/module.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ profile.Automatic.label=Automatic
2727
profile.Tosca.description=
2828
profile.Tosca.label=Tosca
2929

30-
stereotype.ArtifactTemplate.description=
31-
stereotype.ArtifactTemplate.label=Artifact Template
3230
stereotype.CapabilitiesType.description=
3331
stereotype.CapabilitiesType.label=CapabilitiesType
3432
stereotype.CloudServiceArchiveDiagram.description=
@@ -96,6 +94,8 @@ stereotype.TopologyTemplateDiagram.label=TopologyTemplateDiagram
9694
stereotype.ToscaModel.description=
9795
stereotype.ToscaModel.label=ToscaModel
9896

97+
tagtype.name.description=
98+
tagtype.name.label=name
9999
tool.ArtifactTemplate.label=ArtifactTemplate
100100
tool.ArtifactTemplate.tooltip=Create an artifact Template
101101
tool.NodeTemplate.label=NodeTemplate

ToscaDesigner/src/main/conf/module.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
</ClassPath>
66
<Profiles>
77
<Profile uid="ad7bd07a-f96b-47fb-8f5c-d62d9086f93f" id="Tosca">
8-
<Stereotype name="ArtifactTemplate" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.ArtifactTemplate.label" uid="9470b61d-47b8-455e-9d73-1119e307cdcc" is-abstract="false">
9-
<Icon path="res/icon/gui/artifact_template24.png"/>
10-
<Image path="res/icon/gui/artifact_template48.png"/>
11-
</Stereotype>
128
<Stereotype name="CapabilitiesType" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.CapabilitiesType.label" uid="03d159c3-b62b-497f-9176-c5137b4cb33d" is-abstract="false">
139
<Icon path=""/>
1410
<Image path=""/>
@@ -84,6 +80,9 @@
8480
<Stereotype name="TNodeTemplate" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TNodeTemplate.label" uid="1a20bf91-0a92-434a-9d1f-35c86788784e" is-abstract="false">
8581
<Icon path="res/icon/gui/node_template24.png"/>
8682
<Image path="res/icon/gui/node_template48.png"/>
83+
<TagTypes>
84+
<TagType name="name" uid="39d7794d-5063-4947-87a6-f943deb91b5d" label="%tagtype.name.label" parameter-card="1" is-hidden="false" is-signed="false"/>
85+
</TagTypes>
8786
</Stereotype>
8887
<Stereotype name="TNodeType" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TNodeType.label" uid="47cdd09e-013d-4670-b757-f5736d2bb48c" is-abstract="false">
8988
<Icon path="res/icon/gui/node_type24.png"/>
@@ -246,7 +245,6 @@
246245
<Tool id="ArtifactTemplate" label="%tool.ArtifactTemplate.label" tooltip="%tool.ArtifactTemplate.tooltip" image="res/icon/gui/artifact_template24.png">
247246
<Scope-source metaclass="Standard.Package" stereotype=""/>
248247
<Handler class="Box">
249-
<HParameter name="stereotype" value="ToscaDesigner#ArtifactTemplate"/>
250248
<HParameter name="metaclass" value="Standard.Class"/>
251249
<HParameter name="name" value="Artifact Template"/>
252250
</Handler>

ToscaDesigner/src/main/conf/module_fr.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ profile.Automatic.label=Automatic
2727
profile.Tosca.description=
2828
profile.Tosca.label=Tosca
2929

30-
stereotype.ArtifactTemplate.description=
31-
stereotype.ArtifactTemplate.label=ArtifactTemplate
3230
stereotype.CapabilitiesType.description=
3331
stereotype.CapabilitiesType.label=CapabilitiesType
3432
stereotype.CloudServiceArchiveDiagram.description=
@@ -96,6 +94,8 @@ stereotype.TopologyTemplateDiagram.label=TopologyTemplateDiagram
9694
stereotype.ToscaModel.description=
9795
stereotype.ToscaModel.label=ToscaModel
9896

97+
tagtype.name.description=
98+
tagtype.name.label=name
9999
tool.ArtifactTemplate.label=ArtifactTemplate
100100
tool.ArtifactTemplate.tooltip=
101101
tool.NodeTemplate.label=NodeTemplate
-530 Bytes
Binary file not shown.

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/ToscaDesignerProxyFactory.java

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: GENERATED FILE - DO NOT EDIT
33
* Module: ToscaDesigner v0.0.00
44
5-
* This file was generated on 08/03/2024 09:55 by Modelio Studio.
5+
* This file was generated on 20/03/2024 15:20 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -25,8 +25,7 @@
2525
* <h2>Module description:</h2>
2626
* <br/><i>null</i></p>
2727
* <h2>Supported stereotypes:</h2>
28-
* <ul><li><< ArtifactTemplate >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link ArtifactTemplate}
29-
* <li><< CapabilitiesType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link CapabilitiesType}
28+
* <ul><li><< CapabilitiesType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link CapabilitiesType}
3029
* <li><< CapabilityDefinitionsType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link CapabilityDefinitionsType}
3130
* <li><< ConstraintsType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link ConstraintsType}
3231
* <li><< InstanceStateType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link InstanceStateType}
@@ -63,18 +62,17 @@
6362
*/
6463
@objid ("365cd17d-2d04-4020-839d-7e7bdefdf43f")
6564
public class ToscaDesignerProxyFactory {
66-
@objid ("716c6fce-0d5f-469a-aaf5-bdc92cec1c88")
65+
@objid ("e19126bf-a2ee-4bb4-b584-cd71144baef7")
6766
private static final String ASSETNAME = "ToscaDesigner";
6867

69-
@objid ("cc3db72f-6cf5-40dd-a9aa-26302b93b266")
68+
@objid ("e44f2944-664b-4f8b-877d-186d873bf90c")
7069
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
7170

7271
/**
7372
* @param session The modeling session this factory is operating in.
7473
*/
75-
@objid ("4423cbcf-44fe-45b2-a98d-7ab590cfca53")
74+
@objid ("81673ce3-a0e1-4038-b698-392c3eacb4f8")
7675
public static final void initialize(final IModelingSession session) throws MdaProxyException {
77-
fr.softeam.toscadesigner.api.tosca.standard.class_.ArtifactTemplate.MdaTypes.init(session);
7876
fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilitiesType.MdaTypes.init(session);
7977
fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityDefinitionsType.MdaTypes.init(session);
8078
fr.softeam.toscadesigner.api.tosca.standard.class_.ConstraintsType.MdaTypes.init(session);
@@ -119,7 +117,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
119117
* @param e A model element
120118
* @return the right proxy or <i>null</i>.
121119
*/
122-
@objid ("615529d6-370e-46b2-ac8c-9110d23f23e2")
120+
@objid ("631f08d3-c780-4420-8626-e502a45073bf")
123121
public static final Object instantiate(final ModelElement e) {
124122
for (Stereotype s : e.getExtension()) {
125123
ModuleComponent module = s.getModule();
@@ -139,23 +137,23 @@ public static final Object instantiate(final ModelElement e) {
139137
* @param stName A stereotype name.
140138
* @return the right proxy or <i>null</i>.
141139
*/
142-
@objid ("63d4888e-3356-4cc1-a0ca-b11e36213183")
140+
@objid ("f63e9f6d-0c32-44ac-a190-055209abf9e9")
143141
public static final Object instantiate(final Element e, final String stName) {
144142
instantiateVisitor.setStereotype(stName);
145143
return e.accept(instantiateVisitor);
146144
}
147145

148-
@objid ("debac363-8f6a-4f01-b4d9-2e0d218354ff")
146+
@objid ("b8d4736e-8836-48b9-bf47-92aec088a65e")
149147
private static class InstantiateVisitor implements IDefaultModelVisitor {
150-
@objid ("47a91884-5548-405e-be6e-132fe14d6b52")
148+
@objid ("6a36ba54-52ed-431b-9376-7f31072b1810")
151149
private String stName;
152150

153-
@objid ("17259c67-4ade-43ef-8fa5-2b8909782888")
151+
@objid ("095042b2-c4b7-47cc-bc45-6521f0a5a52d")
154152
public final void setStereotype(final String stName) {
155153
this.stName = stName;
156154
}
157155

158-
@objid ("d5cc1b4b-f7c1-4152-94aa-a69111ef8df2")
156+
@objid ("0ff535dc-ebd9-4653-a5e1-c8ab8326fa5d")
159157
@Override
160158
public final Object visitPackage(Package obj) {
161159
switch (this.stName) {
@@ -168,7 +166,7 @@ public final Object visitPackage(Package obj) {
168166

169167
}
170168

171-
@objid ("e3ddc2a6-85b3-49d9-9a16-b5246620d8a5")
169+
@objid ("5862c2a2-b984-4780-9df5-718589d94c39")
172170
@Override
173171
public final Object visitDataType(DataType obj) {
174172
switch (this.stName) {
@@ -183,11 +181,10 @@ public final Object visitDataType(DataType obj) {
183181

184182
}
185183

186-
@objid ("807ae560-f337-4272-9b53-ecc5eb8ebc7c")
184+
@objid ("4f75772a-1b44-47c9-9121-5a4355c0aa7e")
187185
@Override
188186
public final Object visitClass(Class obj) {
189187
switch (this.stName) {
190-
case fr.softeam.toscadesigner.api.tosca.standard.class_.ArtifactTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.ArtifactTemplate.instantiate(obj);
191188
case fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilitiesType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilitiesType.instantiate(obj);
192189
case fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityDefinitionsType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityDefinitionsType.instantiate(obj);
193190
case fr.softeam.toscadesigner.api.tosca.standard.class_.ConstraintsType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.ConstraintsType.instantiate(obj);
@@ -222,7 +219,7 @@ public final Object visitClass(Class obj) {
222219

223220
}
224221

225-
@objid ("c635b414-dd38-4f86-aba1-b0ea64935785")
222+
@objid ("ba85cf3d-a564-4e8f-8732-bdebf58957cf")
226223
@Override
227224
public final Object visitStaticDiagram(StaticDiagram obj) {
228225
switch (this.stName) {
@@ -242,7 +239,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
242239
* <p>If null is returned the caller will return null.
243240
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
244241
*/
245-
@objid ("bfae3266-80eb-4473-b85c-f6fe990c2f7b")
242+
@objid ("f1f9f2d8-d861-4f3b-8edd-8f77b728da0c")
246243
@Override
247244
public IInfrastructureVisitor getInfrastructureVisitor() {
248245
return null;

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/automatic/standard/staticdiagram/CloudServiceArchiveDiagram.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: GENERATED FILE - DO NOT EDIT
33
* Module: ToscaDesigner v0.0.00
44
5-
* This file was generated on 08/03/2024 09:55 by Modelio Studio.
5+
* This file was generated on 20/03/2024 15:20 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api.automatic.standard.staticdiagram;
88

@@ -40,13 +40,13 @@
4040
*/
4141
@objid ("14644635-a422-47d2-a521-6f92f8f4c732")
4242
public class CloudServiceArchiveDiagram implements IMdaProxy {
43-
@objid ("38e5ca3d-095d-4586-85ac-e9e550108ccc")
43+
@objid ("dff07a2f-80ff-4d8f-8d58-eacf15a06051")
4444
public static final String STEREOTYPE_NAME = "CloudServiceArchiveDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("7d885672-d281-4aa3-b766-a32570d7a192")
49+
@objid ("92a0532d-a506-4ea4-94a6-557221829497")
5050
protected final StaticDiagram elt;
5151

5252
/**
@@ -56,7 +56,7 @@ public class CloudServiceArchiveDiagram implements IMdaProxy {
5656
* @param elt a model object
5757
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
5858
*/
59-
@objid ("6c0eb1c0-3f57-42ef-99b5-7a4fdb596985")
59+
@objid ("6762ed4c-2841-4707-8569-19e7ca043869")
6060
public static boolean canInstantiate(final MObject elt) {
6161
return ((elt instanceof StaticDiagram) && (CloudServiceArchiveDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(CloudServiceArchiveDiagram.MdaTypes.STEREOTYPE_ELT));
6262
}
@@ -66,7 +66,7 @@ public static boolean canInstantiate(final MObject elt) {
6666
*
6767
* @return a {@link CloudServiceArchiveDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("bd440755-340d-494c-b923-11bff180309a")
69+
@objid ("ed6f4d79-0202-42d9-a741-fc2b4393d628")
7070
public static CloudServiceArchiveDiagram create(final IModelingSession session) {
7171
ModelElement e = (ModelElement)session.getModel().createElement("Standard.StaticDiagram");
7272
e.getExtension().add(CloudServiceArchiveDiagram.MdaTypes.STEREOTYPE_ELT);
@@ -80,7 +80,7 @@ public static CloudServiceArchiveDiagram create(final IModelingSession session)
8080
* @param obj a StaticDiagram
8181
* @return a {@link CloudServiceArchiveDiagram} proxy or <i>null</i>.
8282
*/
83-
@objid ("d7f032d7-961d-4e99-8942-b8a7517b0292")
83+
@objid ("f54483e2-c803-495a-871b-da65ae01c043")
8484
public static CloudServiceArchiveDiagram instantiate(final StaticDiagram obj) {
8585
return CloudServiceArchiveDiagram.canInstantiate(obj) ? new CloudServiceArchiveDiagram(obj) : null;
8686
}
@@ -93,15 +93,15 @@ public static CloudServiceArchiveDiagram instantiate(final StaticDiagram obj) {
9393
* @return a {@link CloudServiceArchiveDiagram} proxy.
9494
* @throws IllegalArgumentException if the instantiation cannot be carried out.
9595
*/
96-
@objid ("b2e8cba9-7d57-41e6-8034-27309d480d3d")
96+
@objid ("62a2be7f-7677-45d3-aa7b-762c3198d4d5")
9797
public static CloudServiceArchiveDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
9898
if (CloudServiceArchiveDiagram.canInstantiate(obj))
9999
return new CloudServiceArchiveDiagram(obj);
100100
else
101101
throw new IllegalArgumentException("CloudServiceArchiveDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
102102
}
103103

104-
@objid ("c71489ab-7bea-46da-9bd8-142af7d659c1")
104+
@objid ("d02d1e17-9ce5-41f5-9ec9-b034a5341a84")
105105
@Override
106106
public boolean equals(final Object obj) {
107107
if (this == obj) {
@@ -121,35 +121,35 @@ public boolean equals(final Object obj) {
121121
* Get the underlying {@link StaticDiagram}.
122122
* @return the StaticDiagram represented by this proxy, never null.
123123
*/
124-
@objid ("38c1100e-a301-4ceb-89cd-87a296377e9a")
124+
@objid ("e1462df2-a6f2-4d76-b689-0b3b9a331249")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("f57eb47b-8313-41e2-8447-3981d4acc6ea")
129+
@objid ("0c272180-4d50-4084-803b-2b58df39b7ac")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("ba538d0e-8fd3-43ea-86ce-323af1318fa8")
136+
@objid ("ddac18ec-1afd-420d-92bf-c04c91fec513")
137137
protected CloudServiceArchiveDiagram(final StaticDiagram elt) {
138138
this.elt = elt;
139139
}
140140

141141
@objid ("f9b8aa63-12e2-456c-a0b9-3c670d965b7a")
142142
public static final class MdaTypes {
143-
@objid ("fdc78662-4db3-46fa-89f5-93ebccda7f97")
143+
@objid ("650d34d4-26fd-4312-9cb6-bda480230c08")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("bc020302-0797-47c3-8ab5-95d5bd463663")
146+
@objid ("5a772397-07a9-49e2-92b2-bb6c1b96e235")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("2551386c-02b3-41ea-b5cf-b92aae341d81")
149+
@objid ("daebf115-8c41-40b0-a511-0c903117e11c")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("2598e422-b947-4a15-a30a-8a013fc8b44f")
152+
@objid ("2d2044a6-1e6d-4921-ad78-65d32fe0fbac")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)