Skip to content

Commit 7ee506c

Browse files
etiennebrosseetiennebrosse
committed
migrate to Modelio 4.1
1 parent 3a46324 commit 7ee506c

File tree

63 files changed

+14
-878
lines changed

Some content is hidden

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

63 files changed

+14
-878
lines changed

‎src/main/conf/module.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<Commands>
169169
<Command id="Test_Case" label="%command.Test_Case.label" tooltip="%command.Test_Case.tooltip" image="res/icon/gui/testcase.png" modify-model="true">
170170
<Scope metaclass="Standard.Classifier" stereotype="UTP#TestContext"/>
171-
<Handler class="org.modelio.module.utp.commands.AddTestCase"/>
171+
<Handler class="org.modelio.module.utp.commands.CreateTestCase"/>
172172
</Command>
173173
<Command id="SUT" label="%command.SUT.label" tooltip="%command.SUT.tooltip" image="res/icon/gui/sut.png" modify-model="true">
174174
<Scope metaclass="Standard.BindableInstance" stereotype=""/>

‎src/main/conf/res/ramc/UTP.ramc‎

795 Bytes
Binary file not shown.

‎src/main/java/org/modelio/module/utp/api/IUTPPeerModule.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package org.modelio.module.utp.api;
22

3-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
43
import org.modelio.api.module.IPeerModule;
54

6-
@objid ("6cdd2847-9b53-4b09-930d-64b77ba89918")
75
public interface IUTPPeerModule extends IPeerModule {
8-
@objid ("70f2a8bb-f47d-4511-bd9c-abadf581d12f")
96
public static final String MODULE_NAME = "UTP";
107

118
}

‎src/main/java/org/modelio/module/utp/api/UTPNoteTypes.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.modelio.module.utp.api;
22

3-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
43

5-
@objid ("fad4cc74-abad-4bc0-9d5f-e0e6da7fe21f")
64
public interface UTPNoteTypes {
75
}

‎src/main/java/org/modelio/module/utp/api/UTPParameters.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.modelio.module.utp.api;
22

3-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
43

5-
@objid ("f3af28d9-e159-4145-b0b8-5badcd6755fc")
64
public interface UTPParameters {
75
}

‎src/main/java/org/modelio/module/utp/api/UTPProxyFactory.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
package org.modelio.module.utp.api;
88

9-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
109
import org.modelio.metamodel.mda.ModuleComponent;
1110
import org.modelio.metamodel.uml.behavior.activityModel.ActivityAction;
1211
import org.modelio.metamodel.uml.behavior.activityModel.CallOperationAction;
@@ -74,9 +73,7 @@
7473
* <li><< ValidationAction_CallOperationAction >> on a {@link org.modelio.metamodel.uml.behavior.activityModel.CallOperationAction}: instantiates a {@link ValidationActionCallOperationAction}
7574
* </ul>
7675
*/
77-
@objid ("b350fe0a-1546-4ef4-aeea-e0da0af9fc60")
7876
public class UTPProxyFactory {
79-
@objid ("bd0cf975-629f-467d-80eb-d39ded73238e")
8077
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
8178

8279
/**
@@ -88,7 +85,6 @@ public class UTPProxyFactory {
8885
* @param e A model element
8986
* @return the right proxy or <i>null</i>.
9087
*/
91-
@objid ("9a37eda7-5216-4e8d-8851-e3c5d9df9ff5")
9288
public static final Object instantiate(final ModelElement e) {
9389
for (Stereotype s : e.getExtension()) {
9490
ModuleComponent module = s.getModule();
@@ -109,23 +105,18 @@ public static final Object instantiate(final ModelElement e) {
109105
* @param stName A stereotype name.
110106
* @return the right proxy or <i>null</i>.
111107
*/
112-
@objid ("fc4c43e7-827c-4c40-9ce6-76ad87779123")
113108
public static final Object instantiate(final Element e, final String stName) {
114109
instantiateVisitor.setStereotype(stName);
115110
return e.accept(instantiateVisitor);
116111
}
117112

118-
@objid ("d0c9d5de-5b86-48c1-9f69-48687b7f4be9")
119113
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
120-
@objid ("86b39858-fa4f-46c9-8e08-1adce21cd93b")
121114
private String stName;
122115

123-
@objid ("eab41589-395e-4d47-b124-e51e0f7f9b0c")
124116
public final void setStereotype(final String stName) {
125117
this.stName = stName;
126118
}
127119

128-
@objid ("32f7bc4e-67a3-4445-9e74-0c2f7888e95d")
129120
@Override
130121
public final Object visitBehavior(Behavior obj) {
131122
switch (this.stName) {
@@ -139,7 +130,6 @@ public final Object visitBehavior(Behavior obj) {
139130
return IDefaultModelVisitor.super.visitBehavior(obj);
140131
}
141132

142-
@objid ("d3cad9a0-4410-498f-9ac6-e6ddf81bb817")
143133
@Override
144134
public final Object visitDependency(Dependency obj) {
145135
switch (this.stName) {
@@ -153,7 +143,6 @@ public final Object visitDependency(Dependency obj) {
153143
return IDefaultInfrastructureVisitor.super.visitDependency(obj);
154144
}
155145

156-
@objid ("11b8042c-44ec-4421-823e-531784a33717")
157146
@Override
158147
public final Object visitStateInvariant(StateInvariant obj) {
159148
switch (this.stName) {
@@ -167,7 +156,6 @@ public final Object visitStateInvariant(StateInvariant obj) {
167156
return IDefaultModelVisitor.super.visitStateInvariant(obj);
168157
}
169158

170-
@objid ("da3cdffe-5298-40ab-b3a3-1e41f7ed6698")
171159
@Override
172160
public final Object visitInstance(Instance obj) {
173161
switch (this.stName) {
@@ -179,7 +167,6 @@ public final Object visitInstance(Instance obj) {
179167
return IDefaultModelVisitor.super.visitInstance(obj);
180168
}
181169

182-
@objid ("6b6c4754-064a-401a-b35f-e97d5257738d")
183170
@Override
184171
public final Object visitBindableInstance(BindableInstance obj) {
185172
switch (this.stName) {
@@ -191,7 +178,6 @@ public final Object visitBindableInstance(BindableInstance obj) {
191178
return IDefaultModelVisitor.super.visitBindableInstance(obj);
192179
}
193180

194-
@objid ("86f48d13-560b-4897-a130-8256b8f08258")
195181
@Override
196182
public final Object visitOperation(Operation obj) {
197183
switch (this.stName) {
@@ -204,7 +190,6 @@ public final Object visitOperation(Operation obj) {
204190
return IDefaultModelVisitor.super.visitOperation(obj);
205191
}
206192

207-
@objid ("9995cbe7-b5d0-45ae-b431-c82bb7a4b130")
208193
@Override
209194
public final Object visitClassifier(Classifier obj) {
210195
switch (this.stName) {
@@ -219,7 +204,6 @@ public final Object visitClassifier(Classifier obj) {
219204
return IDefaultModelVisitor.super.visitClassifier(obj);
220205
}
221206

222-
@objid ("aeb7ffc2-e5ba-4da4-8e05-9b5e340c9973")
223207
@Override
224208
public final Object visitCallOperationAction(CallOperationAction obj) {
225209
switch (this.stName) {
@@ -234,7 +218,6 @@ public final Object visitCallOperationAction(CallOperationAction obj) {
234218
return IDefaultModelVisitor.super.visitCallOperationAction(obj);
235219
}
236220

237-
@objid ("4928f3ed-7da7-485a-b06d-dbaabd149004")
238221
@Override
239222
public final Object visitMessage(Message obj) {
240223
switch (this.stName) {
@@ -246,7 +229,6 @@ public final Object visitMessage(Message obj) {
246229
return IDefaultModelVisitor.super.visitMessage(obj);
247230
}
248231

249-
@objid ("e8d19694-5496-4ca9-8185-4feb2be5d408")
250232
@Override
251233
public final Object visitEvent(Event obj) {
252234
switch (this.stName) {
@@ -258,7 +240,6 @@ public final Object visitEvent(Event obj) {
258240
return IDefaultModelVisitor.super.visitEvent(obj);
259241
}
260242

261-
@objid ("12673c4d-1502-41c1-84d3-333236e1b1e9")
262243
@Override
263244
public final Object visitAttribute(Attribute obj) {
264245
switch (this.stName) {
@@ -272,7 +253,6 @@ public final Object visitAttribute(Attribute obj) {
272253
return IDefaultModelVisitor.super.visitAttribute(obj);
273254
}
274255

275-
@objid ("5facb0cd-8dd4-4510-b581-917ae875f8ae")
276256
@Override
277257
public final Object visitPackage(Package obj) {
278258
switch (this.stName) {
@@ -285,7 +265,6 @@ public final Object visitPackage(Package obj) {
285265
return IDefaultModelVisitor.super.visitPackage(obj);
286266
}
287267

288-
@objid ("93cfb2ee-802c-4b4b-86d9-dd1f23fc0474")
289268
@Override
290269
public final Object visitOpaqueAction(OpaqueAction obj) {
291270
switch (this.stName) {
@@ -303,7 +282,6 @@ public final Object visitOpaqueAction(OpaqueAction obj) {
303282
return IDefaultModelVisitor.super.visitOpaqueAction(obj);
304283
}
305284

306-
@objid ("8cd38ab6-8310-4c3a-9d75-659c9798dc5b")
307285
@Override
308286
public final Object visitActivityAction(ActivityAction obj) {
309287
switch (this.stName) {
@@ -315,7 +293,6 @@ public final Object visitActivityAction(ActivityAction obj) {
315293
return IDefaultModelVisitor.super.visitActivityAction(obj);
316294
}
317295

318-
@objid ("67336e92-68ed-4058-81bb-bf1d98c08cf6")
319296
@Override
320297
public final Object visitNameSpace(NameSpace obj) {
321298
switch (this.stName) {
@@ -332,7 +309,6 @@ public final Object visitNameSpace(NameSpace obj) {
332309
* <p>If null is returned the caller will return null.
333310
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
334311
*/
335-
@objid ("5e3d5b8e-7642-48c5-8934-ff936a9c17ed")
336312
@Override
337313
public IInfrastructureVisitor getInfrastructureVisitor() {
338314
return this;

‎src/main/java/org/modelio/module/utp/api/UTPStereotypes.java‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,67 @@
11
package org.modelio.module.utp.api;
22

3-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
43

5-
@objid ("688ef71f-41de-4a5c-ab4c-ba3e0686c5dc")
64
public interface UTPStereotypes {
7-
@objid ("a04c1d82-a943-4178-b46c-7925332c9013")
85
public static final String TESTCONTEXT = "TestContext";
96

10-
@objid ("e22b98d7-4da3-43f2-b710-dc43608e304b")
117
public static final String TESTCOMPONENT = "TestComponent";
128

13-
@objid ("dd27bf1b-8ea1-4b7e-8d61-f3554806115f")
149
public static final String TESTCASE_OPERATION = "TestCase_Operation";
1510

16-
@objid ("c16ba5bb-48ee-4775-8c41-56962e0132d9")
1711
public static final String TESTOBJECTIVE = "TestObjective";
1812

19-
@objid ("67134c01-ac72-434a-bb23-973470eb9dd3")
2013
public static final String SUT_BINDABLEINSTANCE = "SUT_BindableInstance";
2114

22-
@objid ("bb2cec5e-4a3b-4bb0-9b0c-e91ac55867a8")
2315
public static final String SUT_ATTRIBUTE = "SUT_Attribute";
2416

25-
@objid ("a8e7eb9e-c5dd-478c-a4b4-84c1e811ed30")
2617
public static final String TESTSET = "TestSet";
2718

28-
@objid ("e3e36aa6-c9ce-479d-bd33-15842ee0901d")
2919
public static final String TESTLOG = "TestLog";
3020

31-
@objid ("aec4dbe6-4e43-4b0a-8a77-69d6568fd1b8")
3221
public static final String TESTLOGAPPLICATION = "TestLogApplication";
3322

34-
@objid ("4e5efc73-709c-4196-92e2-f1b98ed0fd74")
3523
public static final String DEFAULT = "Default";
3624

37-
@objid ("ae565085-31c3-475d-a656-5dc888c529b6")
3825
public static final String DEFAULTAPPLICATION = "DefaultApplication";
3926

40-
@objid ("ac63f3fc-a6a0-4ddd-8412-9fde0925734b")
4127
public static final String VALIDATIONACTION = "ValidationAction";
4228

43-
@objid ("32c9043e-6887-4930-80ab-35b58ea2bccb")
4429
public static final String FINISHACTION = "FinishAction";
4530

46-
@objid ("2267a5b8-3eae-492e-914f-dba2c492bfdb")
4731
public static final String LOGACTION = "LogAction";
4832

49-
@objid ("07cd0b66-cc21-4d8a-b3fd-64082037ea34")
5033
public static final String TIMEOUT = "TimeOut";
5134

52-
@objid ("71298668-b398-4f2e-b7cf-716283e5dd9f")
5335
public static final String TIMEOUTMESSAGE = "TimeOutMessage";
5436

55-
@objid ("c8f1881a-4075-4597-a5ed-64af620ead26")
5637
public static final String TIMEOUTACTION = "TimeOutAction";
5738

58-
@objid ("b2eb5887-f3c3-4515-9fcf-b5d0db14bbe1")
5939
public static final String STARTTIMERACTION = "StartTimerAction";
6040

61-
@objid ("76be1d2b-ea5d-4100-80df-00bef3d74101")
6241
public static final String STOPTIMERACTION = "StopTimerAction";
6342

64-
@objid ("c59954d9-44a7-4c1d-8213-d80b93b1e908")
6543
public static final String READTIMERACTION = "ReadTimerAction";
6644

67-
@objid ("ecd89559-5dd8-46d4-aef8-35593548f1b3")
6845
public static final String TIMERRUNNINGACTION = "TimerRunningAction";
6946

70-
@objid ("8a678bab-7d2f-4e4c-913e-aa6b9d10c502")
7147
public static final String GETTIMEZONEACTION = "GetTimezoneAction";
7248

73-
@objid ("b5708426-73c4-45ef-ac63-dad7028152c1")
7449
public static final String SETTIMEZONEACTION = "SetTimezoneAction";
7550

76-
@objid ("85a7b75a-b7d5-49ba-8e55-38a405025db1")
7751
public static final String CODINGRULE_ATTRIBUTE = "CodingRule_Attribute";
7852

79-
@objid ("e38ca828-4783-4f18-897b-e76c7c1aaa74")
8053
public static final String CODINGRULE_NAMESPACE = "CodingRule_NameSpace";
8154

82-
@objid ("1bf7a17d-e8e1-44c0-bafd-b6ba8e208252")
8355
public static final String CODINGRULE_INSTANCE = "CodingRule_Instance";
8456

85-
@objid ("115fdebd-85bc-4bb4-9600-75a8613d0ab6")
8657
public static final String DATAPOOL = "DataPool";
8758

88-
@objid ("8837aa38-72db-49a1-989b-ce9dc2191928")
8959
public static final String DATAPARTITION = "DataPartition";
9060

91-
@objid ("3a338b4f-4570-4468-887b-6620504894d7")
9261
public static final String DATASELECTOR = "DataSelector";
9362

94-
@objid ("bef0dd93-3ee5-481c-87ef-bf89c1fdf018")
9563
public static final String U2TPTYPES = "U2TPTypes";
9664

97-
@objid ("c644b64c-ed8a-4203-835d-e97a38320f94")
9865
public static final String TESTCASE_BEHAVIOR = "TestCase_Behavior";
9966

10067
}

‎src/main/java/org/modelio/module/utp/api/UTPTagTypes.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
package org.modelio.module.utp.api;
22

3-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
43

5-
@objid ("23ca7ce1-5f5a-4718-af69-7893c3abc4f4")
64
public interface UTPTagTypes {
7-
@objid ("08477e3f-8eca-42de-9431-0d728a306ab2")
85
public static final String CODINGRULE_ATTRIBUTE_CODING = "coding";
96

10-
@objid ("ac48721b-0f9c-4764-a3ba-5bf1cf7c5ec6")
117
public static final String CODINGRULE_NAMESPACE_CODING = "coding";
128

13-
@objid ("46cd24f2-4860-479e-925d-af45723529ae")
149
public static final String CODINGRULE_INSTANCE_CODING = "coding";
1510

1611
}

0 commit comments

Comments
 (0)