api upgrade for current version of gemoc studio

contributes to #5
gemoc · Jun 5, 2024 · 46c0ffc · 46c0ffc
1 parent b909fa8
commit 46c0ffc
Show file tree

Hide file tree

Showing 172 changed files with 688 additions and 784 deletions.
diff --git a/...ncurrency/org.gemoc.arduino.concurrent.moc.dse/.settings/org.eclipse.core.resources.prefs b/...ncurrency/org.gemoc.arduino.concurrent.moc.dse/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/.project b/dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/.project
@@ -31,12 +31,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageBuilder</name>
+			<name>org.eclipse.gemoc.xdsmlframework.ide.ui.GemocLanguageProjectBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.gemoc.xdsmlframework.ide.ui.GemocLanguageProjectNature</nature>
 		<nature>org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>

diff --git a/...currency/org.gemoc.arduino.concurrent.xarduino/.settings/org.eclipse.core.resources.prefs b/...currency/org.gemoc.arduino.concurrent.xarduino/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/META-INF/MANIFEST.MF b/...language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/META-INF/MANIFEST.MF
@@ -1,25 +1,28 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: org.gemoc.arduino.concurrent.xarduino
-Bundle-SymbolicName: org.gemoc.arduino.concurrent.xarduino;singleton:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:="reexport",
- fr.inria.diverse.k3.al.annotationprocessor.plugin,
- fr.inria.diverse.melange,
- org.eclipse.xtext.xbase.lib,
- com.google.guava,
- org.eclipse.xtend.lib,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version=0.0.0;visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.gemoc.arduino.concurrent.xarduino;singleton:=true
+Automatic-Module-Name: org.gemoc.arduino.concurrent.xarduino
+Bundle-Version: 0.1.0
+Bundle-ClassPath: .
 Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ fr.inria.diverse.k3.al.annotationprocessor.plugin,
+ fr.inria.diverse.melange,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.gemoc.xdsmlframework.api;bundle-version="4.0.0";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:=reexport,
+ org.eclipse.gemoc.executionframework.engine;bundle-version="4.0.0";visibility:=reexport,
+ com.google.guava,
+ org.eclipse.xtend.lib,
+ org.eclipse.emf.common,
+ org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.gemoc.execution.concurrent.ccsljavaxdsml.api
+Bundle-ActivationPolicy: lazy
 Export-Package: org.gemoc.arduino.concurrent.xarduino.aspects,
  org.gemoc.arduino.concurrent.xarduino.arduino,
  org.gemoc.arduino.concurrent.xarduino.arduino.impl,
  org.gemoc.arduino.concurrent.xarduino.arduino.util
-Bundle-Name: %pluginName
-Bundle-Version: 0.1.0
-Bundle-ClassPath: .
-Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/XArduino.dsl b/dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/XArduino.dsl
@@ -2,4 +2,8 @@ name = org.gemoc.arduino.concurrent.XArduino
 
  ecore = platform:/resource/org.gemoc.arduino.concurrent.xarduino/model/XArduino.ecore
 
- k3 = org.gemoc.arduino.concurrent.xarduino.aspects.Control_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BooleanVariable_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BluetoothTransceiver_PushAspect,org.gemoc.arduino.concurrent.xarduino.aspects.VariableAssignment_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BinaryExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Variable_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.IntegerModuleGet_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BinaryIntegerExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Control_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Delay_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.VariableRef_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Module_UtilitiesAspect,org.gemoc.arduino.concurrent.xarduino.aspects.If_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.IntegerVariable_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.VariableDeclaration_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Pin_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.PushButton_ToggleAspect,org.gemoc.arduino.concurrent.xarduino.aspects.IntegerExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspect,org.gemoc.arduino.concurrent.xarduino.aspects.IntegerConstant_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Utilities_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.ModuleInstruction_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Project_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Repeat_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Constant_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BooleanConstant_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.While_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.ModuleAssignment_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BooleanExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BooleanModuleGet_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Instruction_ExecutableAspect
+ k3 = org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BinaryExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BinaryIntegerExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BluetoothTransceiver_PushAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BooleanConstant_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BooleanExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BooleanModuleGet_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.BooleanVariable_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Constant_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Control_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Control_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Delay_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.If_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Instruction_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.IntegerConstant_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.IntegerExpression_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.IntegerModuleGet_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.IntegerVariable_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.ModuleAssignment_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.ModuleInstruction_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Module_UtilitiesAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Pin_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Project_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.PushButton_ToggleAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Repeat_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Utilities_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.VariableAssignment_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.VariableDeclaration_ExecutableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.VariableRef_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.Variable_EvaluableAspect,org.gemoc.arduino.concurrent.xarduino.aspects.While_EvaluableAspect
+
+ ecl = /org.gemoc.arduino.concurrent.moc.dse/ecl/arduinoML.ecl
+
+ metaprog = org.eclipse.gemoc.metaprog.moccml
diff --git a/dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/build.properties b/dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/build.properties
@@ -1,4 +1,4 @@
 #
-#Thu Oct 24 18:07:14 CEST 2019
+#Wed Jun 05 17:15:01 CEST 2024
 bin.includes=META-INF/,.,plugin.xml,plugin.properties,model/,XArduino.dsl
 source..=src,\n  src-gen
diff --git a/...language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/model/XArduino.ecore b/...language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/model/XArduino.ecore
@@ -51,13 +51,13 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="module" lowerBound="1" eType="//Module"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Control" abstract="true" eSuperTypes="//Instruction">
-    <eOperations name="execute">
-      <eAnnotations source="aspect"/>
-    </eOperations>
     <eOperations name="evaluate">
       <eAnnotations source="aspect"/>
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
     </eOperations>
+    <eOperations name="execute">
+      <eAnnotations source="aspect"/>
+    </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" eType="//Block" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Utilities" abstract="true" eSuperTypes="//Instruction">

diff --git a/...guage_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/model/XArduino.genmodel b/...guage_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/model/XArduino.genmodel
@@ -177,10 +177,10 @@
         <ecoreFeature xsi:type="ecore:EReference" href="XArduino.ecore#//Control/block"/>
       </genFeatures>
       <genOperations>
-        <ecoreOperation href="XArduino.ecore#//Control/execute"/>
+        <ecoreOperation href="XArduino.ecore#//Control/evaluate"/>
       </genOperations>
       <genOperations>
-        <ecoreOperation href="XArduino.ecore#//Control/evaluate"/>
+        <ecoreOperation href="XArduino.ecore#//Control/execute"/>
       </genOperations>
     </genClasses>
     <genClasses image="false">

diff --git a/dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/plugin.xml b/dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/plugin.xml
@@ -5,7 +5,17 @@
     <!-- @generated XArduino -->
     <package uri="http://org.gemoc.arduino.concurrent.xarduino/arduino/" class="org.gemoc.arduino.concurrent.xarduino.arduino.ArduinoPackage" genModel="model/XArduino.genmodel" />
   </extension>
-  <extension point="org.eclipse.gemoc.gemoc_language_workbench.sequential.xdsml">
-    <XDSML_Definition name="org.gemoc.arduino.concurrent.XArduino" xdsmlFilePath="platform:/plugin/org.gemoc.arduino.concurrent.xarduino/XArduino.dsl" modelLoader_class="org.eclipse.gemoc.executionframework.extensions.sirius.modelloader.DefaultModelLoader" />
+  <extension point="org.eclipse.gemoc.gemoc_language_workbench.xdsml">
+    <XDSML_Definition name="org.gemoc.arduino.concurrent.XArduino" xdsmlFilePath="/org.gemoc.arduino.concurrent.xarduino/XArduino.dsl" modelLoader_class="org.eclipse.gemoc.executionframework.extensions.sirius.modelloader.DefaultModelLoader" />
+  </extension>
+  <extension
+        point="org.eclipse.gemoc.gemoc_language_workbench.moccml.xdsml.addition">
+     <MOCCML_XDSML_Addition
+           name="org.gemoc.arduino.concurrent.XArduino"
+           referencedXDSMLName="org.gemoc.arduino.concurrent.XArduino"
+            solver_class="org.eclipse.gemoc.execution.concurrent.ccsljavaengine.extensions.timesquare.moc.impl.CcslSolver"
+            toCCSLQVTOFilePath="/org.gemoc.arduino.concurrent.moc.dse/qvto-gen/modeling/arduinoML.qvto"
+            codeExecutor_class="sigpml.xdsml.api.impl.SigPMLCodeExecutor" >
+     </MOCCML_XDSML_Addition>
   </extension>
 </plugin>
diff --git a/.../org/gemoc/arduino/concurrent/xarduino/aspects/ArduinoCommunicationModule_PushAspect.java b/.../org/gemoc/arduino/concurrent/xarduino/aspects/ArduinoCommunicationModule_PushAspect.java
@@ -3,7 +3,6 @@
 import fr.inria.diverse.k3.al.annotationprocessor.Abstract;
 import fr.inria.diverse.k3.al.annotationprocessor.Aspect;
 import org.gemoc.arduino.concurrent.xarduino.arduino.ArduinoCommunicationModule;
-import org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties;
 
 @Aspect(className = ArduinoCommunicationModule.class)
 @SuppressWarnings("all")
@@ -24,7 +23,7 @@ public static void push(final ArduinoCommunicationModule _self) {
 	}
 	;
 }
-  
+
   protected static void _privk3_push(final ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties _self_, final ArduinoCommunicationModule _self) {
     throw new java.lang.RuntimeException("Not implemented");
   }

diff --git a/...aspects/ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext.java b/...aspects/ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext.java
@@ -2,20 +2,19 @@
 
 import java.util.Map;
 import org.gemoc.arduino.concurrent.xarduino.arduino.ArduinoCommunicationModule;
-import org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties;
 
 @SuppressWarnings("all")
 public class ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext {
-  public final static ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext INSTANCE = new ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext();
-  
+  public static final ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext INSTANCE = new ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext();
+
   public static ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties getSelf(final ArduinoCommunicationModule _self) {
     		if (!INSTANCE.map.containsKey(_self))
     			INSTANCE.map.put(_self, new org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties());
     		return INSTANCE.map.get(_self);
   }
-  
+
   private Map<ArduinoCommunicationModule, ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties> map = new java.util.WeakHashMap<org.gemoc.arduino.concurrent.xarduino.arduino.ArduinoCommunicationModule, org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties>();
-  
+
   public Map<ArduinoCommunicationModule, ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties> getMap() {
     return map;
   }

diff --git a/...rg/gemoc/arduino/concurrent/xarduino/aspects/BinaryBooleanExpression_EvaluableAspect.java b/...rg/gemoc/arduino/concurrent/xarduino/aspects/BinaryBooleanExpression_EvaluableAspect.java
@@ -12,14 +12,6 @@
 import org.gemoc.arduino.concurrent.xarduino.arduino.IntegerConstant;
 import org.gemoc.arduino.concurrent.xarduino.arduino.IntegerModuleGet;
 import org.gemoc.arduino.concurrent.xarduino.arduino.IntegerVariableRef;
-import org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties;
-import org.gemoc.arduino.concurrent.xarduino.aspects.BinaryIntegerExpression_EvaluableAspect;
-import org.gemoc.arduino.concurrent.xarduino.aspects.BooleanConstant_ExecutableAspect;
-import org.gemoc.arduino.concurrent.xarduino.aspects.BooleanExpression_EvaluableAspect;
-import org.gemoc.arduino.concurrent.xarduino.aspects.BooleanModuleGet_ExecutableAspect;
-import org.gemoc.arduino.concurrent.xarduino.aspects.IntegerConstant_ExecutableAspect;
-import org.gemoc.arduino.concurrent.xarduino.aspects.IntegerModuleGet_ExecutableAspect;
-import org.gemoc.arduino.concurrent.xarduino.aspects.VariableRef_EvaluableAspect;
 
 @Aspect(className = BinaryBooleanExpression.class, with = { BooleanExpression_EvaluableAspect.class })
 @SuppressWarnings("all")
@@ -33,12 +25,12 @@ public static Object evaluate(final BinaryBooleanExpression _self) {
 	;
 	return (java.lang.Object) result;
 }
-  
+
   private static Object super_evaluate(final BinaryBooleanExpression _self) {
     final org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspectExpressionAspectProperties _self_ = org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspectExpressionAspectContext.getSelf(_self);
     return  org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspect._privk3_evaluate(_self_, _self);
   }
-  
+
   protected static Object _privk3_evaluate(final BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties _self_, final BinaryBooleanExpression _self) {
     boolean leftIsBoolean = false;
     boolean rightIsBoolean = false;

diff --git a/.../aspects/BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext.java b/.../aspects/BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext.java
@@ -2,20 +2,19 @@
 
 import java.util.Map;
 import org.gemoc.arduino.concurrent.xarduino.arduino.BinaryBooleanExpression;
-import org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties;
 
 @SuppressWarnings("all")
 public class BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext {
-  public final static BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext INSTANCE = new BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext();
-  
+  public static final BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext INSTANCE = new BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext();
+
   public static BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties getSelf(final BinaryBooleanExpression _self) {
     		if (!INSTANCE.map.containsKey(_self))
     			INSTANCE.map.put(_self, new org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties());
     		return INSTANCE.map.get(_self);
   }
-  
+
   private Map<BinaryBooleanExpression, BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties> map = new java.util.WeakHashMap<org.gemoc.arduino.concurrent.xarduino.arduino.BinaryBooleanExpression, org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties>();
-  
+
   public Map<BinaryBooleanExpression, BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties> getMap() {
     return map;
   }

diff --git a/...c-gen/org/gemoc/arduino/concurrent/xarduino/aspects/BinaryExpression_EvaluableAspect.java b/...c-gen/org/gemoc/arduino/concurrent/xarduino/aspects/BinaryExpression_EvaluableAspect.java
@@ -2,7 +2,6 @@
 
 import fr.inria.diverse.k3.al.annotationprocessor.Aspect;
 import org.gemoc.arduino.concurrent.xarduino.arduino.BinaryExpression;
-import org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspect;
 
 @Aspect(className = BinaryExpression.class)
 @SuppressWarnings("all")

diff --git a/...rrent/xarduino/aspects/BinaryExpression_EvaluableAspectBinaryExpressionAspectContext.java b/...rrent/xarduino/aspects/BinaryExpression_EvaluableAspectBinaryExpressionAspectContext.java
@@ -2,20 +2,19 @@
 
 import java.util.Map;
 import org.gemoc.arduino.concurrent.xarduino.arduino.BinaryExpression;
-import org.gemoc.arduino.concurrent.xarduino.aspects.BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties;
 
 @SuppressWarnings("all")
 public class BinaryExpression_EvaluableAspectBinaryExpressionAspectContext {
-  public final static BinaryExpression_EvaluableAspectBinaryExpressionAspectContext INSTANCE = new BinaryExpression_EvaluableAspectBinaryExpressionAspectContext();
-  
+  public static final BinaryExpression_EvaluableAspectBinaryExpressionAspectContext INSTANCE = new BinaryExpression_EvaluableAspectBinaryExpressionAspectContext();
+
   public static BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties getSelf(final BinaryExpression _self) {
     		if (!INSTANCE.map.containsKey(_self))
     			INSTANCE.map.put(_self, new org.gemoc.arduino.concurrent.xarduino.aspects.BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties());
     		return INSTANCE.map.get(_self);
   }
-  
+
   private Map<BinaryExpression, BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties> map = new java.util.WeakHashMap<org.gemoc.arduino.concurrent.xarduino.arduino.BinaryExpression, org.gemoc.arduino.concurrent.xarduino.aspects.BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties>();
-  
+
   public Map<BinaryExpression, BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties> getMap() {
     return map;
   }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8