From 3420ffb8fa557d56d78fe9e8d95852065558ac06 Mon Sep 17 00:00:00 2001 From: Fredi Pfister Date: Mon, 16 Jun 2025 14:42:02 +0200 Subject: [PATCH] chore: upgrade Xtext to 2.39 Take advantage of a new feature in Xtext, see https://github.com/eclipse-xtext/xtext/pull/3329 --- .../tools/ddk/xtext/linking/LazyLinkingResource2.java | 6 ++++++ ddk-parent/pom.xml | 2 +- ddk-target/ddk.target | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java index 0ae7db7e84..6a56391126 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java @@ -13,6 +13,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -123,6 +124,11 @@ public String getSourceText() throws IOException { return SerializationUtil.getCompleteContent(this); } + @Override + protected LinkedHashSet> getResolvingSet(final boolean initial) { + return resolving; + } + /** * Sets whether this resource is currently being loaded. *

diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml index 47752238b8..3305a25c79 100644 --- a/ddk-parent/pom.xml +++ b/ddk-parent/pom.xml @@ -55,7 +55,7 @@ 3.26.0 7.13.0 4.0.13 - 2.38.0 + 2.39.0 diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target index f4647b2629..8b800c0ec8 100644 --- a/ddk-target/ddk.target +++ b/ddk-target/ddk.target @@ -37,7 +37,7 @@ - +