Skip to content

Commit 4c73a0a

Browse files
New Trigger stereotype + TPolicy propertypage fix
1 parent 7749d23 commit 4c73a0a

File tree

107 files changed

+2826
-2039
lines changed

Some content is hidden

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

107 files changed

+2826
-2039
lines changed

ToscaDesigner/src/main/conf/module.properties

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,18 @@ propertydefinition.TServiceTemplatePropertyTable.targetNamespace.description=
274274
propertydefinition.TServiceTemplatePropertyTable.targetNamespace.label=targetNamespace
275275
propertydefinition.TargetElementTypePropertyTable.ref.description=
276276
propertydefinition.TargetElementTypePropertyTable.ref.label=ref
277+
propertydefinition.TriggerTable.action.description=
278+
propertydefinition.TriggerTable.action.label=action
279+
propertydefinition.TriggerTable.condition.description=
280+
propertydefinition.TriggerTable.condition.label=condition
281+
propertydefinition.TriggerTable.description.description=
282+
propertydefinition.TriggerTable.description.label=description
283+
propertydefinition.TriggerTable.event.description=
284+
propertydefinition.TriggerTable.event.label=event
285+
propertydefinition.TriggerTable.schedule.description=
286+
propertydefinition.TriggerTable.schedule.label=schedule
287+
propertydefinition.TriggerTable.target_filter.description=
288+
propertydefinition.TriggerTable.target_filter.label=target_filter
277289
propertypage.ToscaPropertyPage.label=ToscaAttributePage
278290
propertytable.ImportElementPropertyTable.label=ImportElementPropertyTable
279291
propertytable.InstanceStateTypeTable.label=InstanceStateTypeTable
@@ -312,6 +324,7 @@ propertytable.TRequirementDefinitionTable.label=TRequirementDefinitionTable
312324
propertytable.TRequirementRefTable.label=TRequirementRefTable
313325
propertytable.TServiceTemplatePropertyTable.label=TServiceTemplatePropertyTable
314326
propertytable.TargetElementTypePropertyTable.label=TargetElementTypePropertyTable
327+
propertytable.TriggerTable.label=TriggerTable
315328
propertytypeDerivedFromType.description=
316329
propertytypeDerivedFromType.label=DerivedFromType
317330
propertytypeDerivedFromType1.description=
@@ -521,6 +534,8 @@ stereotype.ToscaElement.description=
521534
stereotype.ToscaElement.label=ToscaElement
522535
stereotype.ToscaModel.description=
523536
stereotype.ToscaModel.label=ToscaModel
537+
stereotype.Trigger.description=
538+
stereotype.Trigger.label=Trigger
524539

525540
tagtype.Tag.description=
526541
tagtype.Tag.label=anyAttribute

ToscaDesigner/src/main/conf/module.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,36 @@
939939
<Icon path=""/>
940940
<Image path=""/>
941941
</Stereotype>
942+
<Stereotype name="Trigger" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.Trigger.label" uid="d385b57a-f3ae-45f5-90b4-bfc96c3ea0c3" is-abstract="false">
943+
<Icon path="res/icon/gui/Trigger24.ICON.png"/>
944+
<Image path="res/icon/gui/Trigger48.IMAGE.png"/>
945+
<PropertyTable id="TriggerTable" label="%propertytable.TriggerTable.label" uid="79e95ecd-2038-452e-89c3-8fb65ecf1363">
946+
<PropertyDefinition id="description" label="%propertydefinition.TriggerTable.description.label" default-value="" is-editable="true" uid="fac4213e-fedc-4b4a-bb7f-58ded7db4daf">
947+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
948+
<Description>%propertydefinition.TriggerTable.description.description</Description>
949+
</PropertyDefinition>
950+
<PropertyDefinition id="event" label="%propertydefinition.TriggerTable.event.label" default-value="" is-editable="true" uid="f9ac630e-402c-476a-9114-1fcda706a805">
951+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
952+
<Description>%propertydefinition.TriggerTable.event.description</Description>
953+
</PropertyDefinition>
954+
<PropertyDefinition id="schedule" label="%propertydefinition.TriggerTable.schedule.label" default-value="" is-editable="true" uid="55a175de-5780-45b4-9fd8-28f8c398e75c">
955+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
956+
<Description>%propertydefinition.TriggerTable.schedule.description</Description>
957+
</PropertyDefinition>
958+
<PropertyDefinition id="target_filter" label="%propertydefinition.TriggerTable.target_filter.label" default-value="" is-editable="true" uid="95dcbcf5-84f5-40ff-9f03-c137f73d52ab">
959+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
960+
<Description>%propertydefinition.TriggerTable.target_filter.description</Description>
961+
</PropertyDefinition>
962+
<PropertyDefinition id="condition" label="%propertydefinition.TriggerTable.condition.label" default-value="" is-editable="true" uid="b1c6b620-7693-44b5-93a6-42b2442efac0">
963+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
964+
<Description>%propertydefinition.TriggerTable.condition.description</Description>
965+
</PropertyDefinition>
966+
<PropertyDefinition id="action" label="%propertydefinition.TriggerTable.action.label" default-value="" is-editable="true" uid="6efd2a53-9853-45db-88d1-ba94ff7ce87b">
967+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
968+
<Description>%propertydefinition.TriggerTable.action.description</Description>
969+
</PropertyDefinition>
970+
</PropertyTable>
971+
</Stereotype>
942972
</Profile>
943973
</Profiles>
944974
<PropertyTypes>

ToscaDesigner/src/main/conf/module_fr.properties

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,18 @@ propertydefinition.TServiceTemplatePropertyTable.targetNamespace.description=
274274
propertydefinition.TServiceTemplatePropertyTable.targetNamespace.label=targetNamespace
275275
propertydefinition.TargetElementTypePropertyTable.ref.description=
276276
propertydefinition.TargetElementTypePropertyTable.ref.label=ref
277+
propertydefinition.TriggerTable.action.description=
278+
propertydefinition.TriggerTable.action.label=action
279+
propertydefinition.TriggerTable.condition.description=
280+
propertydefinition.TriggerTable.condition.label=condition
281+
propertydefinition.TriggerTable.description.description=
282+
propertydefinition.TriggerTable.description.label=description
283+
propertydefinition.TriggerTable.event.description=
284+
propertydefinition.TriggerTable.event.label=event
285+
propertydefinition.TriggerTable.schedule.description=
286+
propertydefinition.TriggerTable.schedule.label=schedule
287+
propertydefinition.TriggerTable.target_filter.description=
288+
propertydefinition.TriggerTable.target_filter.label=target_filter
277289
propertypage.ToscaPropertyPage.label=ToscaAttributePage
278290
propertytable.ImportElementPropertyTable.label=ImportElementPropertyTable
279291
propertytable.InstanceStateTypeTable.label=InstanceStateTypeTable
@@ -312,6 +324,7 @@ propertytable.TRequirementDefinitionTable.label=TRequirementDefinitionTable
312324
propertytable.TRequirementRefTable.label=TRequirementRefTable
313325
propertytable.TServiceTemplatePropertyTable.label=TServiceTemplatePropertyTable
314326
propertytable.TargetElementTypePropertyTable.label=TargetElementTypePropertyTable
327+
propertytable.TriggerTable.label=TriggerTable
315328
propertytypeDerivedFromType.description=
316329
propertytypeDerivedFromType.label=DerivedFromType
317330
propertytypeDerivedFromType1.description=
@@ -521,6 +534,8 @@ stereotype.ToscaElement.description=
521534
stereotype.ToscaElement.label=ToscaElement
522535
stereotype.ToscaModel.description=
523536
stereotype.ToscaModel.label=ToscaModel
537+
stereotype.Trigger.description=
538+
stereotype.Trigger.label=Trigger
524539

525540
tagtype.Tag.description=
526541
tagtype.Tag.label=targetNamespace
261 Bytes
Loading
799 Bytes
Loading
439 Bytes
Loading
1.44 KB
Loading
Lines changed: 54 additions & 0 deletions
Loading
3.42 KB
Binary file not shown.

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

Lines changed: 21 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 07/01/2025 11:20 by Modelio Studio.
5+
* This file was generated on 07/01/2025 15:23 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -120,20 +120,21 @@
120120
* <li><< TargetInterfacesType >> on a {@link org.modelio.metamodel.uml.infrastructure.ModelElement}: instantiates a {@link TargetInterfacesType}
121121
* <li><< ToscaElement >> on a {@link org.modelio.metamodel.uml.infrastructure.ModelElement}: instantiates a {@link ToscaElement}
122122
* <li><< ToscaModel >> on a {@link org.modelio.metamodel.uml.statik.Package}: instantiates a {@link ToscaModel}
123+
* <li><< Trigger >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link Trigger}
123124
* </ul>
124125
*/
125126
@objid ("f96166f4-8706-4930-8397-6424c7b3f767")
126127
public class ToscaDesignerProxyFactory {
127-
@objid ("4330456d-3d80-452f-87b1-b69b2ba89041")
128+
@objid ("f40867d1-5392-46a1-bcee-9b4e41d2bf50")
128129
private static final String ASSETNAME = "ToscaDesigner";
129130

130-
@objid ("372f63f0-742d-4b31-9376-f2ec682f0fb4")
131+
@objid ("32aea79e-b99a-42a4-9618-a36bd9fe2d0a")
131132
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
132133

133134
/**
134135
* @param session The modeling session this factory is operating in.
135136
*/
136-
@objid ("800ea008-6684-40a4-a430-07d0186a0a12")
137+
@objid ("da6d1fb5-d31d-4cab-9929-5de8dfc87372")
137138
public static final void initialize(final IModelingSession session) throws MdaProxyException {
138139
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.MdaTypes.init(session);
139140
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.MdaTypes.init(session);
@@ -226,6 +227,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
226227
fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TargetInterfacesType.MdaTypes.init(session);
227228
fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.ToscaElement.MdaTypes.init(session);
228229
fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.MdaTypes.init(session);
230+
fr.softeam.toscadesigner.api.tosca.standard.class_.Trigger.MdaTypes.init(session);
229231

230232
}
231233

@@ -237,7 +239,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
237239
* @param e A model element
238240
* @return the right proxy or <i>null</i>.
239241
*/
240-
@objid ("607ba513-5159-4e78-8b86-f0a28d6c1d91")
242+
@objid ("8b742d7c-6d3d-4683-9419-37967116cfac")
241243
public static final Object instantiate(final ModelElement e) {
242244
for (Stereotype s : e.getExtension()) {
243245
ModuleComponent module = s.getModule();
@@ -257,23 +259,23 @@ public static final Object instantiate(final ModelElement e) {
257259
* @param stName A stereotype name.
258260
* @return the right proxy or <i>null</i>.
259261
*/
260-
@objid ("5bb90844-073d-49e6-8190-de6b104a2260")
262+
@objid ("29d001f8-23b7-4e1f-8094-622c9d0e10b9")
261263
public static final Object instantiate(final Element e, final String stName) {
262264
instantiateVisitor.setStereotype(stName);
263265
return e.accept(instantiateVisitor);
264266
}
265267

266-
@objid ("8e8834ad-d060-487c-aac9-3485cbe23345")
268+
@objid ("10ed7da7-acfa-477a-841f-f2c3829a289b")
267269
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
268-
@objid ("ced2b08c-cbd4-4051-ab38-12f922216d1e")
270+
@objid ("cbd3c980-67cf-4e64-b9fe-7a322dd8bcde")
269271
private String stName;
270272

271-
@objid ("dbfc34ce-4dea-419d-80f2-99936eac8dcb")
273+
@objid ("6dc2c439-24d4-43aa-ae95-b6009719e215")
272274
public final void setStereotype(final String stName) {
273275
this.stName = stName;
274276
}
275277

276-
@objid ("c4731fbf-e530-4b21-a4ad-cbd322f5109c")
278+
@objid ("6420aa89-5577-4edb-aaf0-f734dba62bbc")
277279
@Override
278280
public final Object visitAssociation(Association obj) {
279281
switch (this.stName) {
@@ -286,7 +288,7 @@ public final Object visitAssociation(Association obj) {
286288

287289
}
288290

289-
@objid ("a2b7bef5-b373-4558-b159-43fd9dddef3c")
291+
@objid ("cf2e0454-93dc-49c6-aea0-6ff805a64ff9")
290292
@Override
291293
public final Object visitAttribute(Attribute obj) {
292294
switch (this.stName) {
@@ -302,7 +304,7 @@ public final Object visitAttribute(Attribute obj) {
302304

303305
}
304306

305-
@objid ("ecdd040b-a6a9-4252-b178-9611932026d3")
307+
@objid ("4f22e977-d2b9-43b2-b0bd-7ebdf23c52ac")
306308
@Override
307309
public final Object visitPackage(Package obj) {
308310
switch (this.stName) {
@@ -318,7 +320,7 @@ public final Object visitPackage(Package obj) {
318320

319321
}
320322

321-
@objid ("673cb93e-ca24-4e55-8f00-a3db1794f2fc")
323+
@objid ("e06f2bae-56a0-4eb7-823d-38f93460c9d1")
322324
@Override
323325
public final Object visitAssociationEnd(AssociationEnd obj) {
324326
switch (this.stName) {
@@ -331,7 +333,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
331333

332334
}
333335

334-
@objid ("570f9318-9068-4a8c-986a-843dfb8625e8")
336+
@objid ("01983f2f-d133-4ca1-ae7a-004927dda328")
335337
@Override
336338
public final Object visitDataType(DataType obj) {
337339
switch (this.stName) {
@@ -345,7 +347,7 @@ public final Object visitDataType(DataType obj) {
345347

346348
}
347349

348-
@objid ("284a24c3-e38d-49fe-af1a-a83071432d43")
350+
@objid ("0a47aeb7-9e95-4b6e-b3b0-b9c3e5307971")
349351
@Override
350352
public final Object visitClass(Class obj) {
351353
switch (this.stName) {
@@ -374,6 +376,7 @@ public final Object visitClass(Class obj) {
374376
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition.instantiate(obj);
375377
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinitionType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinitionType.instantiate(obj);
376378
case fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyElementInstanceStates.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyElementInstanceStates.instantiate(obj);
379+
case fr.softeam.toscadesigner.api.tosca.standard.class_.Trigger.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.Trigger.instantiate(obj);
377380
default:
378381
break;
379382
}
@@ -382,7 +385,7 @@ public final Object visitClass(Class obj) {
382385

383386
}
384387

385-
@objid ("3438f68e-9bb7-4a2a-9fbc-34b9d75ed9ce")
388+
@objid ("be71b7d6-ffad-4b1f-a2b6-3467fd527f97")
386389
@Override
387390
public final Object visitStaticDiagram(StaticDiagram obj) {
388391
switch (this.stName) {
@@ -397,7 +400,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
397400

398401
}
399402

400-
@objid ("5cfb9aef-7533-46cb-8f43-fc14f73acbaf")
403+
@objid ("6737f0b6-612d-49a9-bbe0-8ffb5a929e01")
401404
@Override
402405
public final Object visitModelElement(ModelElement obj) {
403406
switch (this.stName) {
@@ -465,7 +468,7 @@ public final Object visitModelElement(ModelElement obj) {
465468
* <p>If null is returned the caller will return null.
466469
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
467470
*/
468-
@objid ("0d373d19-4ebd-4c09-8e0e-9eb223a860f7")
471+
@objid ("abb5087d-fc56-47eb-9977-c8b8f481c334")
469472
@Override
470473
public IInfrastructureVisitor getInfrastructureVisitor() {
471474
return this;

0 commit comments

Comments
 (0)