Reactive merge function

[TruongQuangSB]

• Peding Issue
  • Reload active parts after merge
  • Rendere Table in Merge Mode

[github-actions]

Test Results

131 tests  ±0   131 ✅ ±0   32s ⏱️ +5s
 31 suites ±0     0 💤 ±0 
 31 files   ±0     0 ❌ ±0 

Results for commit 4c0eba0. ± Comparison against base commit 4701d09.

This pull request removes 9 and adds 9 tests. Note that renamed tests count towards both.

org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[1] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@1dc3502b
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[2] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@59696551
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[3] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@15c4af7a
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[4] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@55d58825
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[5] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@29a98d9f
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKey(TestData)[1] TestData [input=org.eclipse.set.model.planpro.Weichen_und_Gleissperren.impl.W_Kr_Gsp_ElementImpl@78bd02c8, expected=multi/container-id/694103323/element-id]
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKey(TestData)[2] TestData [input=org.eclipse.set.model.planpro.Signale.impl.SignalImpl@47e60b71, expected=multi/456/1155566202/123]
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKeyOther(TestData)[1] TestData [input=Pair [first=org.eclipse.set.model.planpro.Weichen_und_Gleissperren.impl.W_Kr_Gsp_ElementImpl@1cb849b2, second=other], expected=multi/container-id/648994982/element-id/other=other]
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKeyOther(TestData)[2] TestData [input=Pair [first=org.eclipse.set.model.planpro.Signale.impl.SignalImpl@7497a554, second=xxx], expected=multi/456/1998603857/123/other=xxx]

org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[1] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@7100dea
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[2] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@2938127d
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[3] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@2b6fcb9f
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[4] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@74170687
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[5] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@3d96fa9e
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKey(TestData)[1] TestData [input=org.eclipse.set.model.planpro.Weichen_und_Gleissperren.impl.W_Kr_Gsp_ElementImpl@18a0721b, expected=multi/container-id/1282393063/element-id]
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKey(TestData)[2] TestData [input=org.eclipse.set.model.planpro.Signale.impl.SignalImpl@66e12c3b, expected=multi/456/1792086750/123]
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKeyOther(TestData)[1] TestData [input=Pair [first=org.eclipse.set.model.planpro.Weichen_und_Gleissperren.impl.W_Kr_Gsp_ElementImpl@25b4754a, second=other], expected=multi/container-id/1964410538/element-id/other=other]
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKeyOther(TestData)[2] TestData [input=Pair [first=org.eclipse.set.model.planpro.Signale.impl.SignalImpl@5d68954d, second=xxx], expected=multi/456/1436434279/123/other=xxx]

♻️ This comment has been updated with latest results.

[mariusheine]

@TruongQuangSB There is one issue/error that we should fix before we merge this:

1. I created a complete new planing without any data inside
2. I wanted to merge it with the PPHN example project
3. I resolved all conflicts by the second planing (PPHN)
4. I clicked on save
5. I clicked on save composite planing
6. IndexOutOfBoundException occurred

[mariusheine]

@TruongQuangSB There is one issue/error that we should fix before we merge this:

1. I created a complete new planing without any data inside
2. I wanted to merge it with the PPHN example project
3. I resolved all conflicts by the second planing (PPHN)
4. I clicked on save
5. I clicked on save composite planing
6. IndexOutOfBoundException occurred

@TruongQuangSB And why was all marked as a conflict. In my opinion there was no conflict because there was no conflict of any GUID since the two plannings were totally distinct.

[TruongQuangSB]

@TruongQuangSB There is one issue/error that we should fix before we merge this:

1. I created a complete new planing without any data inside
2. I wanted to merge it with the PPHN example project
3. I resolved all conflicts by the second planing (PPHN)
4. I clicked on save
5. I clicked on save composite planing
6. IndexOutOfBoundException occurred

@TruongQuangSB And why was all marked as a conflict. In my opinion there was no conflict because there was no conflict of any GUID since the two plannings were totally distinct.

@mariusheine i haven't check, how the merge funtion concrete work. For this PR have i only made, that two plan can merge. Another things will be follow in another PR. I have moved this Function for the first in DevMode

[TruongQuangSB]

@TruongQuangSB There is one issue/error that we should fix before we merge this:

1. I created a complete new planing without any data inside
2. I wanted to merge it with the PPHN example project
3. I resolved all conflicts by the second planing (PPHN)
4. I clicked on save
5. I clicked on save composite planing
6. IndexOutOfBoundException occurred

fixed. U can try again

[github-actions]

License summary

⚠️ Failed to process DEPENDENCIES.

• Committers can request a license review via by commenting /request-license-review.
• After all reviews have concluded, Committers can re-run the license-vetting check by commenting /license-check

Workflow run (with attached summary files):
https://github.com/eclipse-set/set/actions/runs/23236675009