Skip to content

Commit fc49c4f

Browse files
mfsoliveiramfsoliveira
committed
Review: Consider the case where IVariationPoint is extended and not an attribute; clean up; and return presence condition
1 parent c1e389a commit fc49c4f

File tree

6 files changed

+138
-123
lines changed

6 files changed

+138
-123
lines changed

‎code/languages/org.iets3.opensource/.mps/libraries.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<value>
88
<Library>
99
<option name="name" value="mbeddr.plattform" />
10-
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.platform' />
11-
</Library>
10+
<option name="path" value="${iets3.github.opensource.home}/build/dependencies/com.mbeddr.platform" />
11+
</Library>
1212
</value>
1313
</entry>
14-
<entry key='org.mpsqa.allInOne'>
14+
<entry key="org.mpsqa.allInOne">
1515
<value>
1616
<Library>
17-
<option name='name' value='org.mpsqa.allInOne' />
18-
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/org.mpsqa.allInOne' />
17+
<option name="name" value="org.mpsqa.allInOne" />
18+
<option name="path" value="${iets3.github.opensource.home}/build/dependencies/org.mpsqa.allInOne" />
1919
</Library>
2020
</value>
2121
</entry>

‎code/languages/org.iets3.opensource/.mps/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
</option>
1212
</component>
1313
<component name="VcsDirectoryMappings">
14-
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
14+
<mapping directory="$iets3.github.opensource.home$" vcs="Git" />
1515
</component>
1616
</project>

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/generator/templates/org.iets3.variability.artifacts.base.generator.templates@generator.mps‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps‎

Lines changed: 89 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
99
</languages>
1010
<imports>
11+
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
12+
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
1113
<import index="7c17" ref="r:1696fe6e-226e-4158-a6f2-3b9fa1ea7a02(org.iets3.variability.artifacts.base.structure)" implicit="true" />
1214
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
1315
</imports>
@@ -21,9 +23,11 @@
2123
<concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
2224
<concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
2325
<property id="5864038008284099149" name="isStatic" index="2Ki8OM" />
26+
<property id="1225194472832" name="isVirtual" index="13i0it" />
2427
</concept>
2528
</language>
2629
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
30+
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
2731
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
2832
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
2933
<child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -32,6 +36,9 @@
3236
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
3337
<child id="1137022507850" name="body" index="2VODD2" />
3438
</concept>
39+
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
40+
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
41+
</concept>
3542
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
3643
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
3744
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
@@ -51,6 +58,17 @@
5158
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
5259
<child id="1068581517665" name="statement" index="3cqZAp" />
5360
</concept>
61+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
62+
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
63+
</concept>
64+
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
65+
<reference id="1107535924139" name="classifier" index="3uigEE" />
66+
<child id="1109201940907" name="parameter" index="11_B2D" />
67+
</concept>
68+
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
69+
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
70+
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
71+
</concept>
5472
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
5573
<child id="1178549979242" name="visibility" index="1B3o_S" />
5674
</concept>
@@ -94,7 +112,9 @@
94112
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
95113
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
96114
</concept>
97-
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
115+
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
116+
<reference id="1138405853777" name="concept" index="ehGHo" />
117+
</concept>
98118
<concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
99119
<reference id="1138056546658" name="link" index="3TtcxE" />
100120
</concept>
@@ -122,35 +142,47 @@
122142
<node concept="3Tm1VV" id="7B3y$vlfFZu" role="1B3o_S" />
123143
<node concept="10P_77" id="7B3y$vlfFZL" role="3clF45" />
124144
<node concept="3clFbS" id="7B3y$vlfFZw" role="3clF47">
125-
<node concept="3clFbF" id="7B3y$vlfJ38" role="3cqZAp">
126-
<node concept="2OqwBi" id="7B3y$vlfMnc" role="3clFbG">
127-
<node concept="2OqwBi" id="7B3y$vlfJdW" role="2Oq$k0">
128-
<node concept="37vLTw" id="7B3y$vlfJ37" role="2Oq$k0">
129-
<ref role="3cqZAo" node="7B3y$vlfJ17" resolve="node" />
145+
<node concept="3clFbF" id="4G1C74Q8GwH" role="3cqZAp">
146+
<node concept="22lmx$" id="4G1C74S35Vh" role="3clFbG">
147+
<node concept="2OqwBi" id="4G1C74S35B1" role="3uHU7B">
148+
<node concept="37vLTw" id="4G1C74S35B2" role="2Oq$k0">
149+
<ref role="3cqZAo" node="7B3y$vlfJ17" resolve="queriedNode" />
130150
</node>
131-
<node concept="3Tsc0h" id="7B3y$vlfJt8" role="2OqNvi">
132-
<ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
151+
<node concept="1mIQ4w" id="4G1C74S35B3" role="2OqNvi">
152+
<node concept="chp4Y" id="4G1C74S35B4" role="cj9EA">
153+
<ref role="cht4Q" to="7c17:7B3y$vlfDHq" resolve="IVariationPoint" />
154+
</node>
133155
</node>
134156
</node>
135-
<node concept="2HwmR7" id="7B3y$vlfOMt" role="2OqNvi">
136-
<node concept="1bVj0M" id="7B3y$vlfOMv" role="23t8la">
137-
<node concept="3clFbS" id="7B3y$vlfOMw" role="1bW5cS">
138-
<node concept="3clFbF" id="7B3y$vlfOT4" role="3cqZAp">
139-
<node concept="2OqwBi" id="7B3y$vlfP5x" role="3clFbG">
140-
<node concept="37vLTw" id="7B3y$vlfOT3" role="2Oq$k0">
141-
<ref role="3cqZAo" node="7B3y$vlfOMx" resolve="it" />
142-
</node>
143-
<node concept="1mIQ4w" id="7B3y$vlfQ4$" role="2OqNvi">
144-
<node concept="chp4Y" id="7B3y$vlfQ9b" role="cj9EA">
145-
<ref role="cht4Q" to="7c17:7B3y$vlfDHq" resolve="IVariationPoint" />
157+
<node concept="2OqwBi" id="7B3y$vlfMnc" role="3uHU7w">
158+
<node concept="2OqwBi" id="7B3y$vlfJdW" role="2Oq$k0">
159+
<node concept="37vLTw" id="7B3y$vlfJ37" role="2Oq$k0">
160+
<ref role="3cqZAo" node="7B3y$vlfJ17" resolve="queriedNode" />
161+
</node>
162+
<node concept="3Tsc0h" id="7B3y$vlfJt8" role="2OqNvi">
163+
<ref role="3TtcxE" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
164+
</node>
165+
</node>
166+
<node concept="2HwmR7" id="7B3y$vlfOMt" role="2OqNvi">
167+
<node concept="1bVj0M" id="7B3y$vlfOMv" role="23t8la">
168+
<node concept="3clFbS" id="7B3y$vlfOMw" role="1bW5cS">
169+
<node concept="3clFbF" id="7B3y$vlfOT4" role="3cqZAp">
170+
<node concept="2OqwBi" id="7B3y$vlfP5x" role="3clFbG">
171+
<node concept="37vLTw" id="7B3y$vlfOT3" role="2Oq$k0">
172+
<ref role="3cqZAo" node="7B3y$vlfOMx" resolve="it" />
173+
</node>
174+
<node concept="1mIQ4w" id="7B3y$vlfQ4$" role="2OqNvi">
175+
<node concept="chp4Y" id="7B3y$vlfQ9b" role="cj9EA">
176+
<ref role="cht4Q" to="7c17:7B3y$vlfDHq" resolve="IVariationPoint" />
177+
</node>
146178
</node>
147179
</node>
148180
</node>
149181
</node>
150-
</node>
151-
<node concept="gl6BB" id="7B3y$vlfOMx" role="1bW2Oz">
152-
<property role="TrG5h" value="it" />
153-
<node concept="2jxLKc" id="7B3y$vlfOMy" role="1tU5fm" />
182+
<node concept="gl6BB" id="7B3y$vlfOMx" role="1bW2Oz">
183+
<property role="TrG5h" value="it" />
184+
<node concept="2jxLKc" id="7B3y$vlfOMy" role="1tU5fm" />
185+
</node>
154186
</node>
155187
</node>
156188
</node>
@@ -193,6 +225,40 @@
193225
</node>
194226
</node>
195227
</node>
228+
<node concept="13i0hz" id="4G1C74Q8D4_" role="13h7CS">
229+
<property role="13i0it" value="true" />
230+
<property role="TrG5h" value="getPresenceCondition" />
231+
<node concept="3Tm1VV" id="4G1C74Q8D4A" role="1B3o_S" />
232+
<node concept="3uibUv" id="4G1C74Q8Fr7" role="3clF45">
233+
<ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
234+
<node concept="3Tqbb2" id="4G1C74Q8FrG" role="11_B2D">
235+
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
236+
</node>
237+
</node>
238+
<node concept="3clFbS" id="4G1C74Q8D4C" role="3clF47">
239+
<node concept="3clFbF" id="4G1C74S2Vr2" role="3cqZAp">
240+
<node concept="2YIFZM" id="4G1C74S2Vy3" role="3clFbG">
241+
<ref role="37wK5l" to="33ny:~Optional.empty()" resolve="empty" />
242+
<ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
243+
</node>
244+
</node>
245+
</node>
246+
<node concept="P$JXv" id="4G1C74Q8FDa" role="lGtFl">
247+
<node concept="TZ5HA" id="4G1C74Q8FDb" role="TZ5H$">
248+
<node concept="1dT_AC" id="4G1C74Q8FDc" role="1dT_Ay">
249+
<property role="1dT_AB" value="Return the expression used to evaluate if a variation point is present " />
250+
</node>
251+
</node>
252+
<node concept="TZ5HA" id="4G1C74Q9cui" role="TZ5H$">
253+
<node concept="1dT_AC" id="4G1C74Q9cuj" role="1dT_Ay">
254+
<property role="1dT_AB" value="or not in an artifact." />
255+
</node>
256+
</node>
257+
<node concept="x79VA" id="4G1C74Q8FDd" role="3nqlJM">
258+
<property role="x79VB" value="the presence condition as Expression in an Optional object." />
259+
</node>
260+
</node>
261+
</node>
196262
<node concept="13hLZK" id="7B3y$vlfFYR" role="13h7CW">
197263
<node concept="3clFbS" id="7B3y$vlfFYS" role="2VODD2" />
198264
</node>

0 commit comments

Comments
 (0)