Reactive merge function by TruongQuangSB · Pull Request #2259 · eclipse-set/set

TruongQuangSB · 2026-03-13T15:46:06Z

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

github-actions · 2026-03-13T15:51:23Z

Test Results

131 tests ±0 131 ✅ ±0 27s ⏱️ +3s
31 suites ±0 0 💤 ±0
31 files ±0 0 ❌ ±0

Results for commit c968b30. ± Comparison against base commit 2002bae.

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@34780cd9
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[2] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@6e7c351d
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[3] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@7d3c09ec
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[4] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@11900483
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[5] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@94e51e8
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@17fa1336
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[2] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@439b15f2
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[3] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@2a4f5433
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[4] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@29149030
org.eclipse.set.basis.graph.DigraphsTest ‑ testGetPathsDigraphPP(TestGetPathsDigraphPP)[5] org.eclipse.set.basis.graph.DigraphsTest$TestGetPathsDigraphPP@68868328
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@6ad112de, expected=multi/container-id/1429530353/element-id]
org.eclipse.set.ppmodel.extensions.utils.CacheUtilsTest ‑ testGetCacheKey(TestData)[2] TestData [input=org.eclipse.set.model.planpro.Signale.impl.SignalImpl@2ae2fa13, expected=multi/456/178838760/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@40ac0a56, second=other], expected=multi/container-id/1941851357/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@97beeaf, second=xxx], expected=multi/456/566447096/123/other=xxx]

♻️ This comment has been updated with latest results.

mariusheine · 2026-03-17T11:47:56Z

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

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

...dles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/ZippedPlanProToolboxFile.java

mariusheine · 2026-03-17T11:49:54Z

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

I created a complete new planing without any data inside

I wanted to merge it with the PPHN example project

I resolved all conflicts by the second planing (PPHN)

I clicked on save

I clicked on save composite planing

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 · 2026-03-17T14:09:42Z

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

I created a complete new planing without any data inside

I wanted to merge it with the PPHN example project

I resolved all conflicts by the second planing (PPHN)

I clicked on save

I clicked on save composite planing

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 · 2026-03-17T14:10:29Z

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

I created a complete new planing without any data inside

I wanted to merge it with the PPHN example project

I resolved all conflicts by the second planing (PPHN)

I clicked on save

I clicked on save composite planing

IndexOutOfBoundException occurred

fixed. U can try again

mariusheine · 2026-03-29T22:20:02Z

java/bundles/org.eclipse.set.model.simplemerge.edit/META-INF/MANIFEST.MF

+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-17


@TruongQuangSB What was the reason for switching back to 17? Because all our other modules use 21.

mariusheine · 2026-03-29T22:46:07Z

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

I created a complete new planing without any data inside

I wanted to merge it with the PPHN example project

I resolved all conflicts by the second planing (PPHN)

I clicked on save

I clicked on save composite planing

IndexOutOfBoundException occurred

fixed. U can try again

The saving works now, but whenever I want to open a (non-empty) table e.g. Ssks there is an exception thrown. This exception is thrown in the final saved composite planning as well as in the temporary integration planning.

If you can please fix this then I think we have an sufficient initial implementation for the dev mode

github-actions · 2026-03-29T22:48:51Z

License summary

❌ Not yet vetted dependencies:

Dependency	License	Status	Ticket
npm/npmjs/-/monaco-editor/0.55.1	MIT AND (Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-khronos AND LicenseRef-scancode-unicode AND LicenseRef-scancode-unknown AND MIT AND W3C-20150513) AND (Apache-2.0 AND MPL-2.0) AND Apache-2.0	restricted	#26670
npm/npmjs/-/ol/10.7.0	BSD-2-Clause AND (BSD-2-Clause AND LicenseRef-scancode-free-unknown) AND (ODbL-1.0 AND OGC-1.0) AND (BSD-2-Clause AND LicenseRef-scancode-softsurfer AND MIT AND ODbL-1.0 AND OGC-1.0) AND OGC-1.0 AND LicenseRef-scancode-softsurfer AND ODbL-1.0	restricted	#26676

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/23720882651

TruongQuangSB added 6 commits March 6, 2026 11:57

Reactive Merge: initial

6179f11

active merge part

8e5544c

TemporayIntegrationResource

4b1bb8a

Remove ToolboxTemporaryIntegration

4701240

Test merge

1f17384

Complete reactive Merge function

4bad7a6

This comment has been minimized.

Sign in to view

Update plugin pom

4851f0e

mariusheine reviewed Mar 17, 2026

View reviewed changes

...dles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/ZippedPlanProToolboxFile.java Show resolved Hide resolved

TruongQuangSB added 2 commits March 17, 2026 15:05

Fix create merge file exception

db602f9

Move Merge function zu dev mode

4b4afb5

Fix formatting

83d03cd

This comment has been minimized.

Sign in to view

fix format

ab56ad1

This comment has been minimized.

Sign in to view

TruongQuangSB added 2 commits March 17, 2026 16:47

Active formate by generate ecore model

5b801b8

Update create empty plan

4c0eba0

This comment has been minimized.

Sign in to view

Merge remote-tracking branch 'github/main' into reactive-merge

c968b30

mariusheine reviewed Mar 29, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reactive merge function#2259

Reactive merge function#2259
TruongQuangSB wants to merge 14 commits intomainfrom
reactive-merge

TruongQuangSB commented Mar 13, 2026

Uh oh!

This comment has been minimized.

github-actions bot commented Mar 13, 2026 •

edited

Loading

Uh oh!

mariusheine commented Mar 17, 2026

Uh oh!

Uh oh!

mariusheine commented Mar 17, 2026

Uh oh!

TruongQuangSB commented Mar 17, 2026 •

edited

Loading

Uh oh!

TruongQuangSB commented Mar 17, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

mariusheine Mar 29, 2026

Uh oh!

mariusheine commented Mar 29, 2026

Uh oh!

github-actions bot commented Mar 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

TruongQuangSB commented Mar 13, 2026

Uh oh!

This comment has been minimized.

github-actions bot commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

mariusheine commented Mar 17, 2026

Uh oh!

Uh oh!

mariusheine commented Mar 17, 2026

Uh oh!

TruongQuangSB commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TruongQuangSB commented Mar 17, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

mariusheine Mar 29, 2026

Choose a reason for hiding this comment

Uh oh!

mariusheine commented Mar 29, 2026

Uh oh!

github-actions bot commented Mar 29, 2026

License summary

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions bot commented Mar 13, 2026 •

edited

Loading

TruongQuangSB commented Mar 17, 2026 •

edited

Loading