Skip to content

Commit 25c1b75

Browse files
etiennebrosseetiennebrosse
committed
Update to Modleio 5.4.00
MARTE migration to Modelio 5.4.00
1 parent 7f8a28d commit 25c1b75

File tree

68 files changed

+215
-215
lines changed

Some content is hidden

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

68 files changed

+215
-215
lines changed

‎pom.xml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- definition -->
66
<groupId>org.modelio.module</groupId>
77
<artifactId>marte</artifactId>
8-
<version>4.1.06</version>
8+
<version>5.4.00</version>
99
<name>MARTEDesigner</name>
1010
<repositories>
1111
<repository>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>org.modelio</groupId>
3333
<artifactId>MDAKit</artifactId>
34-
<version>[4.1.0,4.1.1)</version>
34+
<version>[5.4.0,5.4.1)</version>
3535
<type>pom</type>
3636
<scope>provided</scope>
3737
</dependency>
@@ -42,22 +42,21 @@
4242
<build>
4343
<sourceDirectory>src/main/java</sourceDirectory>
4444
<plugins>
45-
<!-- Use JVM 1.8 -->
45+
<!-- Use JVM 11 -->
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-compiler-plugin</artifactId>
49-
<version>2.3.2</version>
49+
<version>3.8.1</version>
5050
<configuration>
51-
<source>1.8</source>
52-
<target>1.8</target>
51+
<release>11</release>
5352
<encoding>${project.build.sourceEncoding}</encoding>
5453
</configuration>
5554
</plugin>
5655

5756
<plugin>
5857
<groupId>org.modelio</groupId>
5958
<artifactId>modelio-maven-plugin</artifactId>
60-
<version>4.1.0.00</version>
59+
<version>5.4.0.00</version>
6160
<executions>
6261
<execution>
6362
<id>ModuleValidation</id>
@@ -84,7 +83,7 @@
8483
<plugin>
8584
<groupId>org.apache.maven.plugins</groupId>
8685
<artifactId>maven-dependency-plugin</artifactId>
87-
<version>2.4</version>
86+
<version>3.2.0</version>
8887
<configuration>
8988
<outputDirectory>${project.basedir}/target/lib</outputDirectory>
9089
<overWriteReleases>false</overWriteReleases>
@@ -107,7 +106,7 @@
107106
<plugin>
108107
<groupId>org.apache.maven.plugins</groupId>
109108
<artifactId>maven-assembly-plugin</artifactId>
110-
<version>2.3</version>
109+
<version>3.3.0</version>
111110
<configuration>
112111
<encoding>${project.build.sourceEncoding}</encoding>
113112
<descriptors>
@@ -132,7 +131,7 @@
132131
<plugin>
133132
<groupId>org.apache.maven.plugins</groupId>
134133
<artifactId>maven-antrun-plugin</artifactId>
135-
<version>1.7</version>
134+
<version>3.0.0</version>
136135
<executions>
137136
<execution>
138137
<id>rename</id>
@@ -181,7 +180,7 @@
181180
modelio-maven-plugin
182181
</artifactId>
183182
<versionRange>
184-
[4.1.0.00,)
183+
[5.4.0.00,)
185184
</versionRange>
186185
<goals>
187186
<goal>

‎src/main/conf/module.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<Module id="${project.name}" class="org.modelio.module.marte.impl.MARTEModule" binaryversion="4.1.0" version="${project.version}" schema-level="2" uid="24f58aa0-0ccc-11df-bc35-001302895b2b" author="" image="" url="">
2+
<Module id="${project.name}" class="org.modelio.module.marte.impl.MARTEModule" binaryversion="5.4.0" version="${project.version}" schema-level="2" uid="24f58aa0-0ccc-11df-bc35-001302895b2b" author="" image="" url="">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
55
</ClassPath>

‎src/main/java/org/modelio/module/marte/profile/alloc/command/diagram/Allocate_DependencyDiagramCommand.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package org.modelio.module.marte.profile.alloc.command.diagram;
22

33
import java.util.List;
4+
45
import org.modelio.api.modelio.diagram.IDiagramGraphic;
56
import org.modelio.api.modelio.diagram.IDiagramHandle;
6-
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
77
import org.modelio.api.modelio.diagram.IDiagramLink;
8-
import org.modelio.api.modelio.diagram.ILinkPath;
8+
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
9+
import org.modelio.api.modelio.diagram.ILinkRoute;
910
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
1011
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
1112
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -21,7 +22,7 @@ public class Allocate_DependencyDiagramCommand extends DefaultLinkTool {
2122
@Override
2223
public boolean acceptFirstElement(final IDiagramHandle diagramHandle, IDiagramGraphic targetNode) {
2324
MObject owner = null;
24-
25+
2526
if(targetNode.getElement() instanceof AbstractDiagram){
2627
owner = diagramHandle.getDiagram().getOrigin();
2728
}else{
@@ -33,7 +34,7 @@ public boolean acceptFirstElement(final IDiagramHandle diagramHandle, IDiagramGr
3334
@Override
3435
public boolean acceptSecondElement(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode) {
3536
MObject owner = null;
36-
37+
3738
if(targetNode == null){
3839
owner = diagramHandle.getDiagram().getOrigin();
3940
}else{
@@ -43,28 +44,28 @@ public boolean acceptSecondElement(final IDiagramHandle diagramHandle, IDiagramG
4344
}
4445

4546
@Override
46-
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind routerType, ILinkPath path) {
47+
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind routerType, ILinkRoute path) {
4748
try (ITransaction tr = MARTEModule.getInstance().getModuleContext().getModelingSession().createTransaction("Allocate_DependencyCommand")){
48-
49-
49+
50+
5051
ModelElement source = (ModelElement) originNode.getElement();
5152
ModelElement target = (ModelElement) targetNode.getElement();
52-
53+
5354
Allocate_Dependency proxy = new Allocate_Dependency();
54-
proxy.setParent(source,target);
55+
proxy.setParent(source,target);
5556
MARTEModule.getInstance().getModuleContext().getModelingSession().getModel().getDefaultNameService().setDefaultName(proxy.getElement(),proxy.getElement().getName());
5657
List<IDiagramGraphic> graphics = diagramHandle.unmask(proxy.getElement(), 0, 0);
5758
for (IDiagramGraphic graphic : graphics){
5859
if (graphic instanceof IDiagramLink){
5960
IDiagramLink link = (IDiagramLink) graphic;
6061
link.setRouterKind(routerType);
61-
link.setPath(path);
62+
link.setRoute(path);
6263
}
6364
}
6465
diagramHandle.save();
6566
diagramHandle.close();
6667
tr.commit();
67-
68+
6869
} catch (InvalidSourcePointException e) {
6970
MARTEModule.getInstance().getModuleContext().getLogService().error(e);
7071
} catch (InvalidPointsPathException e) {

‎src/main/java/org/modelio/module/marte/profile/alloc/command/diagram/Assign_NoteDiagramCommand.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.modelio.api.modelio.diagram.IDiagramGraphic;
44
import org.modelio.api.modelio.diagram.IDiagramHandle;
55
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
6-
import org.modelio.api.modelio.diagram.ILinkPath;
6+
import org.modelio.api.modelio.diagram.ILinkRoute;
77
import org.modelio.api.modelio.diagram.tools.DefaultAttachedBoxTool;
88
import org.modelio.api.modelio.model.ITransaction;
99
import org.modelio.metamodel.uml.infrastructure.ModelElement;
@@ -20,30 +20,30 @@ public String getTooltip() {
2020
@Override
2121
public boolean acceptElement(final IDiagramHandle diagramHandle, IDiagramGraphic targetNode) {
2222
MObject owner = null;
23-
23+
2424
if(targetNode != null){
2525
owner = targetNode.getElement();
2626
}
2727
return ((owner != null) && (owner instanceof ModelElement));
2828
}
2929

3030
@Override
31-
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic arg1, LinkRouterKind arg2, ILinkPath arg3, org.eclipse.draw2d.geometry.Point arg4) {
31+
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic arg1, LinkRouterKind arg2, ILinkRoute arg3, org.eclipse.draw2d.geometry.Point arg4) {
3232
try(ITransaction tr = MARTEModule.getInstance().getModuleContext().getModelingSession().createTransaction("Assign_NoteCommand")){
33-
33+
3434
MObject parent = arg1.getElement();
35-
35+
3636
Assign_Note proxy = new Assign_Note();
37-
37+
3838
if(parent instanceof ModelElement){
3939
proxy.setParent((ModelElement) parent);
4040
}
41-
41+
4242
diagramHandle.unmask(proxy.getElement(), 0, 0);
43-
43+
4444
diagramHandle.save();
4545
diagramHandle.close();
46-
tr.commit();
46+
tr.commit();
4747
}
4848
}
4949

‎src/main/java/org/modelio/module/marte/profile/alloc/command/diagram/NfpRefine_DependencyDiagramCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.modelio.api.modelio.diagram.IDiagramHandle;
66
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
77
import org.modelio.api.modelio.diagram.IDiagramLink;
8-
import org.modelio.api.modelio.diagram.ILinkPath;
8+
import org.modelio.api.modelio.diagram.ILinkRoute;
99
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
1010
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
1111
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -40,7 +40,7 @@ public boolean acceptSecondElement(IDiagramHandle arg0, IDiagramGraphic arg1, ID
4040
}
4141

4242
@Override
43-
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind routerType, ILinkPath path) {
43+
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind routerType, ILinkRoute path) {
4444
try(ITransaction tr = MARTEModule.getInstance().getModuleContext().getModelingSession().createTransaction("NfpRefine_DependencyCommand")){
4545

4646
ModelElement source = (ModelElement) originNode.getElement();
@@ -57,7 +57,7 @@ public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic
5757
if (graphic instanceof IDiagramLink){
5858
IDiagramLink link = (IDiagramLink) graphic;
5959
link.setRouterKind(routerType);
60-
link.setPath(path);
60+
link.setRoute(path);
6161
}
6262
}
6363

‎src/main/java/org/modelio/module/marte/profile/coreelements/command/diagram/ModeTransition_TransitionDiagramCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.modelio.api.modelio.diagram.IDiagramHandle;
66
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
77
import org.modelio.api.modelio.diagram.IDiagramLink;
8-
import org.modelio.api.modelio.diagram.ILinkPath;
8+
import org.modelio.api.modelio.diagram.ILinkRoute;
99
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
1010
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
1111
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -57,7 +57,7 @@ public boolean acceptSecondElement(final IDiagramHandle diagramHandle, IDiagramG
5757
}
5858

5959
@Override
60-
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkPath path) {
60+
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkRoute path) {
6161
try(ITransaction tr = MARTEModule.getInstance().getModuleContext().getModelingSession().createTransaction("ModeTransition_TransitionDiagramCommand")){
6262

6363
StateVertex source = (StateVertex)originNode.getElement();
@@ -74,7 +74,7 @@ public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic
7474
if (graphic instanceof IDiagramLink){
7575
IDiagramLink link = (IDiagramLink) graphic;
7676
link.setRouterKind(touterType);
77-
link.setPath(path);
77+
link.setRoute(path);
7878
}
7979
}
8080

‎src/main/java/org/modelio/module/marte/profile/grm/command/diagram/Acquire_CollaborationDiagramCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.modelio.api.modelio.diagram.IDiagramGraphic;
44
import org.modelio.api.modelio.diagram.IDiagramHandle;
55
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
6-
import org.modelio.api.modelio.diagram.ILinkPath;
6+
import org.modelio.api.modelio.diagram.ILinkRoute;
77
import org.modelio.api.modelio.diagram.tools.DefaultLinkTool;
88
import org.modelio.api.modelio.model.ITransaction;
99
import org.modelio.metamodel.diagrams.AbstractDiagram;
@@ -49,7 +49,7 @@ public boolean acceptSecondElement(final IDiagramHandle diagramHandle, IDiagramG
4949
}
5050

5151
@Override
52-
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkPath path) {
52+
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkRoute path) {
5353
try(ITransaction tr = MARTEModule.getInstance().getModuleContext().getModelingSession().createTransaction("Acquire_CollaborationCommand")){
5454

5555
Behavior source = (Behavior)originNode.getElement();

‎src/main/java/org/modelio/module/marte/profile/grm/command/diagram/Acquire_CollaborationUseDiagramCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.modelio.api.modelio.diagram.IDiagramGraphic;
44
import org.modelio.api.modelio.diagram.IDiagramHandle;
55
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
6-
import org.modelio.api.modelio.diagram.ILinkPath;
6+
import org.modelio.api.modelio.diagram.ILinkRoute;
77
import org.modelio.api.modelio.diagram.tools.DefaultLinkTool;
88
import org.modelio.api.modelio.model.ITransaction;
99
import org.modelio.metamodel.diagrams.AbstractDiagram;
@@ -49,7 +49,7 @@ public boolean acceptSecondElement(final IDiagramHandle diagramHandle, IDiagramG
4949
}
5050

5151
@Override
52-
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkPath path) {
52+
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkRoute path) {
5353
try(ITransaction tr = MARTEModule.getInstance().getModuleContext().getModelingSession().createTransaction("Acquire_CollaborationUseCommand")){
5454

5555

‎src/main/java/org/modelio/module/marte/profile/grm/command/diagram/ClockResource_AssociationDiagramCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.modelio.api.modelio.diagram.IDiagramHandle;
66
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
77
import org.modelio.api.modelio.diagram.IDiagramLink;
8-
import org.modelio.api.modelio.diagram.ILinkPath;
8+
import org.modelio.api.modelio.diagram.ILinkRoute;
99
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
1010
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
1111
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -54,7 +54,7 @@ public boolean acceptSecondElement(final IDiagramHandle diagramHandle, IDiagramG
5454
}
5555

5656
@Override
57-
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkPath path) {
57+
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkRoute path) {
5858
try(ITransaction tr = MARTEModule.getInstance().getModuleContext().getModelingSession().createTransaction("ClockResource_AssociationCommand")){
5959

6060

@@ -67,7 +67,7 @@ public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic
6767
if (graphic instanceof IDiagramLink){
6868
IDiagramLink link = (IDiagramLink) graphic;
6969
link.setRouterKind(touterType);
70-
link.setPath(path);
70+
link.setRoute(path);
7171
}
7272
}
7373

‎src/main/java/org/modelio/module/marte/profile/grm/command/diagram/ClockResource_LinkDiagramCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.modelio.api.modelio.diagram.IDiagramHandle;
66
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
77
import org.modelio.api.modelio.diagram.IDiagramLink;
8-
import org.modelio.api.modelio.diagram.ILinkPath;
8+
import org.modelio.api.modelio.diagram.ILinkRoute;
99
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
1010
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
1111
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -54,7 +54,7 @@ public boolean acceptSecondElement(final IDiagramHandle diagramHandle, IDiagramG
5454
}
5555

5656
@Override
57-
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkPath path) {
57+
public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkRoute path) {
5858
try(ITransaction tr = MARTEModule.getInstance().getModuleContext().getModelingSession().createTransaction("ClockResource_LinkCommand")){
5959

6060

@@ -72,7 +72,7 @@ public void actionPerformed(final IDiagramHandle diagramHandle, IDiagramGraphic
7272
if (graphic instanceof IDiagramLink){
7373
IDiagramLink link = (IDiagramLink) graphic;
7474
link.setRouterKind(touterType);
75-
link.setPath(path);
75+
link.setRoute(path);
7676
}
7777
}
7878

0 commit comments

Comments
 (0)