Skip to content

Commit 85e191e

Browse files
author
ABHERVE Antonin
committed
Release Modelio 5.4.1
1 parent 8e3eb9f commit 85e191e

File tree

14 files changed

+64
-64
lines changed

14 files changed

+64
-64
lines changed

JavaDesigner/pom.xml

+5-5
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>5.3.0</version>
8+
<version>5.4.01</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,7 +33,7 @@
3333
<dependency>
3434
<groupId>org.modelio</groupId>
3535
<artifactId>MDAKit</artifactId>
36-
<version>[5.3.0,5.4.0)</version>
36+
<version>[5.4.0,5.4.2)</version>
3737
<type>pom</type>
3838
<scope>provided</scope>
3939
</dependency>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.modelio</groupId>
4444
<artifactId>org.modelio.documentation.javadesigner</artifactId>
45-
<version>5.3.0</version>
45+
<version>5.4.0</version>
4646
</dependency>
4747

4848
<dependency>
@@ -91,7 +91,7 @@
9191
<plugin>
9292
<groupId>org.modelio</groupId>
9393
<artifactId>modelio-maven-plugin</artifactId>
94-
<version>5.3.0.00</version>
94+
<version>5.4.0.00</version>
9595
<executions>
9696
<execution>
9797
<id>ModuleValidation</id>
@@ -215,7 +215,7 @@
215215
modelio-maven-plugin
216216
</artifactId>
217217
<versionRange>
218-
[5.3.0.00,)
218+
[5.4.0.00,)
219219
</versionRange>
220220
<goals>
221221
<goal>

JavaDesigner/src/main/conf/module.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<Module id="${project.name}" class="org.modelio.module.javadesigner.impl.JavaDesignerModule" binaryversion="5.3.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.4.00" version="${project.version}" schema-level="2" uid="003800a8-0000-022e-0000-000000000000">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
5-
<PathEntry path="lib/org.modelio.documentation.javadesigner-${project.version}.jar"/>
5+
<PathEntry path="lib/org.modelio.documentation.javadesigner-5.4.0.jar"/>
66
<PathEntry path="lib/xmlreverse-3.5.00.jar"/>
77
<PathEntry path="lib/jaxb-api-2.4.0-b180830.0359.jar"/>
88
<PathEntry path="lib/javax.activation-api-1.2.0.jar"/>
@@ -426,7 +426,7 @@
426426
</Profile>
427427
</Profiles>
428428
<Parameters>
429-
<Parameter id="GenerationMode" group="%group.General.label" uid="01ec25e8-0000-0700-0000-000000000000" type="Enum" default-value="" label="%parameter.GenerationMode.label">
429+
<Parameter id="GenerationMode" group="%group.General.label" uid="01ec25e8-0000-0700-0000-000000000000" type="Enum" default-value="RoundTrip" label="%parameter.GenerationMode.label">
430430
<Enumeration>
431431
<Literal value="RoundTrip" label="%parameter.GenerationMode.RoundTrip.label"/>
432432
<Literal value="ModelDriven" label="%parameter.GenerationMode.ModelDriven.label"/>
@@ -766,11 +766,11 @@
766766
</Views>
767767
</Gui>
768768
<Dependencies>
769-
<Required name="ModelerModule" version="9.0.05"/>
769+
<Required name="ModelerModule" version="9.4.00"/>
770770
</Dependencies>
771771
<Resources>
772772
<DocFiles>
773-
<PathEntry path="lib/org.modelio.documentation.javadesigner-${project.version}.jar"/>
773+
<PathEntry path="lib/org.modelio.documentation.javadesigner-5.4.0.jar"/>
774774
</DocFiles>
775775
</Resources>
776776
</Module>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Bundle-SymbolicName: org.modelio.documentation.javadesigner;singleton=true
2-
Bundle-Version: 5.3.0
2+
Bundle-Version: 5.4.0
33
Bundle-Name: Java designer documentation
44
Bundle-Vendor: modelio.org

JavaDesigner/src/main/doc/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.modelio</groupId>
66
<artifactId>org.modelio.documentation.javadesigner</artifactId>
7-
<version>5.3.0</version>
7+
<version>5.4.0</version>
88
<packaging>eclipse-plugin</packaging>
99

1010
<properties>

JavaDesigner/src/main/java/org/modelio/module/javadesigner/impl/JavaDesignerSession.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.File;
44
import java.util.Map;
5-
65
import org.modelio.api.modelio.model.IModelingSession;
76
import org.modelio.api.modelio.model.event.IModelChangeHandler;
87
import org.modelio.api.modelio.model.event.IModelChangeListener;
@@ -96,13 +95,13 @@ public boolean select() throws ModuleException {
9695
public boolean start() throws ModuleException {
9796
IModuleContext context = this.module.getModuleContext();
9897
IModelingSession session = context.getModelingSession();
99-
98+
10099
// Remove the metamodelVersion
101100
Version version = this.module.getVersion ();
102101
String fullVersion = version.toString();
103102

104103
// Display the copyright
105-
JavaDesignerModule.getInstance().getModuleContext().getLogService().info("Modelio/" + this.module.getName() + " " + fullVersion + " - Copyright 2008-2015 Modeliosoft"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
104+
JavaDesignerModule.getInstance().getModuleContext().getLogService().info("Modelio/" + this.module.getName() + " " + fullVersion + " - Copyright 2008-2023 Docaposte"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
106105

107106
/*
108107
* Notifications
@@ -209,7 +208,7 @@ public boolean start() throws ModuleException {
209208
public void stop() throws ModuleException {
210209
IModuleContext context = this.module.getModuleContext();
211210
IModelingSession session = context.getModelingSession();
212-
211+
213212
session.removeStatusListener(this.statusChangeHandler);
214213
session.removeModelHandler (this.modelChangeHandler);
215214
session.removeModelListener (this.modelChangeListener);

SysMLArchitect/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- definition -->
88
<groupId>org.modelio.module</groupId>
99
<artifactId>sysmlarchitect</artifactId>
10-
<version>5.3.00</version>
10+
<version>5.4.00</version>
1111
<name>SysMLArchitect</name>
1212
<description>SysML Architect is a Modelio extension, used to model SysML architectures.</description>
1313

@@ -35,15 +35,15 @@
3535
<dependency>
3636
<groupId>org.modelio</groupId>
3737
<artifactId>MDAKit</artifactId>
38-
<version>[5.3.0,5.4.0)</version>
38+
<version>[5.4.0,5.4.2)</version>
3939
<type>pom</type>
4040
<scope>provided</scope>
4141
</dependency>
4242

4343
<dependency>
4444
<groupId>org.modelio</groupId>
4545
<artifactId>org.modelio.documentation.sysml</artifactId>
46-
<version>5.3.0</version>
46+
<version>5.4.0</version>
4747
</dependency>
4848

4949
</dependencies>
@@ -66,7 +66,7 @@
6666
<plugin>
6767
<groupId>org.modelio</groupId>
6868
<artifactId>modelio-maven-plugin</artifactId>
69-
<version>5.3.0.00</version>
69+
<version>5.4.0.00</version>
7070
<executions>
7171
<execution>
7272
<id>ModuleValidation</id>
@@ -192,7 +192,7 @@
192192
modelio-maven-plugin
193193
</artifactId>
194194
<versionRange>
195-
[5.3.0.00,)
195+
[5.4.0.00,)
196196
</versionRange>
197197
<goals>
198198
<goal>

SysMLArchitect/src/main/conf/module.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<Module id="${project.name}" class="org.modelio.module.sysml.impl.SysMLModule" binaryversion="5.3.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.4.00" 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"/>
5-
<PathEntry path="lib/org.modelio.documentation.sysml-${project.version}.jar"/>
5+
<PathEntry path="lib/org.modelio.documentation.sysml-5.4.0.jar"/>
66
</ClassPath>
77
<Profiles>
88
<Profile uid="00bc42a4-0000-1968-0000-000000000000" id="sysml">
@@ -848,11 +848,11 @@
848848
</Views>
849849
</Gui>
850850
<Dependencies>
851-
<Required name="ModelerModule" version="9.1.00"/>
851+
<Required name="ModelerModule" version="9.4.00"/>
852852
</Dependencies>
853853
<Resources>
854854
<DocFiles>
855-
<PathEntry path="lib/org.modelio.documentation.sysml-${project.version}.jar"/>
855+
<PathEntry path="lib/org.modelio.documentation.sysml-5.4.0.jar"/>
856856
</DocFiles>
857857
</Resources>
858858
</Module>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Bundle-SymbolicName: org.modelio.documentation.sysml;singleton=true
2-
Bundle-Version: 5.3.0
2+
Bundle-Version: 5.4.0
33
Bundle-Name: SysML documentation
44
Bundle-Vendor: modelio.org

SysMLArchitect/src/main/doc/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.modelio</groupId>
66
<artifactId>org.modelio.documentation.sysml</artifactId>
7-
<version>5.3.0</version>
7+
<version>5.4.0</version>
88
<packaging>eclipse-plugin</packaging>
99

1010
<properties>

SysMLArchitect/src/main/java/org/modelio/module/sysml/impl/SysMLSession.java

+27-27
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,26 @@
4949

5050
/**
5151
* This class represents the life of SysMl module
52-
*
52+
*
5353
* @author ebrosse
5454
*/
5555

5656
public class SysMLSession extends DefaultModuleLifeCycleHandler {
57-
57+
5858
private SysMLModelChangeHandler modelChangeHandler = null;
5959

6060
/**
6161
* Constructor
6262
* @author ebrosse
63-
*
63+
*
6464
* @param module : the SysML Mdac
6565
*/
66-
66+
6767
public SysMLSession(SysMLModule module) {
6868
super(module);
6969
}
7070

71-
71+
7272
@Override
7373
public boolean start() throws ModuleException {
7474
/*
@@ -80,29 +80,29 @@ public boolean start() throws ModuleException {
8080
// Display the copyright
8181
// SysMLInfo cannot be used in this operation, because there is a Java
8282
// error when the MDAC is deployed
83-
SysMLModule.logService.info("Modelio/" + this.module.getName() + " " + completeVersion + " - Copyright 2011-2015 Modeliosoft");
84-
83+
SysMLModule.logService.info("Modelio/" + this.module.getName() + " " + completeVersion + " - Copyright 2011-2023 Docaposte");
84+
8585
IModelingSession session = this.module.getModuleContext().getModelingSession();
8686
this.modelChangeHandler = new SysMLModelChangeHandler();
8787
session.addModelHandler(this.modelChangeHandler);
88-
88+
8989
installStyles();
9090
installRamc();
9191
return super.start();
9292
}
9393

94-
94+
9595
@Override
9696
public void stop() throws ModuleException {
9797
this.module.getModuleContext().getModelingSession().removeModelHandler(this.modelChangeHandler);
9898
this.modelChangeHandler = null;
9999
super.stop();
100100
}
101101

102-
102+
103103
private void installRamc() {
104104
Path mdaplugsPath = this.module.getModuleContext().getConfiguration().getModuleResourcesPath();
105-
105+
106106
final IModelComponentService modelComponentService = SysMLModule.getInstance().getModuleContext().getModelioServices().getModelComponentService();
107107
for (IModelComponentDescriptor mc : modelComponentService.getModelComponents()) {
108108
if (mc.getName().equals("SIDefinitions")) {
@@ -114,29 +114,29 @@ private void installRamc() {
114114
}
115115
}
116116
}
117-
117+
118118
// No ramc found, deploy it
119119
modelComponentService.deployModelComponent(new File(mdaplugsPath.resolve("res" + File.separator + "ramc" + File.separator + "SIDefinitions.ramc").toString()), new NullProgressMonitor());
120120
}
121121

122-
122+
123123
private void installStyles() {
124124
Path mdaplugsPath = this.module.getModuleContext().getConfiguration().getModuleResourcesPath();
125-
125+
126126
SysMLModule.getInstance().getModuleContext().getModelioServices().getDiagramService().registerStyle("sysml", "default", new File(mdaplugsPath.resolve("res" + File.separator + "style" + File.separator + "sysml.style").toString()));
127-
127+
128128
SysMLModule.getInstance().getModuleContext().getModelioServices().getDiagramService().registerStyle("sysmlinternal", "default", new File(mdaplugsPath.resolve("res" + File.separator + "style" + File.separator + "sysmlinternal.style").toString()));
129-
129+
130130
SysMLModule.getInstance().getModuleContext().getModelioServices().getDiagramService().registerStyle("sysmlpackage", "default", new File(mdaplugsPath.resolve("res" + File.separator + "style" + File.separator + "sysmlpackage.style").toString()));
131131
}
132132

133-
133+
134134
@Override
135135
public boolean select() throws ModuleException {
136136
return super.select();
137137
}
138138

139-
139+
140140
@Override
141141
public void upgrade(Version oldVersion, Map<String, String> oldParameters) {
142142
Version lastVersion = new Version("2.1.10");
@@ -146,30 +146,30 @@ public void upgrade(Version oldVersion, Map<String, String> oldParameters) {
146146
for (MObject existingPort : existingPorts) {
147147
if (existingPort instanceof Port) {
148148
Port currentPort = (Port) existingPort;
149-
149+
150150
Stereotype flowPortSter = session.getMetamodelExtensions().getStereotype(ISysMLPeerModule.MODULE_NAME, SysMLStereotypes.FLOWPORT, SysMLModule.getInstance().getModuleContext().getModelioServices().getMetamodelService().getMetamodel().getMClass(Port.class));
151-
151+
152152
if (currentPort.isStereotyped(ISysMLPeerModule.MODULE_NAME, SysMLStereotypes.FLOWIN)) {
153-
153+
154154
Stereotype flowINSter = session.getMetamodelExtensions().getStereotype(ISysMLPeerModule.MODULE_NAME, SysMLStereotypes.FLOWIN, SysMLModule.getInstance().getModuleContext().getModelioServices().getMetamodelService().getMetamodel().getMClass(Port.class));
155155
currentPort.setDirection(PortOrientation.IN);
156156
currentPort.getExtension().remove(flowINSter);
157-
157+
158158
} else if (currentPort.isStereotyped(ISysMLPeerModule.MODULE_NAME, SysMLStereotypes.FLOWOUT)) {
159-
159+
160160
Stereotype flowOUTSter = session.getMetamodelExtensions().getStereotype(ISysMLPeerModule.MODULE_NAME, SysMLStereotypes.FLOWOUT, SysMLModule.getInstance().getModuleContext().getModelioServices().getMetamodelService().getMetamodel().getMClass(Port.class));
161161
currentPort.setDirection(PortOrientation.OUT);
162162
currentPort.getExtension().remove(flowOUTSter);
163-
163+
164164
} else if (currentPort.isStereotyped(ISysMLPeerModule.MODULE_NAME, SysMLStereotypes.FLOWINOUT)) {
165-
165+
166166
Stereotype flowINOUTSter = session.getMetamodelExtensions().getStereotype(ISysMLPeerModule.MODULE_NAME, SysMLStereotypes.FLOWINOUT, SysMLModule.getInstance().getModuleContext().getModelioServices().getMetamodelService().getMetamodel().getMClass(Port.class));
167167
currentPort.setDirection(PortOrientation.INOUT);
168168
currentPort.getExtension().remove(flowINOUTSter);
169169
}
170-
170+
171171
currentPort.getExtension().add(flowPortSter);
172-
172+
173173
}
174174
}
175175
}

0 commit comments

Comments
 (0)