update src

remove objId, update to Modelio 4.1
Modelio-R-D · Oct 16, 2020 · 8ca9eb0 · 8ca9eb0
1 parent bfe4f91
commit 8ca9eb0
Show file tree

Hide file tree

Showing 116 changed files with 517 additions and 1,509 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <!-- definition -->
   <groupId>org.modelio.module</groupId>
   <artifactId>variabilitydesigner</artifactId>
-  <version>1.3.01</version>
+  <version>1.4.00</version>
   <name>VariabilityDesigner</name>
   <repositories>
       <repository>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.modelio</groupId>
             <artifactId>MDAKit</artifactId>
-            <version>[4.0.0,4.0.1)</version>
+            <version>[4.1.0,4.2.0)</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -57,7 +57,7 @@
             <plugin>
                 <groupId>org.modelio</groupId>
                 <artifactId>modelio-maven-plugin</artifactId>
-                <version>4.0.0.00</version>
+                <version>4.1.0.00</version>
                 <executions>
                     <execution>
                         <id>ModuleValidation</id>
@@ -181,7 +181,7 @@
                                                 modelio-maven-plugin
                                             </artifactId>
                                             <versionRange>
-                                                [4.0.0.00,)
+                                                [4.1.0.00,)
                                             </versionRange>
                                             <goals>
                                                 <goal>

diff --git a/src/main/conf/module.xml b/src/main/conf/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Module id="${project.name}" class="org.modelio.module.variabilitydesigner.impl.VariabilityDesignerModule" binaryversion="4.0.0" version="${project.version}" schema-level="2" uid="b344afb4-c0f7-44d1-9b1e-b27b0deaf5ac" author="Softeam" image="" url="">
+<Module id="${project.name}" class="org.modelio.module.variabilitydesigner.impl.VariabilityDesignerModule" binaryversion="4.1.0" version="${project.version}" schema-level="2" uid="b344afb4-c0f7-44d1-9b1e-b27b0deaf5ac" author="Softeam" image="" url="">
     <ClassPath>
         <PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
     </ClassPath>
@@ -205,6 +205,12 @@
                     <HParameter name="name" value="Root"/>
                 </Handler>
             </Command>
+            <Command id="Add_Variation_Point" label="%command.Add_Variation_Point.label" tooltip="%command.Add_Variation_Point.tooltip" image="" modify-model="false">
+                <Scope metaclass="Infrastructure.ModelElement" stereotype=""/>
+                <Handler class="org.modelio.module.variabilitydesigner.handlers.commands.addVariationPoint">
+                    <HParameter name="metaclass" value="Standard.Constraint"/>
+                </Handler>
+            </Command>
         </Commands>
         <Tools>
             <Tool id="Add_alternative_variation" label="%tool.Add_alternative_variation.label" tooltip="%tool.Add_alternative_variation.tooltip" image="res/icon/gui/alternative16.png">
@@ -447,7 +453,9 @@
             </DiagramType>
         </Diagrams>
         <Views>
-            <PropertyPage id="Variations" class="org.modelio.module.variabilitydesigner.handlers.propertypage.VariabilityPropertyPage" label="%propertypage.Variations.label" image="res/icon/gui/variability16.png"/>
+            <PropertyPage id="Variations" class="org.modelio.module.variabilitydesigner.handlers.propertypage.VariabilityPropertyPage" label="%propertypage.Variations.label" image="res/icon/gui/variability16.png">
+                <CommandRef refid="Add_Variation_Point" group="" group-image=""/>
+            </PropertyPage>
         </Views>
     </Gui>
     <Resources>

diff --git a/src/main/conf/module_fr.properties b/src/main/conf/module_fr.properties
@@ -1,6 +1,8 @@
 ModuleDescription=Variability Designer is a Modelio Module that allows Modelio users to manage variability on UML/SysML models. It allows to create 150% Models and generate variant model based on VEL configuration file.
 ModuleLabel=VariabilityDesigner
 
+command.Add_Variation_Point.label=Add_Variation_Point
+command.Add_Variation_Point.tooltip=
 command.Check_Conformance.label=Check Conformance
 command.Check_Conformance.tooltip=
 command.Feature_Diagram.label=Feature Diagram

diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/IVariabilityDesignerPeerModule.java b/src/main/java/org/modelio/module/variabilitydesigner/api/IVariabilityDesignerPeerModule.java
@@ -1,11 +1,8 @@
 package org.modelio.module.variabilitydesigner.api;
 
-import com.modeliosoft.modelio.javadesigner.annotations.objid;
 import org.modelio.api.module.IPeerModule;
 
-@objid ("ab841c5e-fa06-49be-82cc-17936b3b40fd")
 public interface IVariabilityDesignerPeerModule extends IPeerModule {
-    @objid ("f8e6ce16-1bc1-480e-a5c4-daee0fa6dd1e")
     public static final String MODULE_NAME = "VariabilityDesigner";
 
 }
diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerParameters.java b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerParameters.java
@@ -1,7 +1,5 @@
 package org.modelio.module.variabilitydesigner.api;
 
-import com.modeliosoft.modelio.javadesigner.annotations.objid;
 
-@objid ("0f939752-1bdc-4b81-b540-089ed95c42e2")
 public interface VariabilityDesignerParameters {
 }