Skip to content

Commit 7d994e7

Browse files
author
ABHERVE Antonin
committed
Modelio 5.1.0
1 parent 155bcfd commit 7d994e7

File tree

48 files changed

+149
-147
lines changed

Some content is hidden

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

48 files changed

+149
-147
lines changed

‎JavaDesigner/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- definition -->
66
<groupId>org.modelio.module</groupId>
77
<artifactId>javadesigner</artifactId>
8-
<version>3.10.00</version>
8+
<version>5.0.00</version>
99
<name>JavaDesigner</name>
1010
<description>The Java Designer module provides a complete range of features dedicated to Java development, including Java code and Javadoc generation from UML2 models. It also provides an automatic model completion feature, incorporating automatic accessor production and synchronization, and a reverse service used to reverse-engineer existing Java application.</description>
1111

@@ -33,15 +33,15 @@
3333
<dependency>
3434
<groupId>org.modelio</groupId>
3535
<artifactId>MDAKit</artifactId>
36-
<version>[4.1.0,4.2.0)</version>
36+
<version>[5.1.0,5.2.0)</version>
3737
<type>pom</type>
3838
<scope>provided</scope>
3939
</dependency>
4040

4141
<dependency>
4242
<groupId>org.modelio</groupId>
4343
<artifactId>org.modelio.documentation.javadesigner</artifactId>
44-
<version>${project.version}</version>
44+
<version>3.10.00</version>
4545
</dependency>
4646

4747
<dependency>
@@ -74,15 +74,15 @@
7474
<dependency>
7575
<groupId>org.modelio</groupId>
7676
<artifactId>org.modelio.core.session</artifactId>
77-
<version>[4.1.0,4.2.0)</version>
77+
<version>[5.1.0,5.2.0)</version>
7878
<type>jar</type>
7979
<scope>provided</scope>
8080
</dependency>
8181

8282
<dependency>
8383
<groupId>org.modelio</groupId>
8484
<artifactId>org.modelio.platform.core</artifactId>
85-
<version>[4.1.0,4.2.0)</version>
85+
<version>[5.1.0,5.2.0)</version>
8686
<scope>provided</scope>
8787
</dependency>
8888

@@ -106,7 +106,7 @@
106106
<plugin>
107107
<groupId>org.modelio</groupId>
108108
<artifactId>modelio-maven-plugin</artifactId>
109-
<version>4.0.0.00</version>
109+
<version>5.1.0.00</version>
110110
<executions>
111111
<execution>
112112
<id>ModuleValidation</id>

‎JavaDesigner/src/main/conf/module.xml

+1-1
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.javadesigner.impl.JavaDesignerModule" binaryversion="4.1.00" version="${project.version}" schema-level="2" uid="003800a8-0000-022e-0000-000000000000">
2+
<Module id="${project.name}" class="org.modelio.module.javadesigner.impl.JavaDesignerModule" binaryversion="5.1.00" version="${project.version}" schema-level="2" uid="003800a8-0000-022e-0000-000000000000">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
55
<PathEntry path="lib/org.modelio.documentation.javadesigner-${project.version}.jar"/>

‎SysMLArchitect/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- definition -->
66
<groupId>org.modelio.module</groupId>
77
<artifactId>sysmlarchitect</artifactId>
8-
<version>3.10.00</version>
8+
<version>5.0.00</version>
99
<name>SysMLArchitect</name>
1010
<description>SysML Architect is a Modelio extension, used to model SysML architectures.</description>
1111

@@ -31,15 +31,15 @@
3131
<dependency>
3232
<groupId>org.modelio</groupId>
3333
<artifactId>MDAKit</artifactId>
34-
<version>[4.1.0,4.2.0)</version>
34+
<version>[5.1.0,5.2.0)</version>
3535
<type>pom</type>
3636
<scope>provided</scope>
3737
</dependency>
3838

3939
<dependency>
4040
<groupId>org.modelio</groupId>
4141
<artifactId>org.modelio.documentation.sysml</artifactId>
42-
<version>${project.version}</version>
42+
<version>3.10.00</version>
4343
</dependency>
4444

4545
</dependencies>
@@ -62,7 +62,7 @@
6262
<plugin>
6363
<groupId>org.modelio</groupId>
6464
<artifactId>modelio-maven-plugin</artifactId>
65-
<version>4.1.0.00</version>
65+
<version>5.1.0.00</version>
6666
<executions>
6767
<execution>
6868
<id>ModuleValidation</id>

‎SysMLArchitect/src/main/conf/module.xml

+1-1
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.sysml.impl.SysMLModule" binaryversion="4.1.0" version="${project.version}" schema-level="2" uid="00bc42d0-0000-19fb-0000-000000000000" author="" image="" url="">
2+
<Module id="${project.name}" class="org.modelio.module.sysml.impl.SysMLModule" binaryversion="5.1.0" version="${project.version}" schema-level="2" uid="00bc42d0-0000-19fb-0000-000000000000" author="" image="" url="">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
55
<PathEntry path="lib/org.modelio.documentation.sysml-${project.version}.jar"/>

‎SysMLArchitect/src/main/java/org/modelio/module/sysml/commands/diagram/AllocateDependencyDiagramCommand.java

+11-9
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.modelio.api.modelio.diagram.IDiagramHandle;
3535
import org.modelio.api.modelio.diagram.IDiagramLink;
3636
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
37-
import org.modelio.api.modelio.diagram.ILinkPath;
37+
import org.modelio.api.modelio.diagram.ILinkRoute;
3838
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
3939
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
4040
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -64,7 +64,7 @@ public AllocateDependencyDiagramCommand() {
6464
/**
6565
* Method acceptFirstElement
6666
* @author ebrosse
67-
*
67+
*
6868
* @param representation : the diagram handle
6969
* @param target : the tested node
7070
* @return the boolean representing the acceptation
@@ -73,7 +73,7 @@ public AllocateDependencyDiagramCommand() {
7373
@Override
7474
public boolean acceptFirstElement(IDiagramHandle representation, IDiagramGraphic target) {
7575
MObject element = target.getElement();
76-
return ((element.getStatus().isModifiable ())
76+
return ((element.getStatus().isModifiable ())
7777
&& (element instanceof ModelElement));
7878
}
7979

@@ -86,29 +86,30 @@ public boolean acceptSecondElement(IDiagramHandle representation, IDiagramGraphi
8686

8787
@objid ("c48f42c1-3176-4bfd-94af-a5911dbdd3f7")
8888
@Override
89-
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkPath path) {
89+
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkRoute path) {
9090
IModelingSession session = SysMLModule.getInstance().getModuleContext().getModelingSession();
9191
try( ITransaction transaction = session.createTransaction (I18nMessageService.getString ("Info.Session.Create", "Allocate"))){
9292
ModelElement originElement = (ModelElement) origin.getElement();
9393
ModelElement targetElement = (ModelElement) target.getElement();
94-
94+
9595
Dependency dependency = SysMLFactory.createAllocateAbstraction(originElement, targetElement);
96-
96+
9797
List<IDiagramGraphic> graphics = representation.unmask(dependency, 0, 0);
98-
98+
9999
for (IDiagramGraphic graphic : graphics ){
100100
if (graphic.getElement().equals(dependency)){
101101
IDiagramLink link = (IDiagramLink) graphic;
102102
try {
103-
link.setPath (path);
103+
104+
link.setRoute(path);
104105
} catch (InvalidPointsPathException e) {
105106
SysMLModule.logService.error(e);
106107
} catch (InvalidSourcePointException e) {
107108
SysMLModule.logService.error(e);
108109
} catch (InvalidDestinationPointException e) {
109110
SysMLModule.logService.error(e);
110111
}
111-
112+
112113
}
113114
}
114115
representation.save();
@@ -117,4 +118,5 @@ public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origi
117118
}
118119
}
119120

121+
120122
}

‎SysMLArchitect/src/main/java/org/modelio/module/sysml/commands/diagram/BindingConnectorDiagramCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.modelio.api.modelio.diagram.IDiagramHandle;
3636
import org.modelio.api.modelio.diagram.IDiagramLink;
3737
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
38-
import org.modelio.api.modelio.diagram.ILinkPath;
38+
import org.modelio.api.modelio.diagram.ILinkRoute;
3939
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
4040
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
4141
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -92,7 +92,7 @@ public boolean acceptSecondElement(IDiagramHandle representation, IDiagramGraphi
9292

9393
@objid ("a06bd41c-a753-45fb-8b46-1998797f5646")
9494
@Override
95-
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkPath path) {
95+
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkRoute path) {
9696
IModelingSession session = SysMLModule.getInstance().getModuleContext().getModelingSession();
9797
try( ITransaction transaction = session.createTransaction (I18nMessageService.getString ("Info.Session.Create", "Binding"))){
9898

@@ -105,7 +105,7 @@ public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origi
105105
if (graphic.getElement().equals(connector)){
106106
IDiagramLink link = (IDiagramLink) graphic;
107107
try {
108-
link.setPath (path);
108+
link.setRoute (path);
109109
} catch (InvalidPointsPathException e) {
110110
SysMLModule.logService.error(e);
111111
} catch (InvalidSourcePointException e) {

‎SysMLArchitect/src/main/java/org/modelio/module/sysml/commands/diagram/ConformDependencyDiagramCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.modelio.api.modelio.diagram.IDiagramHandle;
3535
import org.modelio.api.modelio.diagram.IDiagramLink;
3636
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
37-
import org.modelio.api.modelio.diagram.ILinkPath;
37+
import org.modelio.api.modelio.diagram.ILinkRoute;
3838
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
3939
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
4040
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -85,7 +85,7 @@ public boolean acceptSecondElement(IDiagramHandle representation, IDiagramGraphi
8585

8686
@objid ("66e3f33d-23bd-4d76-8c37-a6ff69d8f2ba")
8787
@Override
88-
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkPath path) {
88+
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkRoute path) {
8989
IModelingSession session = SysMLModule.getInstance().getModuleContext().getModelingSession();
9090
try( ITransaction transaction = session.createTransaction (I18nMessageService.getString ("Info.Session.Create", "Conform"))){
9191

@@ -98,7 +98,7 @@ public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origi
9898
if (graphic.getElement().equals(dependency)){
9999
IDiagramLink link = (IDiagramLink) graphic;
100100
try {
101-
link.setPath (path);
101+
link.setRoute (path);
102102
} catch (InvalidPointsPathException e) {
103103
SysMLModule.logService.error(e);
104104
} catch (InvalidSourcePointException e) {

‎SysMLArchitect/src/main/java/org/modelio/module/sysml/commands/diagram/ContinuousEdgeDiagramCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.modelio.api.modelio.diagram.IDiagramHandle;
3535
import org.modelio.api.modelio.diagram.IDiagramLink;
3636
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
37-
import org.modelio.api.modelio.diagram.ILinkPath;
37+
import org.modelio.api.modelio.diagram.ILinkRoute;
3838
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
3939
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
4040
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -79,7 +79,7 @@ public boolean acceptSecondElement(IDiagramHandle representation, IDiagramGraphi
7979

8080
@objid ("d2c13d81-18aa-4bdf-b816-87604c09a78a")
8181
@Override
82-
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkPath path) {
82+
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkRoute path) {
8383
IModelingSession session = SysMLModule.getInstance().getModuleContext().getModelingSession();
8484
try( ITransaction transaction = session.createTransaction (I18nMessageService.getString ("Info.Session.Create", "Continuous Edge"))){
8585
ActivityNode originElement = (ActivityNode) origin.getElement();
@@ -91,7 +91,7 @@ public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origi
9191
IDiagramLink link = (IDiagramLink) graphic;
9292
if (link != null) {
9393
try {
94-
link.setPath (path);
94+
link.setRoute (path);
9595
} catch (InvalidPointsPathException e) {
9696
SysMLModule.logService.error(e);
9797
} catch (InvalidSourcePointException e) {

‎SysMLArchitect/src/main/java/org/modelio/module/sysml/commands/diagram/DiscreteEdgeDiagramCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.modelio.api.modelio.diagram.IDiagramHandle;
3535
import org.modelio.api.modelio.diagram.IDiagramLink;
3636
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
37-
import org.modelio.api.modelio.diagram.ILinkPath;
37+
import org.modelio.api.modelio.diagram.ILinkRoute;
3838
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
3939
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
4040
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -79,7 +79,7 @@ public boolean acceptSecondElement(IDiagramHandle representation, IDiagramGraphi
7979

8080
@objid ("0b316433-e355-4780-aa18-98b4e8368f6e")
8181
@Override
82-
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkPath path) {
82+
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkRoute path) {
8383
IModelingSession session = SysMLModule.getInstance().getModuleContext().getModelingSession();
8484
try( ITransaction transaction = session.createTransaction (I18nMessageService.getString ("Info.Session.Create", "Discrete Edge"))){
8585
ActivityNode originElement = (ActivityNode) origin.getElement();
@@ -92,7 +92,7 @@ public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origi
9292
IDiagramLink link = (IDiagramLink) graphic;
9393
if (link != null) {
9494
try {
95-
link.setPath (path);
95+
link.setRoute (path);
9696
} catch (InvalidPointsPathException e) {
9797
SysMLModule.logService.error(e);
9898
} catch (InvalidSourcePointException e) {

‎SysMLArchitect/src/main/java/org/modelio/module/sysml/commands/diagram/ProbabilityDiagramCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.modelio.api.modelio.diagram.IDiagramHandle;
3535
import org.modelio.api.modelio.diagram.IDiagramLink;
3636
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
37-
import org.modelio.api.modelio.diagram.ILinkPath;
37+
import org.modelio.api.modelio.diagram.ILinkRoute;
3838
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
3939
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
4040
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -78,7 +78,7 @@ public boolean acceptSecondElement(IDiagramHandle representation, IDiagramGraphi
7878

7979
@objid ("977b49ef-0644-4ec6-be35-a5e0249a7085")
8080
@Override
81-
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkPath path) {
81+
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkRoute path) {
8282
IModelingSession session = SysMLModule.getInstance().getModuleContext().getModelingSession();
8383
try( ITransaction transaction = session.createTransaction (I18nMessageService.getString ("Info.Session.Create", "Probability"))){
8484
ActivityNode originElement = (ActivityNode) origin.getElement();
@@ -92,7 +92,7 @@ public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origi
9292
if (graphic.getElement().equals(edge)){
9393
IDiagramLink link = (IDiagramLink) graphic;
9494
try {
95-
link.setPath (path);
95+
link.setRoute (path);
9696
} catch (InvalidPointsPathException e) {
9797
SysMLModule.logService.error(e);
9898
} catch (InvalidSourcePointException e) {

‎SysMLArchitect/src/main/java/org/modelio/module/sysml/commands/diagram/ProblemNoteDiagramCommand.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.modelio.api.modelio.diagram.IDiagramGraphic;
3535
import org.modelio.api.modelio.diagram.IDiagramHandle;
3636
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
37-
import org.modelio.api.modelio.diagram.ILinkPath;
37+
import org.modelio.api.modelio.diagram.ILinkRoute;
3838
import org.modelio.api.modelio.diagram.tools.DefaultAttachedBoxTool;
3939
import org.modelio.api.modelio.model.IModelingSession;
4040
import org.modelio.api.modelio.model.ITransaction;
@@ -63,7 +63,7 @@ public boolean acceptElement(IDiagramHandle representation, IDiagramGraphic targ
6363

6464
@objid ("5541ba41-5675-42e6-9f7d-c96ed42052bc")
6565
@Override
66-
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic arg2, LinkRouterKind arg3, ILinkPath arg4, Point arg5) {
66+
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic arg2, LinkRouterKind arg3, ILinkRoute arg4, Point arg5) {
6767
IModelingSession session = SysMLModule.getInstance().getModuleContext().getModelingSession();
6868
IUmlModel model = session.getModel();
6969
try( ITransaction transaction = session.createTransaction (I18nMessageService.getString ("Info.Session.Create", "Problem Note"))){

‎SysMLArchitect/src/main/java/org/modelio/module/sysml/commands/diagram/RateEdgeDiagramCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.modelio.api.modelio.diagram.IDiagramHandle;
3535
import org.modelio.api.modelio.diagram.IDiagramLink;
3636
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
37-
import org.modelio.api.modelio.diagram.ILinkPath;
37+
import org.modelio.api.modelio.diagram.ILinkRoute;
3838
import org.modelio.api.modelio.diagram.InvalidDestinationPointException;
3939
import org.modelio.api.modelio.diagram.InvalidPointsPathException;
4040
import org.modelio.api.modelio.diagram.InvalidSourcePointException;
@@ -71,7 +71,7 @@ public boolean acceptSecondElement(IDiagramHandle representation, IDiagramGraphi
7171

7272
@objid ("c8a14d77-a023-4437-8e65-00a1886b4db7")
7373
@Override
74-
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkPath path) {
74+
public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origin, IDiagramGraphic target, LinkRouterKind kind, ILinkRoute path) {
7575
IModelingSession session = SysMLModule.getInstance().getModuleContext().getModelingSession();
7676
try( ITransaction transaction = session.createTransaction (I18nMessageService.getString ("Info.Session.Create", "Rate Edge"))){
7777
ActivityNode originElement = (ActivityNode) origin.getElement();
@@ -84,7 +84,7 @@ public void actionPerformed(IDiagramHandle representation, IDiagramGraphic origi
8484
if (graphic.getElement().equals(edge)){
8585
IDiagramLink link = (IDiagramLink) graphic;
8686
try {
87-
link.setPath (path);
87+
link.setRoute (path);
8888
} catch (InvalidPointsPathException e) {
8989
SysMLModule.logService.error(e);
9090
} catch (InvalidSourcePointException e) {

0 commit comments

Comments
 (0)