Cleans sources

cpswarm · Nov 19, 2019 · 0627706 · 0627706
1 parent 09d7b24
commit 0627706
Show file tree

Hide file tree

Showing 36 changed files with 135 additions and 137 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,13 +36,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.modelio.module</groupId>
-            <artifactId>sysmlarchitect</artifactId>
-            <version>3.8.03</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.modelio</groupId>
             <artifactId>org.eclipse.ui.forms</artifactId>
@@ -51,6 +44,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.8.7</version>
+            <type>jar</type>
+        </dependency>
+
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
@@ -59,10 +59,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.8.7</version>
-            <type>jar</type>
+            <groupId>org.jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>1.1.3</version>
         </dependency>
 
         <dependency>
@@ -73,16 +72,16 @@
         </dependency>
 
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.11.0</version>
-            <type>jar</type>
+            <groupId>org.modelio.module</groupId>
+            <artifactId>sysmlarchitect</artifactId>
+            <version>3.8.03</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.8.7</version>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.11.0</version>
             <type>jar</type>
         </dependency>
 
@@ -94,9 +93,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.1.3</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.8.7</version>
+            <type>jar</type>
         </dependency>
 
     </dependencies>

diff --git a/src/main/conf/module.properties b/src/main/conf/module.properties
@@ -43,8 +43,8 @@ stereotype.BehaviorDiagram.description=
 stereotype.BehaviorDiagram.label=BehaviorDiagram
 stereotype.Controller.description=
 stereotype.Controller.label=Controller
-stereotype.Environment.description=
-stereotype.Environment.label=Environment
+stereotype.EnvironmentDefinition.description=
+stereotype.EnvironmentDefinition.label=Environment
 stereotype.Environment_Defintion.description=
 stereotype.Environment_Defintion.label=Environment Defintion
 stereotype.FitnessFunction.description=

diff --git a/src/main/conf/module.xml b/src/main/conf/module.xml
@@ -2,6 +2,7 @@
 <Module id="${project.name}" class="org.modelio.module.cpswarm.impl.CPSWarmModule" binaryversion="3.8.0" version="${project.version}" schema-level="2" uid="b914be5e-e9d5-4c22-84be-9edec27e429c" author="" image="" url="">
     <ClassPath>
         <PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
+        <PathEntry path="lib/jackson-core-2.8.7.jar"/>
         <PathEntry path="lib/jaxen-1.1.jar"/>
         <PathEntry path="lib/dom4j-1.6.1.jar"/>
         <PathEntry path="lib/jdom-1.0.jar"/>
@@ -10,15 +11,14 @@
         <PathEntry path="lib/xmlParserAPIs-2.6.2.jar"/>
         <PathEntry path="lib/xalan-2.6.0.jar"/>
         <PathEntry path="lib/icu4j-2.6.1.jar"/>
-        <PathEntry path="lib/jackson-core-2.8.7.jar"/>
+        <PathEntry path="lib/jdom-1.1.3.jar"/>
         <PathEntry path="lib/jackson-databind-2.8.7.jar"/>
         <PathEntry path="lib/xercesImpl-2.11.0.jar"/>
         <PathEntry path="lib/jackson-annotations-2.8.7.jar"/>
-        <PathEntry path="lib/jdom-1.1.3.jar"/>
     </ClassPath>
     <Profiles>
         <Profile uid="fb99423e-12d3-4505-926b-f150a22ec337" id="CPSWarm.concept">
-            <Stereotype name="Environment" metaclass="Standard.Class" owner-stereotype="" is-hidden="true" label="%stereotype.Environment.label" uid="308a413a-7415-46f0-b2f5-3a0abc21a4b4" is-abstract="false">
+            <Stereotype name="EnvironmentDefinition" metaclass="Standard.Package" owner-stereotype="" is-hidden="false" label="%stereotype.EnvironmentDefinition.label" uid="308a413a-7415-46f0-b2f5-3a0abc21a4b4" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
@@ -40,11 +40,11 @@
                     <TagType name="seed" uid="f26564b3-a099-4ce4-a6bf-560a2b4f9219" label="%tagtype.null.label" parameter-card="" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype name="Swarm" metaclass="Standard.Class" owner-stereotype="" is-hidden="true" label="%stereotype.Swarm.label" uid="b7712590-a4be-4290-b91e-1e8e27d8005c" is-abstract="false">
+            <Stereotype name="Swarm" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.Swarm.label" uid="b7712590-a4be-4290-b91e-1e8e27d8005c" is-abstract="false">
                 <Icon path="res/icon/gui/swarm.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype name="Swarm_Member" metaclass="Standard.Class" owner-stereotype="" is-hidden="true" label="%stereotype.Swarm_Member.label" uid="716ed069-c82d-4d0e-a2c8-c19ca8eeb165" is-abstract="false">
+            <Stereotype name="Swarm_Member" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.Swarm_Member.label" uid="716ed069-c82d-4d0e-a2c8-c19ca8eeb165" is-abstract="false">
                 <Icon path="res/icon/gui/swarmmember.png"/>
                 <Image path=""/>
             </Stereotype>
@@ -78,11 +78,11 @@
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype name="SwarmMember_Architecture" metaclass="Standard.CompositeStructureDiagram" owner-stereotype="" is-hidden="true" label="%stereotype.SwarmMember_Architecture.label" uid="6bf28b61-a789-409c-b045-906917cbe3ac" is-abstract="false">
+            <Stereotype name="SwarmMember_Architecture" metaclass="Standard.CompositeStructureDiagram" owner-stereotype="" is-hidden="false" label="%stereotype.SwarmMember_Architecture.label" uid="6bf28b61-a789-409c-b045-906917cbe3ac" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype name="Swarm_Definition" metaclass="Standard.ClassDiagram" owner-stereotype="" is-hidden="true" label="%stereotype.Swarm_Definition.label" uid="049f3c35-2a0b-46d7-8f07-6b69fca92b32" is-abstract="false">
+            <Stereotype name="Swarm_Definition" metaclass="Standard.ClassDiagram" owner-stereotype="" is-hidden="false" label="%stereotype.Swarm_Definition.label" uid="049f3c35-2a0b-46d7-8f07-6b69fca92b32" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>

diff --git a/src/main/conf/module_fr.properties b/src/main/conf/module_fr.properties
@@ -43,8 +43,8 @@ stereotype.BehaviorDiagram.description=
 stereotype.BehaviorDiagram.label=BehaviorDiagram
 stereotype.Controller.description=
 stereotype.Controller.label=
-stereotype.Environment.description=
-stereotype.Environment.label=Environment
+stereotype.EnvironmentDefinition.description=
+stereotype.EnvironmentDefinition.label=EnvironmentDefinition
 stereotype.Environment_Defintion.description=
 stereotype.Environment_Defintion.label=Environment_Defintion
 stereotype.FitnessFunction.description=

diff --git a/src/main/conf/res/generated/patterns/Framework.umlt b/src/main/conf/res/generated/patterns/Framework.umlt
diff --git a/src/main/java/es/addlink/tutormates/equationEditor/Manager/MainToolBarBaseManager.java b/src/main/java/es/addlink/tutormates/equationEditor/Manager/MainToolBarBaseManager.java
@@ -21,15 +21,15 @@
  */
 @objid ("d706dd26-667c-491e-a6bc-0efb623b4660")
 public class MainToolBarBaseManager {
-    @objid ("25658737-9ee0-4783-b1af-d8ac98bc482a")
+    @objid ("c80394de-ef00-43e0-9c4b-1f0493b7dbca")
+    private Document docToolBarBase;
+
+    @objid ("d7e28c78-07ca-4f48-bbdf-65da1fc28ff4")
     private List<TabToolBar> tabToolBarList;
 
-    @objid ("51a3d21c-8518-41d5-b8b4-fb6a1426dba9")
+    @objid ("af9b5633-3c9d-4327-bcd5-739ad6b4189c")
     private List<ItemToolBar> itemToolBarList;
 
-    @objid ("ff605871-9026-42df-ad2f-58d16e7dc894")
-    private Document docToolBarBase;
-
     @objid ("3ccb39a7-4918-4599-8a69-169df973384a")
     public MainToolBarBaseManager() {
         this.tabToolBarList = new Vector<>();

diff --git a/src/main/java/es/addlink/tutormates/equationEditor/Manager/OperatorsBaseManager.java b/src/main/java/es/addlink/tutormates/equationEditor/Manager/OperatorsBaseManager.java
@@ -20,18 +20,18 @@
  */
 @objid ("f9baedeb-2d26-4d44-9d4a-b44965d56866")
 public class OperatorsBaseManager {
-    @objid ("4ea9f369-018d-41d4-90ee-9b6a765cdc29")
+    @objid ("6db38b0b-d36e-41dd-b05f-972858e14186")
+    private Document doc;
+
+    @objid ("55126518-4c65-4be6-ac91-5682ac679040")
     private List<BaseOperator> numbersVariablesList;
 
-    @objid ("f28dd37e-3a66-4b06-9b3c-640b1e056d19")
+    @objid ("c77f100d-5103-4ec9-9d14-f957608173b8")
     private List<BaseOperator> operatorsList;
 
-    @objid ("3be3e507-e459-49b7-b843-24cf3f970f13")
+    @objid ("0733b470-19d3-4c00-a8e8-144246454b47")
     private List<BaseFunction> functionsList;
 
-    @objid ("bd9cda68-9a40-4ae4-85a7-7389262369a5")
-    private Document doc;
-
     @objid ("93fc23f6-7ff2-4a16-9490-a731f84f4d62")
     public OperatorsBaseManager() {
         try {

diff --git a/src/main/java/es/addlink/tutormates/equationEditor/MathEditor/Binary.java b/src/main/java/es/addlink/tutormates/equationEditor/MathEditor/Binary.java
@@ -13,13 +13,13 @@ public class Binary extends MathEditor {
     /**
      * Parte izquierda del objeto binario.
      */
-    @objid ("758bc1a9-892e-453d-ac5f-7b57df2d8913")
+    @objid ("24062e84-7a9c-4372-b866-f1e0e6218ed1")
     private MathEditor leftChild = null;
 
     /**
      * Parte derecha del objeto binario.
      */
-    @objid ("76f371e3-bb8c-481b-8d1d-cf34a3c330a2")
+    @objid ("b3d8466d-3d2e-4bc8-bc86-8606fad8dd9c")
     private MathEditor rightChild = null;
 
     /**

diff --git a/src/main/java/es/addlink/tutormates/equationEditor/Role/AllowedOperatorsAndFunctions.java b/src/main/java/es/addlink/tutormates/equationEditor/Role/AllowedOperatorsAndFunctions.java
@@ -5,18 +5,16 @@
 import java.util.Vector;
 import com.modeliosoft.modelio.javadesigner.annotations.objid;
 import es.addlink.tutormates.equationEditor.Formats.MathML.MathML;
-import es.addlink.tutormates.equationEditor.Role.BaseFunction;
-import es.addlink.tutormates.equationEditor.Role.BaseOperator;
 
 @objid ("6dfae0ab-7daa-42df-98a6-9a0ca24742cb")
 public class AllowedOperatorsAndFunctions {
-    @objid ("e48eff30-7a66-45aa-acf7-6453249e8773")
+    @objid ("564852ee-ff0c-4548-9575-b631f339ebcc")
     private List<BaseFunction> functionsList;
 
-    @objid ("da71ae4b-c5a5-49a4-bc5a-759f7352c4d4")
+    @objid ("63097e52-7627-41dd-bf08-c0afe06090fa")
     private List<BaseOperator> numbersVariablesList;
 
-    @objid ("5256a101-9050-44e7-a0e8-b06bcfff4207")
+    @objid ("297dbd55-76c1-4ed0-ae9c-635268fca0d2")
     private List<BaseOperator> operatorsList;
 
     @objid ("8f17a6c9-8f21-4785-84e2-75217f27a4ae")

diff --git a/src/main/java/es/addlink/tutormates/equationEditor/Translation/MathML2MathEditor.java b/src/main/java/es/addlink/tutormates/equationEditor/Translation/MathML2MathEditor.java
@@ -42,9 +42,15 @@ public class MathML2MathEditor {
     /**
      * Document del mathML.
      */
-    @objid ("8c047a1b-8b50-42ef-9222-2ec3aa110c31")
+    @objid ("c72c7d5c-5234-4fab-b92c-e0ea13430804")
     private Document doc;
 
+    /**
+     * List de componentes Element que pasará de estado normal a invertido (para su procesamiento).
+     */
+    @objid ("a98ce2b5-40f0-43a4-a64d-cd4e49f2b249")
+    private List<Element> mathmlList;
+
     /**
      * Manager global del editor de expresiones.
      */
@@ -57,12 +63,6 @@ public class MathML2MathEditor {
     @objid ("7776dc23-4ed5-4dc6-ac15-a7733278d51d")
     private MathEditor mathEditor;
 
-    /**
-     * List de componentes Element que pasará de estado normal a invertido (para su procesamiento).
-     */
-    @objid ("51e2e553-dac0-411e-bb13-034bc63ec9d7")
-    private List<Element> mathmlList;
-
     /**
      * Invierte un List de componentes Element. También invierte sus hojas.
      * @param list Lista que se desea invertir.

diff --git a/src/main/java/org/modelio/module/cpswarm/command/explorer/CPDTCommand.java b/src/main/java/org/modelio/module/cpswarm/command/explorer/CPDTCommand.java
@@ -44,22 +44,22 @@ public class CPDTCommand extends DefaultModuleCommandHandler {
     @objid ("ee4b3302-5562-4cb3-8587-efe1a83b0aed")
     protected String _descriptionGeneration = "Generation Complete";
 
-    @objid ("81a31850-5ebd-4be4-a3d8-c84438427560")
+    @objid ("85487930-89d6-4f30-ba4c-14e889087a40")
     protected Shell _shell;
 
-    @objid ("6731374e-a5ce-41d6-89b7-0354f9646f41")
+    @objid ("11aee0a3-79de-4739-b229-202333c65c58")
     protected ModelTree _selectedElt;
 
-    @objid ("aeff4842-2af5-4b86-a7e8-53224642b594")
+    @objid ("4784b710-e010-4734-8824-ce634f16aea6")
     protected IModule _module;
 
-    @objid ("512c02d9-47fa-451c-a03e-5d0bb9171949")
+    @objid ("50e2b3a0-e2e1-45cd-b854-b7a8c9e78db4")
     protected Text _nameText;
 
-    @objid ("a76d010f-88c2-4964-b727-181782265865")
+    @objid ("064e05b3-ee7c-4bf6-9e71-29a57e6bf45a")
     protected Text _descriptionText;
 
-    @objid ("18f943de-534c-435f-826b-15d5777cc7fd")
+    @objid ("c5b00a4c-966c-42aa-9b89-27bd08c5b8e9")
     protected List<org.modelio.metamodel.uml.statik.Class> _behaviours;
 
     @objid ("9173180e-60b7-45e2-b669-b44431e955c4")

diff --git a/src/main/java/org/modelio/module/cpswarm/generator/FitnessFunctionGeneration.java b/src/main/java/org/modelio/module/cpswarm/generator/FitnessFunctionGeneration.java
@@ -17,15 +17,15 @@
 
 @objid ("6ef2520d-29f4-455e-acb6-b1ea90a86b4a")
 public class FitnessFunctionGeneration extends Generator implements IGenerator {
-    @objid ("5612587d-a879-477a-917d-127be05cfc50")
-    private Class ff = null;
-
-    @objid ("79fd3062-dc2e-445f-9318-84575eb0a4fc")
+    @objid ("0df9e479-de37-4bb5-a398-c30c84911d2c")
     private List<BindableInstance> fcts = new ArrayList<>();
 
-    @objid ("364291e1-cb5c-4e32-8e25-e77a18d42140")
+    @objid ("f105b40b-0c10-4c01-8fbe-3a68bfa8169c")
     private Set<Classifier> FCT = new HashSet<>();
 
+    @objid ("5612587d-a879-477a-917d-127be05cfc50")
+    private Class ff = null;
+
     @objid ("166feae3-a210-4535-be3c-160b11aa44e2")
     public FitnessFunctionGeneration(Class ff) {
         this.ff = ff;

diff --git a/src/main/java/org/modelio/module/cpswarm/generator/JavaGeneration.java b/src/main/java/org/modelio/module/cpswarm/generator/JavaGeneration.java
@@ -8,10 +8,10 @@
 
 @objid ("30794e5c-04b1-4605-8c3d-23242490be81")
 public class JavaGeneration extends Generator implements IGenerator {
-    @objid ("96c0853c-1a21-4233-b519-827c90ccc44a")
+    @objid ("41b6769e-193a-473b-b055-f0c554db6b10")
     private org.modelio.metamodel.uml.statik.Class agent = null;
 
-    @objid ("7be8fcc8-4569-480e-a0c5-e71c33210ac7")
+    @objid ("b0491428-667f-4552-b1bc-9e78930731de")
     private org.modelio.metamodel.uml.statik.Class environment = null;
 
     @objid ("34e36b24-2bea-4b4b-8a2a-c0204c410845")

diff --git a/src/main/java/org/modelio/module/cpswarm/generator/ProjectGeneration.java b/src/main/java/org/modelio/module/cpswarm/generator/ProjectGeneration.java
@@ -22,25 +22,25 @@ public class ProjectGeneration {
     @objid ("93a25939-6897-4e12-bc48-a62f83a1fb3f")
     private String frevopath = "";
 
-    @objid ("27194117-fac3-4b77-b54d-4d682adf8153")
+    @objid ("83ebc1c3-8815-4df7-8f3e-629663ca6808")
     private org.modelio.metamodel.uml.statik.Class problem = null;
 
-    @objid ("94614f03-7973-44ee-a5ff-a75c41ac4631")
+    @objid ("6721bd9e-e3ac-4691-a489-46d4ed02f5a4")
     private org.modelio.metamodel.uml.statik.Class swarm = null;
 
-    @objid ("8ff8490f-c819-4e36-b4d3-7c804a743e4f")
+    @objid ("c8470ea1-2c42-462a-b58e-c5f42af0a3ab")
     private org.modelio.metamodel.uml.statik.Class agent = null;
 
-    @objid ("8e228419-b682-4249-8400-ce99f0e32520")
+    @objid ("952244c3-5a66-4422-95cb-a910bed29a65")
     private org.modelio.metamodel.uml.statik.Class environment = null;
 
-    @objid ("27e5c121-1c6b-4ef0-8fe7-1ef0fcc4c459")
+    @objid ("ec836d6d-3c76-4532-9111-e50cc4d29571")
     private List<org.modelio.metamodel.uml.statik.Class> environmentRelated = new ArrayList<>();
 
-    @objid ("f83a682a-be95-4856-8dd7-f40e3dec3933")
+    @objid ("e2d034a6-bf67-499e-a28c-3f87b71431dd")
     private org.modelio.metamodel.uml.statik.Class costFunction = null;
 
-    @objid ("88e14d62-a2fb-4882-b439-ceccbf89cd01")
+    @objid ("4fb0c884-a8af-4357-b8e1-aa62349b8fa0")
     private org.modelio.metamodel.uml.statik.Class controller = null;
 
     @objid ("60a6a8f7-a208-4a41-82a2-5f4dfb56e99c")

diff --git a/src/main/java/org/modelio/module/cpswarm/generator/SCXMLGeneration.java b/src/main/java/org/modelio/module/cpswarm/generator/SCXMLGeneration.java
@@ -14,7 +14,7 @@
 
 @objid ("fdb1f4b4-5988-41a6-bd42-b8398c300696")
 public class SCXMLGeneration extends Generator implements IGenerator {
-    @objid ("83eee40a-903d-49dd-9606-78e176d4675d")
+    @objid ("860872d3-82f4-4618-b7a0-1636b3f3ad40")
     private StateMachine sm = null;
 
     @objid ("9ba83793-0016-4f2d-b0ca-187e9703774a")

diff --git a/src/main/java/org/modelio/module/cpswarm/generator/XMLGeneration.java b/src/main/java/org/modelio/module/cpswarm/generator/XMLGeneration.java
@@ -20,19 +20,19 @@ public class XMLGeneration extends Generator implements IGenerator {
     @objid ("fef15994-8bec-483a-a3ae-7e7ab3fd7336")
     private String rosPath = "";
 
-    @objid ("ec35ec4c-9d99-4677-a240-0b2155bab953")
+    @objid ("8fc6b762-3efd-4770-89dd-c9799037553c")
     private org.modelio.metamodel.uml.statik.Class problem = null;
 
-    @objid ("c61efe03-4b49-4a12-bb72-fa74b93cbfd2")
+    @objid ("1bacfbbc-88f1-4e53-a140-1487816e4706")
     private org.modelio.metamodel.uml.statik.Class costFunction = null;
 
-    @objid ("9a228b80-4aff-4ca7-98ee-017d35e234c2")
+    @objid ("9e29c19f-a735-47d0-ba5e-c2daf2167979")
     private org.modelio.metamodel.uml.statik.Class swarm = null;
 
-    @objid ("613c7374-69fe-41cb-b617-eda5a1422999")
+    @objid ("d39cd338-552b-443e-b8e5-4021df4c45fd")
     private org.modelio.metamodel.uml.statik.Class environment = null;
 
-    @objid ("7508dd79-bd3d-42f7-b040-954d56818eed")
+    @objid ("a38f95c0-434f-4198-bbf2-dc3f628dc440")
     private org.modelio.metamodel.uml.statik.Class controller = null;
 
     @objid ("c217f848-600b-461c-9b7f-c1d43407a303")