Skip to content

Commit 2c4cd02

Browse files
mhuster23mhuster23
committed
fix(bulk-model-sync-solution): fixed no included prefixes leading to all modules being included
1 parent 6e4d3ec commit 2c4cd02

File tree

1 file changed

+112
-53
lines changed

1 file changed

+112
-53
lines changed

‎bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps‎

Lines changed: 112 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
6464
</concept>
6565
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
66+
<concept id="1225271369338" name="jetbrains.mps.baseLanguage.structure.IsEmptyOperation" flags="nn" index="17RlXB" />
6667
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
6768
<child id="5680397130376446158" name="type" index="1tU5fm" />
6869
</concept>
@@ -121,6 +122,11 @@
121122
<child id="8276990574886367510" name="catchClause" index="1zxBo5" />
122123
<child id="8276990574886367508" name="body" index="1zxBo7" />
123124
</concept>
125+
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
126+
<child id="1163668914799" name="condition" index="3K4Cdx" />
127+
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
128+
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
129+
</concept>
124130
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
125131
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
126132
</language>
@@ -184,37 +190,79 @@
184190
</node>
185191
</node>
186192
</node>
193+
<node concept="3clFbH" id="2SradnRkF0Z" role="3cqZAp" />
194+
<node concept="3cpWs8" id="2SradnRkH3Z" role="3cqZAp">
195+
<node concept="3cpWsn" id="2SradnRkH40" role="3cpWs9">
196+
<property role="TrG5h" value="rawIncludedModuleNames" />
197+
<node concept="3uibUv" id="2SradnRkH41" role="1tU5fm">
198+
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
199+
</node>
200+
<node concept="2YIFZM" id="7gc0jqT4GSp" role="33vP2m">
201+
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
202+
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
203+
<node concept="Xl_RD" id="7gc0jqT4H9m" role="37wK5m">
204+
<property role="Xl_RC" value="modelix.mps.model.sync.bulk.output.modules" />
205+
</node>
206+
</node>
207+
</node>
208+
</node>
209+
<node concept="3cpWs8" id="2SradnRlqmi" role="3cqZAp">
210+
<node concept="3cpWsn" id="2SradnRlqmj" role="3cpWs9">
211+
<property role="TrG5h" value="rawIncludedModulePrefixes" />
212+
<node concept="3uibUv" id="2SradnRlqmk" role="1tU5fm">
213+
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
214+
</node>
215+
<node concept="2YIFZM" id="4fksUHVn$LA" role="33vP2m">
216+
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
217+
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
218+
<node concept="Xl_RD" id="4fksUHVn_pH" role="37wK5m">
219+
<property role="Xl_RC" value="modelix.mps.model.sync.bulk.output.modules.prefixes" />
220+
</node>
221+
</node>
222+
</node>
223+
</node>
187224
<node concept="3clFbH" id="7gc0jqT4mbW" role="3cqZAp" />
188225
<node concept="3cpWs8" id="7gc0jqT4mj_" role="3cqZAp">
189226
<node concept="3cpWsn" id="7gc0jqT4mjC" role="3cpWs9">
190227
<property role="TrG5h" value="includedModuleNames" />
191-
<node concept="2ShNRf" id="7gc0jqT4yPh" role="33vP2m">
192-
<node concept="2i4dXS" id="7gc0jqT4_HB" role="2ShVmc">
193-
<node concept="3uibUv" id="7gc0jqT4_HD" role="HW$YZ">
194-
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
228+
<node concept="2hMVRd" id="7gc0jqT4uB6" role="1tU5fm">
229+
<node concept="3uibUv" id="7gc0jqT4uTS" role="2hN53Y">
230+
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
231+
</node>
232+
</node>
233+
<node concept="3K4zz7" id="2SradnRkSc6" role="33vP2m">
234+
<node concept="2OqwBi" id="2SradnRlZz8" role="3K4Cdx">
235+
<node concept="37vLTw" id="2SradnRkSJb" role="2Oq$k0">
236+
<ref role="3cqZAo" node="2SradnRkH40" resolve="rawIncludedModuleNames" />
195237
</node>
196-
<node concept="2OqwBi" id="7gc0jqT4Hsf" role="I$8f6">
197-
<node concept="2YIFZM" id="7gc0jqT4GSp" role="2Oq$k0">
198-
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
199-
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
200-
<node concept="Xl_RD" id="7gc0jqT4H9m" role="37wK5m">
201-
<property role="Xl_RC" value="modelix.mps.model.sync.bulk.output.modules" />
202-
</node>
238+
<node concept="17RlXB" id="2SradnRm0jD" role="2OqNvi" />
239+
</node>
240+
<node concept="2ShNRf" id="2SradnRl0qt" role="3K4E3e">
241+
<node concept="2i4dXS" id="2SradnRlg1Z" role="2ShVmc">
242+
<node concept="3uibUv" id="2SradnRlV5h" role="HW$YZ">
243+
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
203244
</node>
204-
<node concept="liA8E" id="7gc0jqT4Iha" role="2OqNvi">
205-
<ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
206-
<node concept="Xl_RD" id="7gc0jqT4InL" role="37wK5m">
207-
<property role="Xl_RC" value="," />
245+
</node>
246+
</node>
247+
<node concept="2ShNRf" id="2SradnRlgUS" role="3K4GZi">
248+
<node concept="2i4dXS" id="2SradnRlhKc" role="2ShVmc">
249+
<node concept="2OqwBi" id="2SradnRlkpe" role="I$8f6">
250+
<node concept="37vLTw" id="2SradnRljr_" role="2Oq$k0">
251+
<ref role="3cqZAo" node="2SradnRkH40" resolve="rawIncludedModuleNames" />
208252
</node>
253+
<node concept="liA8E" id="2SradnRllaH" role="2OqNvi">
254+
<ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
255+
<node concept="Xl_RD" id="2SradnRlm7$" role="37wK5m">
256+
<property role="Xl_RC" value="," />
257+
</node>
258+
</node>
259+
</node>
260+
<node concept="3uibUv" id="2SradnRlXJ7" role="HW$YZ">
261+
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
209262
</node>
210263
</node>
211264
</node>
212265
</node>
213-
<node concept="2hMVRd" id="7gc0jqT4uB6" role="1tU5fm">
214-
<node concept="3uibUv" id="7gc0jqT4uTS" role="2hN53Y">
215-
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
216-
</node>
217-
</node>
218266
</node>
219267
</node>
220268
<node concept="3cpWs8" id="4fksUHVnsUa" role="3cqZAp">
@@ -225,24 +273,35 @@
225273
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
226274
</node>
227275
</node>
228-
<node concept="2ShNRf" id="4fksUHVnvZD" role="33vP2m">
229-
<node concept="2i4dXS" id="4fksUHVnwVu" role="2ShVmc">
230-
<node concept="3uibUv" id="4fksUHVny02" role="HW$YZ">
231-
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
276+
<node concept="3K4zz7" id="2SradnRlAIm" role="33vP2m">
277+
<node concept="2OqwBi" id="2SradnRm240" role="3K4Cdx">
278+
<node concept="37vLTw" id="2SradnRlBk9" role="2Oq$k0">
279+
<ref role="3cqZAo" node="2SradnRlqmj" resolve="rawIncludedModulePrefixes" />
232280
</node>
233-
<node concept="2OqwBi" id="4fksUHVnGfo" role="I$8f6">
234-
<node concept="2YIFZM" id="4fksUHVn$LA" role="2Oq$k0">
235-
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
236-
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
237-
<node concept="Xl_RD" id="4fksUHVn_pH" role="37wK5m">
238-
<property role="Xl_RC" value="modelix.mps.model.sync.bulk.output.modules.prefixes" />
239-
</node>
281+
<node concept="17RlXB" id="2SradnRm31P" role="2OqNvi" />
282+
</node>
283+
<node concept="2ShNRf" id="2SradnRlDCi" role="3K4E3e">
284+
<node concept="2i4dXS" id="2SradnRlEl5" role="2ShVmc">
285+
<node concept="3uibUv" id="2SradnRlOlQ" role="HW$YZ">
286+
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
240287
</node>
241-
<node concept="liA8E" id="4fksUHVnHpJ" role="2OqNvi">
242-
<ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
243-
<node concept="Xl_RD" id="4fksUHVnI2e" role="37wK5m">
244-
<property role="Xl_RC" value="," />
288+
</node>
289+
</node>
290+
<node concept="2ShNRf" id="2SradnRlFgG" role="3K4GZi">
291+
<node concept="2i4dXS" id="2SradnRlG8I" role="2ShVmc">
292+
<node concept="2OqwBi" id="2SradnRlITX" role="I$8f6">
293+
<node concept="37vLTw" id="2SradnRlHSO" role="2Oq$k0">
294+
<ref role="3cqZAo" node="2SradnRlqmj" resolve="rawIncludedModulePrefixes" />
245295
</node>
296+
<node concept="liA8E" id="2SradnRlJMh" role="2OqNvi">
297+
<ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
298+
<node concept="Xl_RD" id="2SradnRlKrV" role="37wK5m">
299+
<property role="Xl_RC" value="," />
300+
</node>
301+
</node>
302+
</node>
303+
<node concept="3uibUv" id="2SradnRlS8a" role="HW$YZ">
304+
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
246305
</node>
247306
</node>
248307
</node>
@@ -307,8 +366,8 @@
307366
<node concept="3zZkjj" id="4fksUHVmpxv" role="2OqNvi">
308367
<node concept="1bVj0M" id="4fksUHVmpxx" role="23t8la">
309368
<node concept="3clFbS" id="4fksUHVmpxy" role="1bW5cS">
310-
<node concept="3clFbF" id="4fksUHVnNeC" role="3cqZAp">
311-
<node concept="22lmx$" id="4fksUHVnNey" role="3clFbG">
369+
<node concept="3clFbF" id="2SradnRjRES" role="3cqZAp">
370+
<node concept="22lmx$" id="2SradnRjREP" role="3clFbG">
312371
<node concept="2OqwBi" id="4fksUHVnRwl" role="3uHU7B">
313372
<node concept="37vLTw" id="4fksUHVnQyV" role="2Oq$k0">
314373
<ref role="3cqZAo" node="7gc0jqT4mjC" resolve="includedModuleNames" />
@@ -324,35 +383,35 @@
324383
</node>
325384
</node>
326385
</node>
327-
<node concept="2OqwBi" id="4fksUHVmqRn" role="3uHU7w">
328-
<node concept="37vLTw" id="4fksUHVmq0_" role="2Oq$k0">
386+
<node concept="2OqwBi" id="2SradnRk7nQ" role="3uHU7w">
387+
<node concept="37vLTw" id="2SradnRk5YL" role="2Oq$k0">
329388
<ref role="3cqZAo" node="4fksUHVnsUd" resolve="includedModulePrefixes" />
330389
</node>
331-
<node concept="2HwmR7" id="4fksUHVmrVH" role="2OqNvi">
332-
<node concept="1bVj0M" id="4fksUHVmrVJ" role="23t8la">
333-
<node concept="3clFbS" id="4fksUHVmrVK" role="1bW5cS">
334-
<node concept="3clFbF" id="4fksUHVmssI" role="3cqZAp">
335-
<node concept="2OqwBi" id="4fksUHVmzWW" role="3clFbG">
336-
<node concept="2OqwBi" id="4fksUHVmyMz" role="2Oq$k0">
337-
<node concept="37vLTw" id="4fksUHVmydu" role="2Oq$k0">
390+
<node concept="2HwmR7" id="2SradnRk8cO" role="2OqNvi">
391+
<node concept="1bVj0M" id="2SradnRk8cQ" role="23t8la">
392+
<node concept="3clFbS" id="2SradnRk8cR" role="1bW5cS">
393+
<node concept="3clFbF" id="2SradnRk8Ot" role="3cqZAp">
394+
<node concept="2OqwBi" id="2SradnRkbiA" role="3clFbG">
395+
<node concept="2OqwBi" id="2SradnRk9S6" role="2Oq$k0">
396+
<node concept="37vLTw" id="2SradnRk8Os" role="2Oq$k0">
338397
<ref role="3cqZAo" node="4fksUHVmpxz" resolve="module" />
339398
</node>
340-
<node concept="liA8E" id="4fksUHVmzky" role="2OqNvi">
399+
<node concept="liA8E" id="2SradnRkawH" role="2OqNvi">
341400
<ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
342401
</node>
343402
</node>
344-
<node concept="liA8E" id="4fksUHVm$Sh" role="2OqNvi">
403+
<node concept="liA8E" id="2SradnRkcr8" role="2OqNvi">
345404
<ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
346-
<node concept="37vLTw" id="4fksUHVm_mG" role="37wK5m">
347-
<ref role="3cqZAo" node="4fksUHVmrVL" resolve="it" />
405+
<node concept="37vLTw" id="2SradnRkd3L" role="37wK5m">
406+
<ref role="3cqZAo" node="2SradnRk8cS" resolve="prefix" />
348407
</node>
349408
</node>
350409
</node>
351410
</node>
352411
</node>
353-
<node concept="Rh6nW" id="4fksUHVmrVL" role="1bW2Oz">
354-
<property role="TrG5h" value="it" />
355-
<node concept="2jxLKc" id="4fksUHVmrVM" role="1tU5fm" />
412+
<node concept="Rh6nW" id="2SradnRk8cS" role="1bW2Oz">
413+
<property role="TrG5h" value="prefix" />
414+
<node concept="2jxLKc" id="2SradnRk8cT" role="1tU5fm" />
356415
</node>
357416
</node>
358417
</node>

0 commit comments

Comments
 (0)