Skip to content

Commit 46c0ffc

Browse files
dvojtisedvojtise
committed
api upgrade for current version of gemoc studio
contributes to #5
1 parent b909fa8 commit 46c0ffc

File tree

172 files changed

+688
-784
lines changed

Some content is hidden

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

172 files changed

+688
-784
lines changed

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.moc.dse/.settings/org.eclipse.core.resources.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/.project

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@
3131
</arguments>
3232
</buildCommand>
3333
<buildCommand>
34-
<name>org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageBuilder</name>
34+
<name>org.eclipse.gemoc.xdsmlframework.ide.ui.GemocLanguageProjectBuilder</name>
3535
<arguments>
3636
</arguments>
3737
</buildCommand>
3838
</buildSpec>
3939
<natures>
40+
<nature>org.eclipse.gemoc.xdsmlframework.ide.ui.GemocLanguageProjectNature</nature>
4041
<nature>org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageNature</nature>
4142
<nature>org.eclipse.jdt.core.javanature</nature>
4243
<nature>org.eclipse.pde.PluginNature</nature>

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/.settings/org.eclipse.core.resources.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/META-INF/MANIFEST.MF

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
Manifest-Version: 1.0
2-
Automatic-Module-Name: org.gemoc.arduino.concurrent.xarduino
3-
Bundle-SymbolicName: org.gemoc.arduino.concurrent.xarduino;singleton:=true
4-
Require-Bundle: org.eclipse.core.runtime,
5-
org.eclipse.emf.ecore;visibility:="reexport",
6-
fr.inria.diverse.k3.al.annotationprocessor.plugin,
7-
fr.inria.diverse.melange,
8-
org.eclipse.xtext.xbase.lib,
9-
com.google.guava,
10-
org.eclipse.xtend.lib,
11-
org.eclipse.emf.common,
12-
org.eclipse.emf.ecore.xmi,
13-
org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version=0.0.0;visibility:=reexport
142
Bundle-ManifestVersion: 2
15-
Bundle-ActivationPolicy: lazy
16-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
3+
Bundle-Name: %pluginName
4+
Bundle-SymbolicName: org.gemoc.arduino.concurrent.xarduino;singleton:=true
5+
Automatic-Module-Name: org.gemoc.arduino.concurrent.xarduino
6+
Bundle-Version: 0.1.0
7+
Bundle-ClassPath: .
178
Bundle-Vendor: %providerName
9+
Bundle-Localization: plugin
10+
Require-Bundle: org.eclipse.core.runtime,
11+
org.eclipse.emf.ecore;visibility:=reexport,
12+
fr.inria.diverse.k3.al.annotationprocessor.plugin,
13+
fr.inria.diverse.melange,
14+
org.eclipse.xtext.xbase.lib,
15+
org.eclipse.gemoc.xdsmlframework.api;bundle-version="4.0.0";visibility:=reexport,
16+
org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:=reexport,
17+
org.eclipse.gemoc.executionframework.engine;bundle-version="4.0.0";visibility:=reexport,
18+
com.google.guava,
19+
org.eclipse.xtend.lib,
20+
org.eclipse.emf.common,
21+
org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version="0.0.0";visibility:=reexport,
22+
org.eclipse.gemoc.execution.concurrent.ccsljavaxdsml.api
23+
Bundle-ActivationPolicy: lazy
1824
Export-Package: org.gemoc.arduino.concurrent.xarduino.aspects,
1925
org.gemoc.arduino.concurrent.xarduino.arduino,
2026
org.gemoc.arduino.concurrent.xarduino.arduino.impl,
2127
org.gemoc.arduino.concurrent.xarduino.arduino.util
22-
Bundle-Name: %pluginName
23-
Bundle-Version: 0.1.0
24-
Bundle-ClassPath: .
25-
Bundle-Localization: plugin
28+
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/XArduino.dsl

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ name = org.gemoc.arduino.concurrent.XArduino
22

33
ecore = platform:/resource/org.gemoc.arduino.concurrent.xarduino/model/XArduino.ecore
44

5-
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
5+
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
6+
7+
ecl = /org.gemoc.arduino.concurrent.moc.dse/ecl/arduinoML.ecl
8+
9+
metaprog = org.eclipse.gemoc.metaprog.moccml

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#
2-
#Thu Oct 24 18:07:14 CEST 2019
2+
#Wed Jun 05 17:15:01 CEST 2024
33
bin.includes=META-INF/,.,plugin.xml,plugin.properties,model/,XArduino.dsl
44
source..=src,\n src-gen

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/model/XArduino.ecore

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
<eStructuralFeatures xsi:type="ecore:EReference" name="module" lowerBound="1" eType="//Module"/>
5252
</eClassifiers>
5353
<eClassifiers xsi:type="ecore:EClass" name="Control" abstract="true" eSuperTypes="//Instruction">
54-
<eOperations name="execute">
55-
<eAnnotations source="aspect"/>
56-
</eOperations>
5754
<eOperations name="evaluate">
5855
<eAnnotations source="aspect"/>
5956
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
6057
</eOperations>
58+
<eOperations name="execute">
59+
<eAnnotations source="aspect"/>
60+
</eOperations>
6161
<eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" eType="//Block" containment="true"/>
6262
</eClassifiers>
6363
<eClassifiers xsi:type="ecore:EClass" name="Utilities" abstract="true" eSuperTypes="//Instruction">

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/model/XArduino.genmodel

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@
177177
<ecoreFeature xsi:type="ecore:EReference" href="XArduino.ecore#//Control/block"/>
178178
</genFeatures>
179179
<genOperations>
180-
<ecoreOperation href="XArduino.ecore#//Control/execute"/>
180+
<ecoreOperation href="XArduino.ecore#//Control/evaluate"/>
181181
</genOperations>
182182
<genOperations>
183-
<ecoreOperation href="XArduino.ecore#//Control/evaluate"/>
183+
<ecoreOperation href="XArduino.ecore#//Control/execute"/>
184184
</genOperations>
185185
</genClasses>
186186
<genClasses image="false">

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/plugin.xml

+12-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,17 @@
55
<!-- @generated XArduino -->
66
<package uri="http://org.gemoc.arduino.concurrent.xarduino/arduino/" class="org.gemoc.arduino.concurrent.xarduino.arduino.ArduinoPackage" genModel="model/XArduino.genmodel" />
77
</extension>
8-
<extension point="org.eclipse.gemoc.gemoc_language_workbench.sequential.xdsml">
9-
<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" />
8+
<extension point="org.eclipse.gemoc.gemoc_language_workbench.xdsml">
9+
<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" />
10+
</extension>
11+
<extension
12+
point="org.eclipse.gemoc.gemoc_language_workbench.moccml.xdsml.addition">
13+
<MOCCML_XDSML_Addition
14+
name="org.gemoc.arduino.concurrent.XArduino"
15+
referencedXDSMLName="org.gemoc.arduino.concurrent.XArduino"
16+
solver_class="org.eclipse.gemoc.execution.concurrent.ccsljavaengine.extensions.timesquare.moc.impl.CcslSolver"
17+
toCCSLQVTOFilePath="/org.gemoc.arduino.concurrent.moc.dse/qvto-gen/modeling/arduinoML.qvto"
18+
codeExecutor_class="sigpml.xdsml.api.impl.SigPMLCodeExecutor" >
19+
</MOCCML_XDSML_Addition>
1020
</extension>
1121
</plugin>

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/src-gen/org/gemoc/arduino/concurrent/xarduino/aspects/ArduinoCommunicationModule_PushAspect.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import fr.inria.diverse.k3.al.annotationprocessor.Abstract;
44
import fr.inria.diverse.k3.al.annotationprocessor.Aspect;
55
import org.gemoc.arduino.concurrent.xarduino.arduino.ArduinoCommunicationModule;
6-
import org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties;
76

87
@Aspect(className = ArduinoCommunicationModule.class)
98
@SuppressWarnings("all")
@@ -24,7 +23,7 @@ public static void push(final ArduinoCommunicationModule _self) {
2423
}
2524
;
2625
}
27-
26+
2827
protected static void _privk3_push(final ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties _self_, final ArduinoCommunicationModule _self) {
2928
throw new java.lang.RuntimeException("Not implemented");
3029
}

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/src-gen/org/gemoc/arduino/concurrent/xarduino/aspects/ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22

33
import java.util.Map;
44
import org.gemoc.arduino.concurrent.xarduino.arduino.ArduinoCommunicationModule;
5-
import org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties;
65

76
@SuppressWarnings("all")
87
public class ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext {
9-
public final static ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext INSTANCE = new ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext();
10-
8+
public static final ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext INSTANCE = new ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectContext();
9+
1110
public static ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties getSelf(final ArduinoCommunicationModule _self) {
1211
if (!INSTANCE.map.containsKey(_self))
1312
INSTANCE.map.put(_self, new org.gemoc.arduino.concurrent.xarduino.aspects.ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties());
1413
return INSTANCE.map.get(_self);
1514
}
16-
15+
1716
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>();
18-
17+
1918
public Map<ArduinoCommunicationModule, ArduinoCommunicationModule_PushAspectArduinoCommunicationModuleAspectProperties> getMap() {
2019
return map;
2120
}

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/src-gen/org/gemoc/arduino/concurrent/xarduino/aspects/BinaryBooleanExpression_EvaluableAspect.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@
1212
import org.gemoc.arduino.concurrent.xarduino.arduino.IntegerConstant;
1313
import org.gemoc.arduino.concurrent.xarduino.arduino.IntegerModuleGet;
1414
import org.gemoc.arduino.concurrent.xarduino.arduino.IntegerVariableRef;
15-
import org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties;
16-
import org.gemoc.arduino.concurrent.xarduino.aspects.BinaryIntegerExpression_EvaluableAspect;
17-
import org.gemoc.arduino.concurrent.xarduino.aspects.BooleanConstant_ExecutableAspect;
18-
import org.gemoc.arduino.concurrent.xarduino.aspects.BooleanExpression_EvaluableAspect;
19-
import org.gemoc.arduino.concurrent.xarduino.aspects.BooleanModuleGet_ExecutableAspect;
20-
import org.gemoc.arduino.concurrent.xarduino.aspects.IntegerConstant_ExecutableAspect;
21-
import org.gemoc.arduino.concurrent.xarduino.aspects.IntegerModuleGet_ExecutableAspect;
22-
import org.gemoc.arduino.concurrent.xarduino.aspects.VariableRef_EvaluableAspect;
2315

2416
@Aspect(className = BinaryBooleanExpression.class, with = { BooleanExpression_EvaluableAspect.class })
2517
@SuppressWarnings("all")
@@ -33,12 +25,12 @@ public static Object evaluate(final BinaryBooleanExpression _self) {
3325
;
3426
return (java.lang.Object) result;
3527
}
36-
28+
3729
private static Object super_evaluate(final BinaryBooleanExpression _self) {
3830
final org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspectExpressionAspectProperties _self_ = org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspectExpressionAspectContext.getSelf(_self);
3931
return org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspect._privk3_evaluate(_self_, _self);
4032
}
41-
33+
4234
protected static Object _privk3_evaluate(final BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties _self_, final BinaryBooleanExpression _self) {
4335
boolean leftIsBoolean = false;
4436
boolean rightIsBoolean = false;

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/src-gen/org/gemoc/arduino/concurrent/xarduino/aspects/BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22

33
import java.util.Map;
44
import org.gemoc.arduino.concurrent.xarduino.arduino.BinaryBooleanExpression;
5-
import org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties;
65

76
@SuppressWarnings("all")
87
public class BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext {
9-
public final static BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext INSTANCE = new BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext();
10-
8+
public static final BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext INSTANCE = new BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectContext();
9+
1110
public static BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties getSelf(final BinaryBooleanExpression _self) {
1211
if (!INSTANCE.map.containsKey(_self))
1312
INSTANCE.map.put(_self, new org.gemoc.arduino.concurrent.xarduino.aspects.BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties());
1413
return INSTANCE.map.get(_self);
1514
}
16-
15+
1716
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>();
18-
17+
1918
public Map<BinaryBooleanExpression, BinaryBooleanExpression_EvaluableAspectBinaryBooleanExpressionAspectProperties> getMap() {
2019
return map;
2120
}

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/src-gen/org/gemoc/arduino/concurrent/xarduino/aspects/BinaryExpression_EvaluableAspect.java

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

33
import fr.inria.diverse.k3.al.annotationprocessor.Aspect;
44
import org.gemoc.arduino.concurrent.xarduino.arduino.BinaryExpression;
5-
import org.gemoc.arduino.concurrent.xarduino.aspects.Expression_EvaluableAspect;
65

76
@Aspect(className = BinaryExpression.class)
87
@SuppressWarnings("all")

‎dev/language_workbench_concurrency/org.gemoc.arduino.concurrent.xarduino/src-gen/org/gemoc/arduino/concurrent/xarduino/aspects/BinaryExpression_EvaluableAspectBinaryExpressionAspectContext.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22

33
import java.util.Map;
44
import org.gemoc.arduino.concurrent.xarduino.arduino.BinaryExpression;
5-
import org.gemoc.arduino.concurrent.xarduino.aspects.BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties;
65

76
@SuppressWarnings("all")
87
public class BinaryExpression_EvaluableAspectBinaryExpressionAspectContext {
9-
public final static BinaryExpression_EvaluableAspectBinaryExpressionAspectContext INSTANCE = new BinaryExpression_EvaluableAspectBinaryExpressionAspectContext();
10-
8+
public static final BinaryExpression_EvaluableAspectBinaryExpressionAspectContext INSTANCE = new BinaryExpression_EvaluableAspectBinaryExpressionAspectContext();
9+
1110
public static BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties getSelf(final BinaryExpression _self) {
1211
if (!INSTANCE.map.containsKey(_self))
1312
INSTANCE.map.put(_self, new org.gemoc.arduino.concurrent.xarduino.aspects.BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties());
1413
return INSTANCE.map.get(_self);
1514
}
16-
15+
1716
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>();
18-
17+
1918
public Map<BinaryExpression, BinaryExpression_EvaluableAspectBinaryExpressionAspectProperties> getMap() {
2019
return map;
2120
}

0 commit comments

Comments
 (0)