diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0dfe9c6..84fb5d0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,17 +1,22 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-## (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-## ~
-## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-## specific language governing permissions and limitations under the License. ~
-## ~
-## Maintainers: ~
-## Wim Bast, Tom Brus, Ronald Krijgsheld ~
-## Contributors: ~
-## Arjan Kok, Carel Bast ~
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+## (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+## ~
+## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+## specific language governing permissions and limitations under the License. ~
+## ~
+## Maintainers: ~
+## Wim Bast, Tom Brus ~
+## ~
+## Contributors: ~
+## Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+## --------------------------------------------------------------------------------------------------------------------- ~
+## In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+## Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+## but also our friend. "He will live on in many of the lines of code you see below." ~
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
version: 2
updates:
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5d0c6ed..d4ce2e8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,22 +4,22 @@ on: [ push, workflow_dispatch ]
jobs:
build:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[no-ci]')"
env:
ALLREP_TOKEN: "${{secrets.ALLREP_TOKEN}}"
TOKEN: "${{secrets.ALLREP_TOKEN}}"
CI: "true"
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v6
with:
fetch-depth: 0
- - uses: actions/setup-java@v3
+ - uses: actions/setup-java@v5
with:
- java-version: 17
+ java-version: 21
distribution: zulu
################################################################################
- name: "build"
- run: ./gradlew --info --scan
+ run: ./gradlew --info
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fe9a321..21a5a76 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/build.gradle.kts b/build.gradle.kts
index 2bf678c..1a953f1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,28 +1,33 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
defaultTasks("mvgCorrector", "test", "publish", "mvgTagger")
plugins {
`java-library`
`maven-publish`
- id("org.modelingvalue.gradle.mvgplugin") version "1.1.3"
+ id("org.modelingvalue.gradle.mvgplugin") version "2.3.21"
}
dependencies {
- implementation("org.modelingvalue:dclare:4.0.0-BRANCHED")
- implementation("org.modelingvalue:immutable-collections:4.0.0-BRANCHED")
+ implementation("org.modelingvalue:dclare:6.0.0-BRANCHED")
+ implementation("org.modelingvalue:immutable-collections:6.0.0-BRANCHED")
}
publishing {
publications {
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 08d3658..8c07a33 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
plugins {
java
@@ -19,11 +24,14 @@ plugins {
dependencies {
testImplementation(rootProject)
testImplementation(testFixtures(project(":ext")))
- testImplementation("org.modelingvalue:dclare:4.0.0-BRANCHED")
- testImplementation("org.modelingvalue:immutable-collections:4.0.0-BRANCHED")
+ testImplementation("org.modelingvalue:dclare:6.0.0-BRANCHED")
+ testImplementation("org.modelingvalue:immutable-collections:6.0.0-BRANCHED")
testImplementation("com.intellij:forms_rt:7.0.3")
}
tasks.withType(JavaCompile::class) {
options.compilerArgs.add("-Xlint:unchecked")
options.compilerArgs.add("-Xlint:deprecation")
}
+tasks.test {
+ failOnNoDiscoveredTests = false
+}
diff --git a/examples/pom.xml b/examples/pom.xml
deleted file mode 100644
index 33f70cd..0000000
--- a/examples/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
- 4.0.0
- examples
- examples
- 0.0.1-SNAPSHOT
-
-
-
- maven-compiler-plugin
- 3.8.1
-
- 11
-
-
-
-
-
-
- com.intellij
- forms_rt
- 7.0.3
-
-
-
\ No newline at end of file
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse.java
index 6f0a93e..7312d0c 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse2.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse2.java
index 3b27511..af8edd2 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse2.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse2.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse3.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse3.java
index 55c3809..ad2e3ee 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse3.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse3.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/CyclicUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/CyclicUniverse.java
index 2c6e48f..e81d2cb 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/CyclicUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/CyclicUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/EchoUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/EchoUniverse.java
index 8310a68..5b0b7fb 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/EchoUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/EchoUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/Fibonacci.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/Fibonacci.java
index d898cb4..47e26be 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/Fibonacci.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/Fibonacci.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/FibonacciUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/FibonacciUniverse.java
index e2140e5..8c1b76a 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/FibonacciUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/FibonacciUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/HelloUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/HelloUniverse.java
index a9ac352..2078881 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/HelloUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/HelloUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/RecursiveUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/RecursiveUniverse.java
index 04c669e..46d795a 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/RecursiveUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/RecursiveUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/RecursiveUniverse2.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/RecursiveUniverse2.java
index 4c591a1..c277f5b 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/RecursiveUniverse2.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/RecursiveUniverse2.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/examples/SalesUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/examples/SalesUniverse.java
index c997965..cdc6c0b 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/examples/SalesUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/examples/SalesUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.examples;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/geo/D2MainWindow.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/geo/D2MainWindow.java
index cfd5a5b..7530f2e 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/geo/D2MainWindow.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/geo/D2MainWindow.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.geo;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/geo/D2Universe.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/geo/D2Universe.java
index e1a298f..b865871 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/geo/D2Universe.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/geo/D2Universe.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.geo;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/Ball.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/Ball.java
index 442b89c..8f9f4e1 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/Ball.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/Ball.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.newton;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BallBallPair.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BallBallPair.java
index 5975978..9406a58 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BallBallPair.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BallBallPair.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.newton;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BallCushionPair.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BallCushionPair.java
index de8903f..e6f3518 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BallCushionPair.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BallCushionPair.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.newton;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BilliardPane.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BilliardPane.java
index 4344048..d0028d4 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BilliardPane.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BilliardPane.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.newton;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BilliardUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BilliardUniverse.java
index 1817ba1..bad720b 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BilliardUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/BilliardUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.newton;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/CollisionPair.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/CollisionPair.java
index 4625fd0..7687fef 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/CollisionPair.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/CollisionPair.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.newton;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/Table.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/Table.java
index 7f4a776..106ff90 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/Table.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/newton/Table.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.newton;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/ConnectionDialog.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/ConnectionDialog.java
index 6b39739..97b334b 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/ConnectionDialog.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/ConnectionDialog.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.sync;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/D2MainWindow.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/D2MainWindow.java
index b7fb9b4..bc2d75d 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/D2MainWindow.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/D2MainWindow.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.sync;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/D2Universe.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/D2Universe.java
index 9b9b4be..2ec4fc4 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/D2Universe.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/D2Universe.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.sync;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/DiagramEditor.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/DiagramEditor.java
index 1dce488..de47171 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/DiagramEditor.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/DiagramEditor.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.sync;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/Main.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/Main.java
index 3c9fae2..3108487 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/Main.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/Main.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.sync;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/SyncSerializationHelper.java b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/SyncSerializationHelper.java
index de97359..2c92a8b 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/SyncSerializationHelper.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/swing/examples/sync/SyncSerializationHelper.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.examples.sync;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/DiagramCanvas.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/DiagramCanvas.java
index 5d299bc..ec763a0 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/DiagramCanvas.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/DiagramCanvas.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/ProblemsTable.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/ProblemsTable.java
index 51a6729..29bb92c 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/ProblemsTable.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/ProblemsTable.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/ProblemsTableColumn.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/ProblemsTableColumn.java
index c57bfc4..a76bb48 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/ProblemsTableColumn.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/ProblemsTableColumn.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/PropertiesTable.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/PropertiesTable.java
index d399599..980c156 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/PropertiesTable.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/PropertiesTable.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/PropertiesTableColumn.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/PropertiesTableColumn.java
index 5ddd4f2..37df49b 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/PropertiesTableColumn.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/PropertiesTableColumn.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/TextEditorPane.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/TextEditorPane.java
index 82e290b..8cfad5a 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/TextEditorPane.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/TextEditorPane.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/UniverseExplorer.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/UniverseExplorer.java
index c0fd56b..2885264 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/UniverseExplorer.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/UniverseExplorer.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/WBOuterSplitPane.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/WBOuterSplitPane.java
index 4419949..c33cef8 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/WBOuterSplitPane.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/WBOuterSplitPane.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/examples/src/test/java/org/modelingvalue/jdclare/workbench/WBUniverse.java b/examples/src/test/java/org/modelingvalue/jdclare/workbench/WBUniverse.java
index 20b7238..caadee6 100644
--- a/examples/src/test/java/org/modelingvalue/jdclare/workbench/WBUniverse.java
+++ b/examples/src/test/java/org/modelingvalue/jdclare/workbench/WBUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.workbench;
diff --git a/ext/build.gradle.kts b/ext/build.gradle.kts
index 8866917..1ec119b 100644
--- a/ext/build.gradle.kts
+++ b/ext/build.gradle.kts
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
plugins {
java
@@ -19,12 +24,12 @@ plugins {
}
dependencies {
implementation(rootProject)
- implementation("org.modelingvalue:immutable-collections:4.0.0-BRANCHED")
- implementation("org.modelingvalue:dclare:4.0.0-BRANCHED")
+ implementation("org.modelingvalue:immutable-collections:6.0.0-BRANCHED")
+ implementation("org.modelingvalue:dclare:6.0.0-BRANCHED")
testFixturesImplementation(rootProject)
- testFixturesImplementation("org.modelingvalue:immutable-collections:4.0.0-BRANCHED")
- testFixturesImplementation("org.modelingvalue:dclare:4.0.0-BRANCHED")
+ testFixturesImplementation("org.modelingvalue:immutable-collections:6.0.0-BRANCHED")
+ testFixturesImplementation("org.modelingvalue:dclare:6.0.0-BRANCHED")
}
tasks.withType(JavaCompile::class) {
options.compilerArgs.add("-Xlint:unchecked")
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/Cell.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/Cell.java
index 5a9f6cd..a086b00 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/Cell.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/Cell.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/Column.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/Column.java
index 674e5ff..2e10340 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/Column.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/Column.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DAction.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DAction.java
index 027efae..d16b94a 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DAction.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DAction.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DButton.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DButton.java
index 96bd470..8ff973b 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DButton.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DButton.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DComponent.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DComponent.java
index ba74d58..b267795 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DComponent.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DComponent.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DContainer.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DContainer.java
index 5099d01..86bd5f8 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DContainer.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DContainer.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DMenu.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DMenu.java
index 39b7bcb..a8828c7 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DMenu.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DMenu.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DMenubar.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DMenubar.java
index fd53b98..5786141 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DMenubar.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DMenubar.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextArea.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextArea.java
index 2ab3bcd..070e90e 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextArea.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextArea.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextComponent.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextComponent.java
index 463aa48..bce46ec 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextComponent.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextComponent.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextField.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextField.java
index 630904c..34cabf9 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextField.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextField.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextPane.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextPane.java
index 7e116ab..2176cb6 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextPane.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTextPane.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DToolbar.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DToolbar.java
index b8fa337..3993147 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DToolbar.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DToolbar.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DToolbarItem.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DToolbarItem.java
index a7e482a..4ae8992 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DToolbarItem.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DToolbarItem.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTreeNode.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTreeNode.java
index 9e2fb2a..c634883 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DTreeNode.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DTreeNode.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/DVisible.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/DVisible.java
index efa2d82..46f4f0c 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/DVisible.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/DVisible.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/Frame.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/Frame.java
index b6ee0a4..76c1b12 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/Frame.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/Frame.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/GuiUniverse.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/GuiUniverse.java
index 8b4b188..53f01b2 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/GuiUniverse.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/GuiUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
@@ -25,6 +30,7 @@
import javax.swing.SwingUtilities;
import org.modelingvalue.collections.Set;
+import org.modelingvalue.dclare.CoreLeafModifier;
import org.modelingvalue.dclare.ImperativeTransaction;
import org.modelingvalue.dclare.LeafTransaction;
import org.modelingvalue.jdclare.DUniverse;
@@ -45,7 +51,7 @@ default void stopRule() {
@Override
default void init() {
DUniverse.super.init();
- ImperativeTransaction itx = dClare().addImperative("SWING", callNativesOfClass(DVisible.class), SwingUtilities::invokeLater, true);
+ ImperativeTransaction itx = dClare().addImperative("SWING", callNativesOfClass(DVisible.class), SwingUtilities::invokeLater, CoreLeafModifier.keep);
SwingUtilities.invokeLater(() -> LeafTransaction.getContext().setOnThread(itx));
KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
kfm.addKeyEventDispatcher(e -> {
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/InputDeviceData.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/InputDeviceData.java
index 5ad3686..fb35dad 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/InputDeviceData.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/InputDeviceData.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/MenuItem.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/MenuItem.java
index 2e0de5b..6fac0ed 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/MenuItem.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/MenuItem.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/Panel.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/Panel.java
index b9df575..697b1ab 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/Panel.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/Panel.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/PopupMenu.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/PopupMenu.java
index 2b0d72c..275e12e 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/PopupMenu.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/PopupMenu.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/Row.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/Row.java
index 4dc6518..17ad4b9 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/Row.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/Row.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/ScrollPane.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/ScrollPane.java
index 10e1573..1ac2fac 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/ScrollPane.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/ScrollPane.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/SplitPane.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/SplitPane.java
index 8d0e4db..fe59718 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/SplitPane.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/SplitPane.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/TabbedPane.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/TabbedPane.java
index c03246b..a51f8ec 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/TabbedPane.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/TabbedPane.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/Table.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/Table.java
index ce97212..13b9701 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/Table.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/Table.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/TextElement.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/TextElement.java
index d7c6cdd..b7455c0 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/TextElement.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/TextElement.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/TextStyle.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/TextStyle.java
index ce11ed7..f67a887 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/TextStyle.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/TextStyle.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/Tree.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/Tree.java
index 95ce311..2428682 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/Tree.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/Tree.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/CanvasMode.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/CanvasMode.java
index 904950c..86c8247 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/CanvasMode.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/CanvasMode.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/ClickMode.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/ClickMode.java
index 54e8911..3fc1c88 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/ClickMode.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/ClickMode.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/D2D.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/D2D.java
index 8a4d531..d430398 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/D2D.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/D2D.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DCanvas.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DCanvas.java
index f5d790c..d08c9e7 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DCanvas.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DCanvas.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DCircle.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DCircle.java
index 8f9b580..30d19ff 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DCircle.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DCircle.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DDimension.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DDimension.java
index 153bbde..1224467 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DDimension.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DDimension.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DFilled.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DFilled.java
index cba27bb..b3de00b 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DFilled.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DFilled.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DImage.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DImage.java
index 63833e2..5a04f9a 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DImage.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DImage.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DLine.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DLine.java
index cd90cd4..fd637a5 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DLine.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DLine.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DPoint.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DPoint.java
index 6e3c640..ea94248 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DPoint.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DPoint.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DRectangle.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DRectangle.java
index 1770923..64820a0 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DRectangle.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DRectangle.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DShape.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DShape.java
index fc165df..e0e36c1 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DShape.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DShape.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DTriangle.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DTriangle.java
index 39e670d..f262b33 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DTriangle.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/DTriangle.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/LineMode.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/LineMode.java
index 9aa793b..97e3ea7 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/LineMode.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/LineMode.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/SelectionMode.java b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/SelectionMode.java
index 5547496..1e2d7a8 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/SelectionMode.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/swing/draw2d/SelectionMode.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.swing.draw2d;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Grammar.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Grammar.java
index fad3c11..c01da2c 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Grammar.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Grammar.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Line.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Line.java
index 2a7d84f..d125aa5 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Line.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Line.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Literal.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Literal.java
index 86e3fcc..403fb98 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Literal.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Literal.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Parser.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Parser.java
index 47b457d..b961b8b 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Parser.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Parser.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Regex.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Regex.java
index 0450d62..285ac87 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Regex.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Regex.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Sequence.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Sequence.java
index d02ee96..679b5da 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Sequence.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Sequence.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Skipped.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Skipped.java
index 7b0e4de..9d8e4eb 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Skipped.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Skipped.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Syntax.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Syntax.java
index 33218be..fda5ee4 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Syntax.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Syntax.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Text.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Text.java
index c5ebca4..9fcee1f 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Text.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Text.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Token.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Token.java
index 16a9da4..aa9bab7 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Token.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Token.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Tokenizer.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Tokenizer.java
index e759abb..bb7dbc5 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/Tokenizer.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/Tokenizer.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/AnonymousSequenceType.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/AnonymousSequenceType.java
index d064a45..a8b32af 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/AnonymousSequenceType.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/AnonymousSequenceType.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/GrammarClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/GrammarClass.java
index 52fbb66..e4224f7 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/GrammarClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/GrammarClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/NodeClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/NodeClass.java
index 4573a0a..236fe33 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/NodeClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/NodeClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/NodeType.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/NodeType.java
index 3edbb7d..1213458 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/NodeType.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/NodeType.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectNodeClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectNodeClass.java
index 3b5a172..196a9c1 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectNodeClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectNodeClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectSequenceClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectSequenceClass.java
index 7403610..bea6fa6 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectSequenceClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectSequenceClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectTerminalClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectTerminalClass.java
index ffdd7c5..96868f3 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectTerminalClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/ObjectTerminalClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceClass.java
index 338c243..8d5903e 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceElement.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceElement.java
index fd6f48b..f5b57d5 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceElement.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceElement.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceType.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceType.java
index df2c08a..23ede32 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceType.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SequenceType.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructNodeClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructNodeClass.java
index 8fdd2db..9c666d5 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructNodeClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructNodeClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructSequenceClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructSequenceClass.java
index 5106c09..8d8cad4 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructSequenceClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructSequenceClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructTerminalClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructTerminalClass.java
index af2830e..23e874b 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructTerminalClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/StructTerminalClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SyntaxProperty.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SyntaxProperty.java
index 9dbef35..99f95fe 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SyntaxProperty.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SyntaxProperty.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SyntaxPropertyRule.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SyntaxPropertyRule.java
index 240435c..df72913 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SyntaxPropertyRule.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/SyntaxPropertyRule.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/TerminalClass.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/TerminalClass.java
index 799a4be..ab5b883 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/TerminalClass.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/TerminalClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/TokenType.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/TokenType.java
index 36058c5..8b5b7b9 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/TokenType.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/meta/TokenType.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.meta;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/ElementParser.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/ElementParser.java
index 120896f..3dfa2db 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/ElementParser.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/ElementParser.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.parser;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/NodeParser.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/NodeParser.java
index 0d18b2f..91f1efc 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/NodeParser.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/NodeParser.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.parser;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/SequenceElementParser.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/SequenceElementParser.java
index b0667d1..dd941dc 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/SequenceElementParser.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/SequenceElementParser.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.parser;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/SequenceParser.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/SequenceParser.java
index 751e293..0e1885a 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/SequenceParser.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/SequenceParser.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.parser;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/TerminalParser.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/TerminalParser.java
index 8c462dc..68eabd6 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/TerminalParser.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/parser/TerminalParser.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.parser;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMatch.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMatch.java
index 89613fc..a5ecde0 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMatch.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMatch.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.regex;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMatcher.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMatcher.java
index 3987f34..9bcd076 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMatcher.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMatcher.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.regex;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMultiMatcher.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMultiMatcher.java
index e74a6a3..b46032c 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMultiMatcher.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DMultiMatcher.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.regex;
diff --git a/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DPattern.java b/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DPattern.java
index 24fbb1a..ee95543 100644
--- a/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DPattern.java
+++ b/ext/src/main/java/org/modelingvalue/jdclare/syntax/regex/DPattern.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.regex;
diff --git a/ext/src/test/java/org/modelingvalue/jdclare/syntax/test/SyntaxTests.java b/ext/src/test/java/org/modelingvalue/jdclare/syntax/test/SyntaxTests.java
index ae1f530..b1ceb1c 100644
--- a/ext/src/test/java/org/modelingvalue/jdclare/syntax/test/SyntaxTests.java
+++ b/ext/src/test/java/org/modelingvalue/jdclare/syntax/test/SyntaxTests.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/MySyntax.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/MySyntax.java
index f897c40..5732b70 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/MySyntax.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/MySyntax.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/TextUniverse.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/TextUniverse.java
index 0880a54..8f51d71 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/TextUniverse.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/TextUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AClass.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AClass.java
index 73d2303..97c8417 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AClass.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AClass.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AExpression.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AExpression.java
index 2b98f5c..c442651 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AExpression.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AExpression.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AField.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AField.java
index 3ddedb5..ab9c706 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AField.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AField.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AFieldCall.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AFieldCall.java
index e3b0cdf..397330f 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AFieldCall.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AFieldCall.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ANamed.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ANamed.java
index 7166a5d..7aa3872 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ANamed.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ANamed.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ANumberLiteral.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ANumberLiteral.java
index ba14a03..28a0cbd 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ANumberLiteral.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ANumberLiteral.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/APackage.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/APackage.java
index 45cec20..2210f94 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/APackage.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/APackage.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/APackageContainer.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/APackageContainer.java
index 865fad4..728e019 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/APackageContainer.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/APackageContainer.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AStringLiteral.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AStringLiteral.java
index bced894..76a8e3f 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AStringLiteral.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AStringLiteral.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ATyped.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ATyped.java
index f205585..58ae518 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ATyped.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/ATyped.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AUniverse.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AUniverse.java
index 95a3666..df1889d 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AUniverse.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/simple/AUniverse.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.simple;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AClassType.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AClassType.java
index a513217..8e37eba 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AClassType.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AClassType.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.types;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/ANumberType.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/ANumberType.java
index ae0d3f4..50a37fa 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/ANumberType.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/ANumberType.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.types;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AStringType.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AStringType.java
index 540a7bc..239b917 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AStringType.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AStringType.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.types;
diff --git a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AType.java b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AType.java
index 33424fc..4af1bdb 100644
--- a/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AType.java
+++ b/ext/src/testFixtures/java/org/modelingvalue/jdclare/syntax/test/types/AType.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare.syntax.test.types;
diff --git a/gradle.properties b/gradle.properties
index 4372de3..6d0d3be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,20 +1,25 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-## (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-## ~
-## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-## specific language governing permissions and limitations under the License. ~
-## ~
-## Maintainers: ~
-## Wim Bast, Tom Brus, Ronald Krijgsheld ~
-## Contributors: ~
-## Arjan Kok, Carel Bast ~
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+## (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+## ~
+## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+## specific language governing permissions and limitations under the License. ~
+## ~
+## Maintainers: ~
+## Wim Bast, Tom Brus ~
+## ~
+## Contributors: ~
+## Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+## --------------------------------------------------------------------------------------------------------------------- ~
+## In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+## Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+## but also our friend. "He will live on in many of the lines of code you see below." ~
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# suppress inspection "UnusedProperty" for whole file
group = org.modelingvalue
artifact = dclare-for-java
-version = 4.0.0
-version_java = 17
+version = 6.0.0
+version_java = 21
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e583..b1b8ef5 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 070cb70..df6a6ad 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+networkTimeout=10000
+retries=0
+retryBackOffMs=500
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb..b9bb139 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# SPDX-License-Identifier: Apache-2.0
+#
##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -133,22 +132,29 @@ location of your Java installation."
fi
else
JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -165,7 +171,6 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
- CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -193,16 +198,19 @@ if "$cygwin" || "$msys" ; then
done
fi
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
- -classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd..24c62d5 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -21,11 +23,12 @@
@rem
@rem ##########################################################################
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -42,13 +45,13 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
-goto fail
+"%COMSPEC%" /c exit 1
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
@@ -56,36 +59,24 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
-goto fail
+"%COMSPEC%" /c exit 1
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bbc2b69..78268c9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,22 +1,23 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
rootProject.name = "dclare-for-java"
include("ext","examples")
-
-plugins {
- id("com.gradle.enterprise") version ("3.5")
-}
diff --git a/src/main/java/org/modelingvalue/jdclare/Abstract.java b/src/main/java/org/modelingvalue/jdclare/Abstract.java
index 818ae77..3595cbc 100644
--- a/src/main/java/org/modelingvalue/jdclare/Abstract.java
+++ b/src/main/java/org/modelingvalue/jdclare/Abstract.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare;
diff --git a/src/main/java/org/modelingvalue/jdclare/Constraints.java b/src/main/java/org/modelingvalue/jdclare/Constraints.java
index d8606d7..ebd19fc 100644
--- a/src/main/java/org/modelingvalue/jdclare/Constraints.java
+++ b/src/main/java/org/modelingvalue/jdclare/Constraints.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare;
diff --git a/src/main/java/org/modelingvalue/jdclare/DClare.java b/src/main/java/org/modelingvalue/jdclare/DClare.java
index 80cbc08..f823cdf 100644
--- a/src/main/java/org/modelingvalue/jdclare/DClare.java
+++ b/src/main/java/org/modelingvalue/jdclare/DClare.java
@@ -1,17 +1,22 @@
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
-// ~
-// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
-// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
-// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
-// specific language governing permissions and limitations under the License. ~
-// ~
-// Maintainers: ~
-// Wim Bast, Tom Brus, Ronald Krijgsheld ~
-// Contributors: ~
-// Arjan Kok, Carel Bast ~
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
+// ~
+// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
+// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
+// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
+// specific language governing permissions and limitations under the License. ~
+// ~
+// Maintainers: ~
+// Wim Bast, Tom Brus ~
+// ~
+// Contributors: ~
+// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
+// --------------------------------------------------------------------------------------------------------------------- ~
+// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
+// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
+// but also our friend. "He will live on in many of the lines of code you see below." ~
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
package org.modelingvalue.jdclare;
@@ -23,7 +28,14 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodHandles.Lookup;
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Proxy;
+import java.lang.reflect.Type;
import java.time.Clock;
import java.util.Arrays;
import java.util.Comparator;
@@ -36,146 +48,299 @@
import java.util.function.Function;
import java.util.function.Supplier;
-import org.modelingvalue.collections.*;
+import org.modelingvalue.collections.Collection;
+import org.modelingvalue.collections.ContainingCollection;
+import org.modelingvalue.collections.DefaultMap;
+import org.modelingvalue.collections.Entry;
+import org.modelingvalue.collections.List;
+import org.modelingvalue.collections.Map;
+import org.modelingvalue.collections.QualifiedSet;
+import org.modelingvalue.collections.Set;
import org.modelingvalue.collections.util.*;
-import org.modelingvalue.collections.util.ContextThread.ContextPool;
import org.modelingvalue.dclare.*;
import org.modelingvalue.jdclare.DNative.ChangeHandler;
-import org.modelingvalue.jdclare.meta.*;
-
-@SuppressWarnings({"unchecked", "rawtypes", "unused"})
+import org.modelingvalue.jdclare.meta.DClass;
+import org.modelingvalue.jdclare.meta.DClassContainer;
+import org.modelingvalue.jdclare.meta.DMethodProperty;
+import org.modelingvalue.jdclare.meta.DMethodRule;
+import org.modelingvalue.jdclare.meta.DObjectRule;
+import org.modelingvalue.jdclare.meta.DPackage;
+import org.modelingvalue.jdclare.meta.DPackageContainer;
+import org.modelingvalue.jdclare.meta.DProperty;
+import org.modelingvalue.jdclare.meta.DRule;
+import org.modelingvalue.jdclare.meta.DStructClass;
+
+@SuppressWarnings({ "unchecked", "rawtypes", "unused" })
public final class DClare extends UniverseTransaction {
- private static final int ANIMATE_DELAY_TIME = Integer.getInteger("ANIMATE_DELAY_TIME", 1);
+ private static final int ANIMATE_DELAY_TIME = Integer.getInteger("ANIMATE_DELAY_TIME", 1);
//
- private static final ContextPool THE_POOL = ContextThread.createPool();
+ private static final ContextPool THE_POOL = ContextThread.createPool();
//
- private static final String DEFAULT = "DEFAULT";
- private static final String CONSTRAINTS = "CONSTRAINTS";
+ private static final String DEFAULT = "DEFAULT";
+ private static final String CONSTRAINTS = "CONSTRAINTS";
//
- private static final Set> DSTRUCTS = Set.of(DStruct0.class, DStruct1.class, DStruct2.class, DStruct3.class, DStruct4.class, DStruct5.class, DStruct6.class, DStruct7.class, DStruct8.class, DStruct9.class, DStruct10.class);
+ private static final Set> DSTRUCTS = Set.of(DStruct0.class, DStruct1.class, DStruct2.class, DStruct3.class,
+ DStruct4.class, DStruct5.class, DStruct6.class, DStruct7.class, DStruct8.class, DStruct9.class,
+ DStruct10.class);
//
- private static final Method HASH_CODE = method(Object::hashCode);
- private static final Method EQUALS = method(Object::equals);
- private static final Method TO_STRING = method(Object::toString);
+ private static final Method HASH_CODE = method(Object::hashCode);
+ private static final Method EQUALS = method(Object::equals);
+ private static final Method TO_STRING = method(Object::toString);
//
- public static final Method D_OBJECT_RULES = method(DObject::dObjectRules);
- public static final Method D_OBJECT_CLASS = DClare. method(DObject::dClass);
+ public static final Method D_OBJECT_RULES = method(DObject::dObjectRules);
+ public static final Method D_OBJECT_CLASS = DClare.method(DObject::dClass);
//
- private static final Method PACKAGES = method(DPackageContainer::packages);
- private static final Method CLASSES = method(DClassContainer::classes);
+ private static final Method PACKAGES = method(DPackageContainer::packages);
+ private static final Method CLASSES = method(DClassContainer::classes);
//
- private static final Method GET_KEY = method(DStruct::getKey);
- private static final Method GET_KEY_SIZE = method(DStruct::getKeySize);
- private static final Method LOOKUP = method(DStruct::lookup);
+ private static final Method GET_KEY = method(DStruct::getKey);
+ private static final Method GET_KEY_SIZE = method(DStruct::getKeySize);
+ private static final Method LOOKUP = method(DStruct::lookup);
//
- private static final Method PASSED_SECONDS = method(DClock::passSeconds);
+ private static final Method PASSED_SECONDS = method(DClock::passSeconds);
- public static final Observed ROOT_RUN_NR = Observed.of("dRootRunNr", 0);
+ public static final Observed ROOT_RUN_NR = Observed
+ .of("dRootRunNr", 0);
public static final Context CLASS_INIT_STATE = Context.of();
- public static final Setable OPPOSITE = Setable.of("dOpposite", null);
- public static final Setable SCOPE = Setable.of("dScope", null);
- private static final Constant, State> CLASS_INIT = Constant.of("DStructClassInit", c -> {
- if (c.isInterface()) {
- return dClare().constraints(c);
- } else {
- throw new Error("Non Interface DObject Class '" + c + "'");
- }
- });
- private static final Constant, DStructClass> CLASS = Constant., DStructClass> of("DStructClass", (Class c) -> dclare(extend(c, DStructClass.class), c), (tx, c, o, d) -> {
- Class declaringClass = c.getDeclaringClass();
- if (declaringClass == null) {
- Package pack = c.getPackage();
- DClassContainer constainer = DClare.PACKAGE.get(pack != null ? pack.getName() : "");
- DClare.> setable(CLASSES).set(constainer, Set::add, d);
- } else {
- dClass(declaringClass);
- }
- });
- private static final Constant PROPERTY = Constant. of("dProperty", (Method m) -> {
- if (m.getReturnType() != Void.TYPE && !m.isSynthetic() && m.getParameterCount() == 0 && //
- (ann(m, Property.class) != null || extend(m, DMethodProperty.class) != DMethodProperty.class)) {
- return dclare(extend(m, DMethodProperty.class), m);
- } else {
- return null;
- }
- }, (tx, m, o, p) -> {
- if (p != null) {
- dClass((Class) m.getDeclaringClass());
- }
- });
- private static final Constant, Method> METHOD = Constant.of("dMethod", p -> {
- Method method = p.b().implMethod();
- if (method.getDeclaringClass() != p.a()) {
- try {
- return p.a().getMethod(method.getName(), method.getParameterTypes());
- } catch (NoSuchMethodException | SecurityException e) {
- throw new Error(e);
- }
- } else {
- return method;
- }
- });
- private static final Constant GETABLE = Constant.of("dGetable", p -> {
- Object def = p.key() ? null : p.defaultValue();
- SetableModifier[] mods = { //
- mandatory.iff(p.mandatory()), //
- containment.iff(p.containment())};
- Function der = p.derived() ? p.deriver() : null;
- DProperty oppos = p.opposite();
- DProperty scope = p.scopeProperty();
- Supplier> os = oppos != null ? () -> DClare.setable(oppos) : null;
- Supplier>> ss = scope != null ? () -> DClare.setable(scope) : null;
- return p.key() ? new KeyGetable(p, p.keyNr(), null) : p.constant() ? Constant.of(p, def, os, ss, der, mods) : Observed.of(p, def, os, ss, mods);
- });
- public static final Constant RULE = Constant.of("dRule", (Method m) -> {
- if (m.getParameterCount() == 0 && !m.isSynthetic() && (m.isDefault() || Modifier.isPrivate(m.getModifiers())) && //
- (ann(m, Property.class) != null || ann(m, Rule.class) != null || //
- extend(m, DMethodProperty.class) != DMethodProperty.class || extend(m, DMethodRule.class) != DMethodRule.class) && //
- !m.isAnnotationPresent(Default.class) && !qual(m, constant)) {
- return dclare(extend(m, DMethodRule.class), m);
- } else {
- return null;
- }
- });
- private static final Constant PACKAGE = Constant. of("dPackage", (String n) -> {
- int i = n.lastIndexOf('.');
- if (i > 0) {
- DPackage pp = DClare.PACKAGE.get(n.substring(0, i));
- return dclare(DPackage.class, pp, n.substring(i + 1));
- } else {
- return dclare(DPackage.class, dUniverse(), n);
- }
- }, (tx, n, o, p) -> DClare.> setable(PACKAGES).set(p.parent(), Set::add, p));
- private static final Constant, Lookup> NATIVE_LOOKUP = Constant.of("nLookup", c -> dStruct((Class) c).lookup());
- public static final Constant HANDLE = Constant.of("nHandle", Handle::new);
- private static final Constant, Constructor> NATIVE_CONSTRUCTOR = Constant.of("dNativeConstructor", c -> {
- Native ann = ann(c, Native.class);
- Constructor constr = null;
- if (ann != null) {
- c = cls(c, Native.class);
- try {
- constr = (Constructor) ann.value().getConstructor(c);
- } catch (NoSuchMethodException | SecurityException e) {
- throw new Error(e);
- }
- }
- return constr;
- });
- private static final Constant NATIVE = Constant.of("dNative", o -> {
- DNative dNative = null;
- Constructor nativeConstructor = NATIVE_CONSTRUCTOR.get(jClass(o));
- if (nativeConstructor != null) {
- try {
- dNative = nativeConstructor.newInstance(o);
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- throw new Error(e);
- }
- }
- return dNative;
- });
+ public static final Setable OPPOSITE = Setable
+ .of("dOpposite", null);
+ public static final Setable SCOPE = Setable
+ .of("dScope", null);
+ private static final Constant, State> CLASS_INIT = Constant
+ .of("DStructClassInit", c -> {
+ if (c.isInterface()) {
+ return dClare()
+ .constraints(
+ c);
+ } else {
+ throw new Error(
+ "Non Interface DObject Class '"
+ + c
+ + "'");
+ }
+ });
+ private static final Constant, DStructClass> CLASS = Constant
+ ., DStructClass>of("DStructClass",
+ (Class c) -> dclare(extend(c, DStructClass.class), c), (tx, c, o, d) -> {
+ Class declaringClass = c
+ .getDeclaringClass();
+ if (declaringClass == null) {
+ Package pack = c
+ .getPackage();
+ DClassContainer constainer = DClare.PACKAGE
+ .get(pack != null
+ ? pack.getName()
+ : "");
+ DClare.>setable(
+ CLASSES)
+ .set(constainer,
+ Set::add,
+ d);
+ } else {
+ dClass(declaringClass);
+ }
+ });
+ private static final Constant PROPERTY = Constant
+ .of("dProperty", (Method m) -> {
+ if (m.getReturnType() != Void.TYPE
+ && !m.isSynthetic()
+ && m.getParameterCount() == 0
+ && //
+ (ann(m, Property.class) != null
+ || extend(
+ m,
+ DMethodProperty.class) != DMethodProperty.class)) {
+ return dclare(
+ extend(m,
+ DMethodProperty.class),
+ m);
+ } else {
+ return null;
+ }
+ },
+ (tx, m, o, p) -> {
+ if (p != null) {
+ dClass((Class) m.getDeclaringClass());
+ }
+ });
+ private static final Constant, Method> METHOD = Constant
+ .of("dMethod", p -> {
+ Method method = p
+ .b()
+ .implMethod();
+ if (method
+ .getDeclaringClass() != p
+ .a()) {
+ try {
+ return p.a()
+ .getMethod(
+ method.getName(),
+ method.getParameterTypes());
+ } catch (
+ NoSuchMethodException
+ | SecurityException e) {
+ throw new Error(
+ e);
+ }
+ } else {
+ return method;
+ }
+ });
+ private static final Constant GETABLE = Constant
+ .of("dGetable", p -> {
+ Object def = p
+ .key() ? null
+ : p.defaultValue();
+ SetableModifier[] mods = { //
+ mandatory
+ .iff(p.mandatory()), //
+ containment
+ .iff(p.containment()) };
+ Function der = p
+ .derived()
+ ? p.deriver()
+ : null;
+ DProperty oppos = p
+ .opposite();
+ DProperty scope = p
+ .scopeProperty();
+ Supplier> os = oppos != null
+ ? () -> DClare
+ .setable(
+ oppos)
+ : null;
+ Supplier>> ss = scope != null
+ ? () -> DClare
+ .setable(
+ scope)
+ : null;
+ return p.key()
+ ? new KeyGetable(
+ p,
+ p.keyNr(),
+ null)
+ : p.constant()
+ ? Constant
+ .of(p, def,
+ os,
+ ss,
+ der,
+ mods)
+ : Observed
+ .of(p, def,
+ os,
+ ss,
+ mods);
+ });
+ public static final Constant RULE = Constant
+ .of("dRule", (Method m) -> {
+ if (m.getParameterCount() == 0
+ && !m.isSynthetic()
+ && (m.isDefault()
+ || Modifier
+ .isPrivate(
+ m.getModifiers()))
+ && //
+ (ann(m, Property.class) != null
+ || ann(m,
+ Rule.class) != null
+ || //
+ extend(m,
+ DMethodProperty.class) != DMethodProperty.class
+ || extend(
+ m,
+ DMethodRule.class) != DMethodRule.class)
+ && //
+ !m.isAnnotationPresent(
+ Default.class)
+ && !qual(
+ m,
+ constant)) {
+ return dclare(
+ extend(m,
+ DMethodRule.class),
+ m);
+ } else {
+ return null;
+ }
+ });
+ private static final Constant PACKAGE = Constant
+ .of("dPackage", (String n) -> {
+ int i = n
+ .lastIndexOf(
+ '.');
+ if (i > 0) {
+ DPackage pp = DClare.PACKAGE
+ .get(n.substring(
+ 0,
+ i));
+ return dclare(
+ DPackage.class,
+ pp,
+ n.substring(
+ i + 1));
+ } else {
+ return dclare(
+ DPackage.class,
+ dUniverse(),
+ n);
+ }
+ },
+ (tx, n, o, p) -> DClare.>setable(PACKAGES).set(p.parent(),
+ Set::add, p));
+ private static final Constant, Lookup> NATIVE_LOOKUP = Constant
+ .of("nLookup", c -> dStruct((Class) c).lookup());
+ public static final Constant HANDLE = Constant
+ .of("nHandle", Handle::new);
+ private static final Constant, Constructor> NATIVE_CONSTRUCTOR = Constant
+ .of("dNativeConstructor", c -> {
+ Native ann = ann(
+ c,
+ Native.class);
+ Constructor constr = null;
+ if (ann != null) {
+ c = cls(c,
+ Native.class);
+ try {
+ constr = (Constructor) ann
+ .value()
+ .getConstructor(
+ c);
+ } catch (
+ NoSuchMethodException
+ | SecurityException e) {
+ throw new Error(
+ e);
+ }
+ }
+ return constr;
+ });
+ private static final Constant NATIVE = Constant
+ .of("dNative", o -> {
+ DNative dNative = null;
+ Constructor nativeConstructor = NATIVE_CONSTRUCTOR
+ .get(jClass(
+ o));
+ if (nativeConstructor != null) {
+ try {
+ dNative = nativeConstructor
+ .newInstance(
+ o);
+ } catch (
+ InstantiationException
+ | IllegalAccessException
+ | IllegalArgumentException
+ | InvocationTargetException e) {
+ throw new Error(
+ e);
+ }
+ }
+ return dNative;
+ });
public static DClare of(Class universeClass) {
- return new DClare<>(universeClass, true, Clock.systemDefaultZone(), new DclareConfig().withMaxInInQueue(100).withDevMode(true));
+ return new DClare<>(universeClass, true, Clock.systemDefaultZone(),
+ new DclareConfig().withMaxInInQueue(100).withDevMode(true));
}
public static DClare of(Class universeClass, DclareConfig config) {
@@ -191,7 +356,8 @@ public static DClare of(Class universeClass, Clock c
}
public static DClare of(Class universeClass, boolean checkFatals) {
- return new DClare<>(universeClass, checkFatals, Clock.systemDefaultZone(), new DclareConfig().withMaxInInQueue(100).withDevMode(true));
+ return new DClare<>(universeClass, checkFatals, Clock.systemDefaultZone(),
+ new DclareConfig().withMaxInInQueue(100).withDevMode(true));
}
public static DClare of(Class universeClass, boolean checkFatals, DclareConfig config) {
@@ -218,7 +384,8 @@ public static State runAndRead(Class universeClass, Con
}
@SafeVarargs
- public static DClare start(Class universeClass, boolean checkFatals, Consumer... steps) {
+ public static DClare start(Class universeClass, boolean checkFatals,
+ Consumer... steps) {
DClare root = of(universeClass, checkFatals);
root.start();
U universe = root.universe();
@@ -286,42 +453,51 @@ public static , T0, T1> S dclare(Class jClass, T0
}
@SafeVarargs
- public static , T0, T1, T2> S dclare(Class jClass, T0 v0, T1 v1, T2 v2, Consumer... inits) {
+ public static , T0, T1, T2> S dclare(Class jClass, T0 v0, T1 v1, T2 v2,
+ Consumer... inits) {
return init(dStruct(jClass, v0, v1, v2), inits);
}
@SafeVarargs
- public static , T0, T1, T2, T3> S dclare(Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, Consumer... inits) {
+ public static , T0, T1, T2, T3> S dclare(Class jClass, T0 v0, T1 v1, T2 v2,
+ T3 v3, Consumer... inits) {
return init(dStruct(jClass, v0, v1, v2, v3), inits);
}
@SafeVarargs
- public static , T0, T1, T2, T3, T4> S dclare(Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, Consumer... inits) {
+ public static , T0, T1, T2, T3, T4> S dclare(Class jClass, T0 v0, T1 v1,
+ T2 v2, T3 v3, T4 v4, Consumer... inits) {
return init(dStruct(jClass, v0, v1, v2, v3, v4), inits);
}
@SafeVarargs
- public static , T0, T1, T2, T3, T4, T5> S dclare(Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, Consumer... inits) {
+ public static , T0, T1, T2, T3, T4, T5> S dclare(Class jClass, T0 v0,
+ T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, Consumer... inits) {
return init(dStruct(jClass, v0, v1, v2, v3, v4, v5), inits);
}
@SafeVarargs
- public static , T0, T1, T2, T3, T4, T5, T6> S dclare(Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, Consumer... inits) {
+ public static , T0, T1, T2, T3, T4, T5, T6> S dclare(Class jClass,
+ T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, Consumer... inits) {
return init(dStruct(jClass, v0, v1, v2, v3, v4, v5, v6), inits);
}
@SafeVarargs
- public static , T0, T1, T2, T3, T4, T5, T6, T7> S dclare(Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, Consumer... inits) {
+ public static , T0, T1, T2, T3, T4, T5, T6, T7> S dclare(
+ Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, Consumer... inits) {
return init(dStruct(jClass, v0, v1, v2, v3, v4, v5, v6, v7), inits);
}
@SafeVarargs
- public static , T0, T1, T2, T3, T4, T5, T6, T7, T8> S dclare(Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, Consumer... inits) {
+ public static , T0, T1, T2, T3, T4, T5, T6, T7, T8> S dclare(
+ Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, Consumer... inits) {
return init(dStruct(jClass, v0, v1, v2, v3, v4, v5, v6, v7, v8), inits);
}
@SafeVarargs
- public static , T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> S dclare(Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, Consumer... inits) {
+ public static , T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> S dclare(
+ Class jClass, T0 v0, T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+ Consumer... inits) {
return init(dStruct(jClass, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9), inits);
}
@@ -349,7 +525,8 @@ private static S init(S o, Consumer[] inits) {
return o;
}
- public static void OPPOSITE(SerializableFunction from, SerializableFunction to) {
+ public static void OPPOSITE(SerializableFunction from,
+ SerializableFunction to) {
State state = CLASS_INIT_STATE.get();
Method fromMethod = method(from);
Method toMethod = method(to);
@@ -358,11 +535,13 @@ public static void OPPOSITE(Seriali
CLASS_INIT_STATE.setOnThread(state);
}
- public static void SCOPE(SerializableFunction property, SerializableFunction> scope) {
+ public static void SCOPE(SerializableFunction property,
+ SerializableFunction> scope) {
CLASS_INIT_STATE.setOnThread(CLASS_INIT_STATE.get().set(method(property), SCOPE, method(scope)));
}
- public static void rule(O dObject, SerializableFunction property, Function value) {
+ public static void rule(O dObject, SerializableFunction property,
+ Function value) {
Setable> ors = setable(D_OBJECT_RULES);
DProperty dProperty = dProperty(dObject, property);
ors.set(dObject, Set::add, dclare(DObjectRule.class, dObject, dProperty.name(), //
@@ -381,8 +560,9 @@ public static void set(O dObject, SerializableFunction void set(O dObject, SerializableFunction property, BiFunction function, E element) {
- DClare. setable(method(dObject, property)).set(dObject, function, element);
+ public static void set(O dObject, SerializableFunction property,
+ BiFunction function, E element) {
+ DClare.setable(method(dObject, property)).set(dObject, function, element);
}
public static V get(O dObject, SerializableFunction property) {
@@ -398,7 +578,8 @@ public static T pre(Supplier supplier) {
return dClare().preState().get(supplier);
}
- public static Set opposite(O dObject, Class cls, SerializableFunction property) {
+ public static Set opposite(O dObject, Class cls,
+ SerializableFunction property) {
return (Set) getable(dProperty(method(cls, property)).opposite()).getCollection(dObject).asSet();
}
@@ -470,7 +651,8 @@ public static V set(O dObject, DProperty property,
return setable.set(dObject, value);
}
- public static void set(O dObject, DProperty property, BiFunction function, E element) {
+ public static void set(O dObject, DProperty property, BiFunction function,
+ E element) {
Setable setable = (Setable) getable(property.actualize(dObject.dStructClass()));
setable.set(dObject, function, element);
}
@@ -550,11 +732,13 @@ public static Class interf(Object object) {
}
public static T dStruct(Class jClass, Object... key) {
- return (T) Proxy.newProxyInstance(jClass.getClassLoader(), new Class[]{jClass}, new DStructHandler(key, jClass));
+ return (T) Proxy.newProxyInstance(jClass.getClassLoader(), new Class[] { jClass },
+ new DStructHandler(key, jClass));
}
public static T dStruct(Class jClass1, Class jClass2, Object... key) {
- return (T) Proxy.newProxyInstance(jClass1.getClassLoader(), new Class[]{jClass1, jClass2}, new DStructHandler(key, jClass1));
+ return (T) Proxy.newProxyInstance(jClass1.getClassLoader(), new Class[] { jClass1, jClass2 },
+ new DStructHandler(key, jClass1));
}
public static Getable getable(DProperty property) {
@@ -564,7 +748,8 @@ public static Getable getable(DProperty property) {
private static Getable getable(Method method) {
DProperty property = dProperty(method);
if (property == null) {
- throw new Error("Method " + method.getDeclaringClass().getSimpleName() + "::" + method.getName() + " is not a Property");
+ throw new Error("Method " + method.getDeclaringClass().getSimpleName() + "::" + method.getName()
+ + " is not a Property");
}
return getable(property);
}
@@ -579,7 +764,8 @@ public static Setable setable(DProperty property) {
public static F id(F f, Object... key) {
Class[] interfaces = f.getClass().getInterfaces();
- return (F) Proxy.newProxyInstance(interfaces[0].getClassLoader(), interfaces, new IdHandler<>(interfaces[0], f, key));
+ return (F) Proxy.newProxyInstance(interfaces[0].getClassLoader(), interfaces,
+ new IdHandler<>(interfaces[0], f, key));
}
private static final class IdHandler implements InvocationHandler {
@@ -612,7 +798,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
return true;
} else if (!Arrays.equals(key, other.key)) {
return false;
- } else if (Age.age(key) > Age.age(other.key)) {
+ } else if (IdentityRank.rank(key) < IdentityRank.rank(other.key)) {
other.key = key;
f = other.f;
return true;
@@ -713,7 +899,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
return true;
} else if (!Arrays.equals(key, other.key)) {
return false;
- } else if (Age.age(key) > Age.age(other.key)) {
+ } else if (IdentityRank.rank(key) < IdentityRank.rank(other.key)) {
other.key = key;
return true;
} else {
@@ -759,7 +945,8 @@ public static Class elementClass(Type type) {
}
public static Class rawClass(Type type) {
- return type instanceof Class ? (Class) type : type instanceof ParameterizedType ? rawClass(((ParameterizedType) type).getRawType()) : Object.class;
+ return type instanceof Class ? (Class) type
+ : type instanceof ParameterizedType ? rawClass(((ParameterizedType) type).getRawType()) : Object.class;
}
public final static class Handle {
@@ -849,7 +1036,7 @@ private static Method method(Method method, Class anno
}
public static Class extend(Method method, Class target) {
- //noinspection DuplicatedCode
+ // noinspection DuplicatedCode
return overridden(target, method, (e, m) -> {
for (Annotation ann : m.getAnnotations()) {
Extend ext = ann.annotationType().getAnnotation(Extend.class);
@@ -875,7 +1062,7 @@ public static Class extend(Method method, Class target) {
@SuppressWarnings("SameParameterValue")
private static Class extend(Class cls, Class target) {
- //noinspection DuplicatedCode
+ // noinspection DuplicatedCode
return supers(target, cls, (e, c) -> {
for (Annotation ann : c.getAnnotations()) {
Extend ext = ann.annotationType().getAnnotation(Extend.class);
@@ -932,18 +1119,21 @@ public static Function deriver(Method method) {
public static Object defaultValue(Method method, boolean mandatory) {
Method defMethod = DClare.method(method, Default.class);
- return defMethod != null ? run(dStruct((Class) defMethod.getDeclaringClass(), DEFAULT), defMethod) : getDefault(method.getReturnType(), method, mandatory);
+ return defMethod != null ? run(dStruct((Class) defMethod.getDeclaringClass(), DEFAULT), defMethod)
+ : getDefault(method.getReturnType(), method, mandatory);
}
private static Set supers(Set subs) {
subs = subs.filter(DStruct.class::isAssignableFrom).asSet();
- return !subs.isEmpty() ? subs.addAll(supers(subs.flatMap(s -> Collection.of(s.getInterfaces())).asSet())) : subs;
+ return !subs.isEmpty() ? subs.addAll(supers(subs.flatMap(s -> Collection.of(s.getInterfaces())).asSet()))
+ : subs;
}
public static Set dSupers(Class cls) {
Set supers = Set.of(cls.getInterfaces());
Class s = cls.getSuperclass();
- return (s != null ? supers.add(s) : supers).map((Function) DClare::dClass).notNull().asSet();
+ return (s != null ? supers.add(s) : supers).map((Function) DClare::dClass).notNull()
+ .asSet();
}
public static Set> dInnerClasses(Class cls) {
@@ -1016,8 +1206,10 @@ public static Object run(Object self, Method method, Object... args) {
public static StateDeltaHandler callNativesOfClass(Class filterClass) {
return new StateDeltaHandler() {
- private final Concurrent, Pair>> deferred = Concurrent.of(Map.of());
- private final Concurrent, Pair>> queue = Concurrent.of(Map.of());
+ private final Concurrent, Pair>> deferred = Concurrent
+ .of(Map.of());
+ private final Concurrent, Pair>> queue = Concurrent
+ .of(Map.of());
@Override
public void handleDelta(State pre, State post, boolean last, DefaultMap> setted) {
@@ -1040,7 +1232,8 @@ public void handleDelta(State pre, State post, boolean last, DefaultMap {
- if (e1.getKey().id() instanceof DProperty && e1.getKey().getClass() == Observed.class) {
+ if (e1.getKey().id() instanceof DProperty
+ && e1.getKey().getClass() == Observed.class) {
DProperty p = (DProperty) e1.getKey().id();
ChangeHandler nch = p.nativeChangeHandler();
if (nch != null) {
@@ -1089,12 +1282,12 @@ public static int runNr() {
private Thread inputReader;
private Timer timer;
- private final Action stop = Action.of("$stop", o -> stopSetable.set(universe(), true));
- private final Action setTime = Action.of("$setTime", o -> setTime());
- private final Action animate = Action.of("$animate", o -> animate());
- private final Action printOutput = Action.of("$printOutput", o -> printOutput());
- private final Action restart = Action.of("$restart", o -> restart());
- private final Action checkFatals;
+ private final Action stop = Action.of("$stop", o -> stopSetable.set(universe(), true));
+ private final Action setTime = Action.of("$setTime", o -> setTime());
+ private final Action animate = Action.of("$animate", o -> animate());
+ private final Action printOutput = Action.of("$printOutput", o -> printOutput());
+ private final Action restart = Action.of("$restart", o -> restart());
+ private final Action checkFatals;
private DClare(Class universeClass, boolean checkFatals, Clock clock, DclareConfig config) {
super(dStruct(universeClass), THE_POOL, config);
@@ -1212,26 +1405,26 @@ private static Observed cyclicObserved(Method method, SetableModifier... modifie
public void start() {
Action bootstrap = Action.of("$bootstrap", o -> {
- cyclicKey(DClare. method(DMethodProperty::method), 0);
- cyclicKey(DClare. method(DStructClass::jClass), 0);
- cyclicConstant(DClare. method(DMethodProperty::objectClass));
- cyclicConstant(DClare. method(DMethodProperty::elementClass));
- cyclicConstant(DClare. method(DMethodProperty::key));
- cyclicConstant(DClare. method(DMethodProperty::keyNr));
- cyclicConstant(DClare. method(DMethodProperty::validation));
- cyclicConstant(DClare. method(DMethodProperty::many));
- cyclicConstant(DClare. method(DMethodProperty::mandatory));
- cyclicConstant(DClare.