diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml index 52ecc97..b9fd508 100644 --- a/.github/workflows/build_main.yml +++ b/.github/workflows/build_main.yml @@ -30,21 +30,20 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 for x64 - uses: actions/setup-java@v3 + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Maven Action + uses: s4u/setup-maven-action@v1.18.0 with: - java-version: '11' - distribution: 'temurin' - architecture: x64 - cache: maven - - name: Build with Maven + java-version: 21 + java-distribution: temurin + - name: Build and Test with Maven run: mvn verify --batch-mode --update-snapshots --fail-at-end --file pom.xml -Dpps.version.qualifier=$(./versionQualifier.sh) - name: Attach Test Report if: success() || failure() uses: scacap/action-surefire-report@v1 - name: Attach Website - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: PPS-website path: releng/nl.esi.pps.website/target/website diff --git a/.github/workflows/build_tag.yml b/.github/workflows/build_tag.yml index bec8479..965b7d1 100644 --- a/.github/workflows/build_tag.yml +++ b/.github/workflows/build_tag.yml @@ -27,24 +27,23 @@ jobs: build: runs-on: ubuntu-latest - + env: + MAVEN_OPTS: --add-opens java.base/java.lang=ALL-UNNAMED steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 for x64 - uses: actions/setup-java@v3 + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Maven Action + uses: s4u/setup-maven-action@v1.18.0 with: - java-version: '11' - distribution: 'temurin' - architecture: x64 - cache: maven - - name: Build with Maven + java-version: 21 + java-distribution: temurin + - name: Build and Test with Maven run: mvn verify --batch-mode --update-snapshots --fail-at-end --file pom.xml -Dpps.version.enduser=$GITHUB_REF_NAME -Dpps.version.qualifier=$(./versionQualifier.sh $GITHUB_REF_NAME) - name: Attach Test Report if: success() || failure() uses: scacap/action-surefire-report@v1 - name: Release PPS - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') + uses: softprops/action-gh-release@v2 with: files: | products/nl.esi.pps.product/target/products/pps-*.zip diff --git a/.gitignore b/.gitignore index efe12e2..6481d2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,23 @@ +# Maven build folder +**/bin/ +**/target/ + +# Maven Tycho pomless files +**/.polyglot.* +**/.META-INF_MANIFEST.MF +**/feature.xml.takari_issue_192 +**/pom.tycho + +# Generation and merging artifacts +**/xtend-gen/**/*.xtendbin +**/xtend-gen/**/*._trace +**/src-gen/**/*._trace +**/plugin.xml_gen +**/*.orig + /.classpath /.metadata/ /.settings/ /workspace /**/.JETEmitters -/**/bin/ -/**/target/ -/**/xtend-gen/**/*.xtendbin -/**/xtend-gen/**/*._trace -/**/plugin.xml_gen -/**/*.orig /**/.asciidoctor/ diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 0022df0..c152deb 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,7 +1,7 @@ - org.eclipse.tycho.extras - tycho-pomless - 2.6.0 + org.eclipse.tycho + tycho-build + 4.0.13 diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..4382644 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Djava-21 diff --git a/README.md b/README.md index b995510..0294b83 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,10 @@ To create a development environment: If the button is disabled (grey), you are already using the latest version. - In the first wizard window: - Select **Eclipse IDE for Eclipse Comitters** from the big list at the top. - - Select **2021-12** for **Product Version**. - - For **Java 11+ VM** select either a JRE 11 that is installed on your local machine or the JustJ JRE 11 release. + - Select **2024-09** for **Product Version**. + - For **Java 21+ VM** select either a JRE 21 that is installed on your local machine or the JustJ JRE 21 release. Use the button to the right of the dropdown to manage the installed virtual machines on your system. - A JDK can also be downloaded from e.g. [Oracle](https://www.oracle.com/java/technologies/javase/jdk11-archive-downloads.html) or [Adoptium](https://adoptium.net/temurin/archive/?variant=openjdk11&jvmVariant=hotspot&version=11). + A JDK can also be downloaded from e.g. [Adoptium](https://adoptium.net/temurin/releases?version=21&os=any&arch=any). - Choose whether you want a P2 bundle pool (recommended). - Click the **Next** button. - In the second wizard window: diff --git a/features/nl.esi.pps.common.emf.feature/build.properties b/features/nl.esi.pps.common.emf.feature/build.properties index 4104e77..09b9d21 100644 --- a/features/nl.esi.pps.common.emf.feature/build.properties +++ b/features/nl.esi.pps.common.emf.feature/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/features/nl.esi.pps.common.emf.feature/feature.xml b/features/nl.esi.pps.common.emf.feature/feature.xml index 296ef7e..06059ac 100644 --- a/features/nl.esi.pps.common.emf.feature/feature.xml +++ b/features/nl.esi.pps.common.emf.feature/feature.xml @@ -1,7 +1,7 @@ - diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/Activator.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/Activator.java index 028ddf4..beac686 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/Activator.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/Activator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/WorkbenchUtil.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/WorkbenchUtil.java index 2258a59..b8c063e 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/WorkbenchUtil.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/WorkbenchUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/action/DropDownMenuAction.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/action/DropDownMenuAction.java index cc6021b..7bb0f7d 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/action/DropDownMenuAction.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/action/DropDownMenuAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/action/HideContributionItems.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/action/HideContributionItems.java index 7a5e84f..6df9521 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/action/HideContributionItems.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/action/HideContributionItems.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/browser/EclipseWebBrowserEditor.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/browser/EclipseWebBrowserEditor.java index a5036d8..3b6e705 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/browser/EclipseWebBrowserEditor.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/browser/EclipseWebBrowserEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/browser/LinkProcessor.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/browser/LinkProcessor.java index 0917647..b5b9ab0 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/browser/LinkProcessor.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/browser/LinkProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/jobs/StatusReportingJob.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/jobs/StatusReportingJob.java index 9cbffa4..240ad87 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/jobs/StatusReportingJob.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/jobs/StatusReportingJob.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/part/MultiPageViewPart.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/part/MultiPageViewPart.java index 66539d2..60136e5 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/part/MultiPageViewPart.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/part/MultiPageViewPart.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusColumnModel.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusColumnModel.java index 519263f..f8da9e7 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusColumnModel.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusColumnModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusContentProvider.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusContentProvider.java index da86643..9f8fc3b 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusContentProvider.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusDialog.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusDialog.java index aa8a70a..447d0d0 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusDialog.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/status/StatusDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnModel.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnModel.java index 2a6117c..9313dfb 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnModel.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnPaintModel.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnPaintModel.java index 944da24..7e58451 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnPaintModel.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnPaintModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnTooltipModel.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnTooltipModel.java index 75daa3c..065c17e 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnTooltipModel.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/AbstractColumnTooltipModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnCellModel.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnCellModel.java index 486a09c..38a861f 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnCellModel.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnCellModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModel.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModel.java index ef76207..73e5fad 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModel.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModelViewer.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModelViewer.java index afa32d9..36b87b2 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModelViewer.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModelViewer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModelViewerComparator.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModelViewerComparator.java index da9012f..e0fd10b 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModelViewerComparator.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ColumnModelViewerComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/DelegateLabelProvider.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/DelegateLabelProvider.java index f7a279a..9973fa2 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/DelegateLabelProvider.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/DelegateLabelProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/IStructuredGenericContentProvider.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/IStructuredGenericContentProvider.java index 969876d..a3961db 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/IStructuredGenericContentProvider.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/IStructuredGenericContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ManyContentProvider.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ManyContentProvider.java index 15d8d36..c74895c 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ManyContentProvider.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ManyContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/TableColumnModelViewer.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/TableColumnModelViewer.java index 367db9e..a53ab51 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/TableColumnModelViewer.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/TableColumnModelViewer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/TreeColumnModelViewer.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/TreeColumnModelViewer.java index eb15340..3f84173 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/TreeColumnModelViewer.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/TreeColumnModelViewer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ValueCachingColumnModel.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ValueCachingColumnModel.java index c93b0b0..62269c6 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ValueCachingColumnModel.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/viewers/ValueCachingColumnModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/DataAnalysisView.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/DataAnalysisView.java index e967c7a..dfc9d0c 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/DataAnalysisView.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/DataAnalysisView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/IDataAnalysisPage.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/IDataAnalysisPage.java index 14f0ad4..b0cba09 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/IDataAnalysisPage.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/IDataAnalysisPage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/MultiPagePage.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/MultiPagePage.java index 95ad1cb..c0af23b 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/MultiPagePage.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/MultiPagePage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/MultiViewerPage.java b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/MultiViewerPage.java index d462d5e..72df7a1 100644 --- a/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/MultiViewerPage.java +++ b/plugins/nl.esi.pps.common.ide.ui/src/nl/esi/pps/common/ide/ui/views/dataanalysis/MultiViewerPage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.jfreechart.ui/.classpath b/plugins/nl.esi.pps.common.jfreechart.ui/.classpath index 1db08c6..c001577 100644 --- a/plugins/nl.esi.pps.common.jfreechart.ui/.classpath +++ b/plugins/nl.esi.pps.common.jfreechart.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/nl.esi.pps.common.jfreechart.ui/.settings/org.eclipse.core.resources.prefs b/plugins/nl.esi.pps.common.jfreechart.ui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/plugins/nl.esi.pps.common.jfreechart.ui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/nl.esi.pps.common.jfreechart.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/nl.esi.pps.common.jfreechart.ui/.settings/org.eclipse.jdt.core.prefs index c9545f0..23fa13b 100644 --- a/plugins/nl.esi.pps.common.jfreechart.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/nl.esi.pps.common.jfreechart.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=21 diff --git a/plugins/nl.esi.pps.common.jfreechart.ui/META-INF/MANIFEST.MF b/plugins/nl.esi.pps.common.jfreechart.ui/META-INF/MANIFEST.MF index b147d7a..625e798 100644 --- a/plugins/nl.esi.pps.common.jfreechart.ui/META-INF/MANIFEST.MF +++ b/plugins/nl.esi.pps.common.jfreechart.ui/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PPS Common JFreeChart UI Bundle-SymbolicName: nl.esi.pps.common.jfreechart.ui;singleton:=true -Bundle-Version: 0.20.0.qualifier +Bundle-Version: 0.30.0.qualifier Bundle-Vendor: ESI (TNO) Automatic-Module-Name: nl.esi.pps.common.jfreechart.ui -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.trace4cps.common.jfreechart.ui;visibility:=reexport, nl.esi.pps.common.jfreechart;visibility:=reexport, org.eclipse.jface diff --git a/plugins/nl.esi.pps.common.jfreechart.ui/build.properties b/plugins/nl.esi.pps.common.jfreechart.ui/build.properties index d3f191d..2221ce0 100644 --- a/plugins/nl.esi.pps.common.jfreechart.ui/build.properties +++ b/plugins/nl.esi.pps.common.jfreechart.ui/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.common.jfreechart.ui/plugin.xml b/plugins/nl.esi.pps.common.jfreechart.ui/plugin.xml index 93dfa20..478bf23 100644 --- a/plugins/nl.esi.pps.common.jfreechart.ui/plugin.xml +++ b/plugins/nl.esi.pps.common.jfreechart.ui/plugin.xml @@ -1,7 +1,7 @@ - diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/EventArgumentItemPropertyDescriptor.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/EventArgumentItemPropertyDescriptor.java index 2db7125..463b6c9 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/EventArgumentItemPropertyDescriptor.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/EventArgumentItemPropertyDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/ExecutionArgumentItemPropertyDescriptor.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/ExecutionArgumentItemPropertyDescriptor.java index 419b055..22e5c7d 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/ExecutionArgumentItemPropertyDescriptor.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/ExecutionArgumentItemPropertyDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/TmscItemLabelSwitch.xtend b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/TmscItemLabelSwitch.xtend index 03b69db..0ef64d6 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/TmscItemLabelSwitch.xtend +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/TmscItemLabelSwitch.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/DataAnalysisItemContentProviderAdapterFactory.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/DataAnalysisItemContentProviderAdapterFactory.java index ec2f21f..3e623ff 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/DataAnalysisItemContentProviderAdapterFactory.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/DataAnalysisItemContentProviderAdapterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/ExecutionDataAnalysisItemContentProvider.xtend b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/ExecutionDataAnalysisItemContentProvider.xtend index 4337f61..dbb407f 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/ExecutionDataAnalysisItemContentProvider.xtend +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/ExecutionDataAnalysisItemContentProvider.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/FunctionDataAnalysisItemContentProvider.xtend b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/FunctionDataAnalysisItemContentProvider.xtend index 06f38e6..d6d4776 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/FunctionDataAnalysisItemContentProvider.xtend +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/FunctionDataAnalysisItemContentProvider.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/IDataAnalysisItemContentProvider.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/IDataAnalysisItemContentProvider.java index 3d96c7f..92f9c90 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/IDataAnalysisItemContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/IDataAnalysisItemContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/IntervalDataAnalysisItemContentProvider.xtend b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/IntervalDataAnalysisItemContentProvider.xtend index 3eeaf93..40cc02e 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/IntervalDataAnalysisItemContentProvider.xtend +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/IntervalDataAnalysisItemContentProvider.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/MessageDataAnalysisItemContentProvider.xtend b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/MessageDataAnalysisItemContentProvider.xtend index a5bbf42..982a4af 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/MessageDataAnalysisItemContentProvider.xtend +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/MessageDataAnalysisItemContentProvider.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/internal/DataAnalysisItemContentProvider.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/internal/DataAnalysisItemContentProvider.java index ac194eb..4b45efb 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/internal/DataAnalysisItemContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/internal/DataAnalysisItemContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/internal/DataAnalysisItemContentProviderRegistryReader.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/internal/DataAnalysisItemContentProviderRegistryReader.java index 70cb4ba..dfba415 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/internal/DataAnalysisItemContentProviderRegistryReader.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/provider/dataanalysis/internal/DataAnalysisItemContentProviderRegistryReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingDependencies.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingDependencies.java index 887e8df..679b4bd 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingDependencies.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingDependencies.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingExecutions.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingExecutions.java index 50b6624..4c236a5 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingExecutions.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingExecutions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingProperties.java b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingProperties.java index 4bd6026..87aabbf 100644 --- a/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingProperties.java +++ b/plugins/nl.esi.pps.tmsc.edit/src/nl/esi/pps/tmsc/rendering/RenderingProperties.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/TmscItemLabelSwitch.java b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/TmscItemLabelSwitch.java index 17b9bbc..ce99b95 100644 --- a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/TmscItemLabelSwitch.java +++ b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/TmscItemLabelSwitch.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,8 +9,8 @@ */ package nl.esi.pps.tmsc.provider; -import com.google.common.base.Objects; import java.util.Arrays; +import java.util.Objects; import nl.esi.emf.edit.provider.EMFEditUtil; import nl.esi.pps.architecture.ArchitecturePackage; import nl.esi.pps.architecture.deployed.DeployedPackage; @@ -39,44 +39,45 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.xtend2.lib.StringConcatenation; +import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class TmscItemLabelSwitch { public static final TmscItemLabelSwitch eINSTANCE = new TmscItemLabelSwitch(); - + protected String _getText(final Object object) { return String.valueOf(object); } - + protected String _getText(final EObject eObject) { String _switchResult = null; EPackage _ePackage = eObject.eClass().getEPackage(); boolean _matched = false; - if (Objects.equal(_ePackage, TmscPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, TmscPackage.eINSTANCE)) { _matched=true; _switchResult = this.getText(eObject.eClass()); } if (!_matched) { - if (Objects.equal(_ePackage, SpecifiedPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, SpecifiedPackage.eINSTANCE)) { _matched=true; } if (!_matched) { - if (Objects.equal(_ePackage, ImplementedPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, ImplementedPackage.eINSTANCE)) { _matched=true; } } if (!_matched) { - if (Objects.equal(_ePackage, DeployedPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, DeployedPackage.eINSTANCE)) { _matched=true; } } if (!_matched) { - if (Objects.equal(_ePackage, InstantiatedPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, InstantiatedPackage.eINSTANCE)) { _matched=true; } } if (!_matched) { - if (Objects.equal(_ePackage, ArchitecturePackage.eINSTANCE)) { + if (Objects.equals(_ePackage, ArchitecturePackage.eINSTANCE)) { _matched=true; } } @@ -89,12 +90,12 @@ protected String _getText(final EObject eObject) { } return _switchResult; } - + protected String _getText(final EClass eClass) { String _switchResult = null; EPackage _ePackage = eClass.getEPackage(); boolean _matched = false; - if (Objects.equal(_ePackage, TmscPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, TmscPackage.eINSTANCE)) { _matched=true; StringConcatenation _builder = new StringConcatenation(); _builder.append("_UI_"); @@ -104,26 +105,26 @@ protected String _getText(final EClass eClass) { _switchResult = TmscEditPlugin.INSTANCE.getString(_builder.toString()); } if (!_matched) { - if (Objects.equal(_ePackage, SpecifiedPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, SpecifiedPackage.eINSTANCE)) { _matched=true; } if (!_matched) { - if (Objects.equal(_ePackage, ImplementedPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, ImplementedPackage.eINSTANCE)) { _matched=true; } } if (!_matched) { - if (Objects.equal(_ePackage, DeployedPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, DeployedPackage.eINSTANCE)) { _matched=true; } } if (!_matched) { - if (Objects.equal(_ePackage, InstantiatedPackage.eINSTANCE)) { + if (Objects.equals(_ePackage, InstantiatedPackage.eINSTANCE)) { _matched=true; } } if (!_matched) { - if (Objects.equal(_ePackage, ArchitecturePackage.eINSTANCE)) { + if (Objects.equals(_ePackage, ArchitecturePackage.eINSTANCE)) { _matched=true; } } @@ -144,15 +145,15 @@ protected String _getText(final EClass eClass) { } return _elvis; } - + protected String _getText(final FullScopeTMSC tmsc) { return this.getText(tmsc.eClass()); } - + protected String _getText(final ScopedTMSC tmsc) { return tmsc.getName(); } - + protected String _getText(final Lifeline lifeline) { final Executor executor = lifeline.getExecutor(); if ((executor == null)) { @@ -171,7 +172,7 @@ protected String _getText(final Lifeline lifeline) { _builder.append(_text_1); return _builder.toString(); } - + protected String _getText(final EntryEvent event) { StringConcatenation _builder = new StringConcatenation(); _builder.append("Entry at "); @@ -179,7 +180,7 @@ protected String _getText(final EntryEvent event) { _builder.append(_format); return _builder.toString(); } - + protected String _getText(final ExitEvent event) { StringConcatenation _builder = new StringConcatenation(); _builder.append("Exit at "); @@ -187,7 +188,7 @@ protected String _getText(final ExitEvent event) { _builder.append(_format); return _builder.toString(); } - + protected String _getText(final MessageControl messageControl) { StringConcatenation _builder = new StringConcatenation(); Message _message = messageControl.getMessage(); @@ -216,7 +217,7 @@ protected String _getText(final MessageControl messageControl) { _builder.append(_reference_1); return _builder.toString(); } - + private String _getReference(final EntryEvent event) { StringConcatenation _builder = new StringConcatenation(); _builder.append("entry of "); @@ -231,7 +232,7 @@ private String _getReference(final EntryEvent event) { _builder.append(_text_1); return _builder.toString(); } - + private String _getReference(final ExitEvent event) { StringConcatenation _builder = new StringConcatenation(); _builder.append("exit of "); @@ -246,7 +247,7 @@ private String _getReference(final ExitEvent event) { _builder.append(_text_1); return _builder.toString(); } - + protected String _getText(final Dependency dependency) { StringConcatenation _builder = new StringConcatenation(); String _text = this.getText(dependency.eClass()); @@ -267,7 +268,7 @@ protected String _getText(final Dependency dependency) { _builder.append(_reference_1); return _builder.toString(); } - + protected String _getText(final LifelineSegment lifelineSegment) { String _elvis = null; Execution _activeExecution = lifelineSegment.getActiveExecution(); @@ -282,7 +283,7 @@ protected String _getText(final LifelineSegment lifelineSegment) { } return _elvis; } - + protected String _getText(final Execution execution) { Function _function = execution.getFunction(); String _text = null; @@ -291,11 +292,12 @@ protected String _getText(final Execution execution) { } return _text; } - + protected String _getText(final Interval interval) { return interval.getName(); } - + + @XbaseGenerated public String getText(final Object eClass) { if (eClass instanceof EClass) { return _getText((EClass)eClass); @@ -328,7 +330,8 @@ public String getText(final Object eClass) { Arrays.asList(eClass).toString()); } } - + + @XbaseGenerated private String getReference(final Event event) { if (event instanceof EntryEvent) { return _getReference((EntryEvent)event); diff --git a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/ExecutionDataAnalysisItemContentProvider.java b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/ExecutionDataAnalysisItemContentProvider.java index c963c04..9060814 100644 --- a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/ExecutionDataAnalysisItemContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/ExecutionDataAnalysisItemContentProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -26,18 +26,18 @@ public class ExecutionDataAnalysisItemContentProvider implements IDataAnalysisIt * by the same{@link Execution#getComponent() component.} */ private static final String CONF_COMPONENT = "By same component"; - + /** * Data analysis of all {@link Execution executions} with the same{@link Execution#getFunction() function} * on the same{@link Execution#getLifeline() executor.} */ private static final String CONF_EXECUTOR = "On same executor"; - + @Override public Set getConfigurations(final Object object) { return CollectionLiterals.newLinkedHashSet(ExecutionDataAnalysisItemContentProvider.CONF_EXECUTOR, ExecutionDataAnalysisItemContentProvider.CONF_COMPONENT); } - + @Override public String getTitle(final Object object, final String configuration) { final Execution execution = ((Execution) object); @@ -77,7 +77,7 @@ public String getTitle(final Object object, final String configuration) { } return _switchResult; } - + @Override public Iterable getSiblings(final Object object, final String configuration) { final Execution execution = ((Execution) object); @@ -99,7 +99,7 @@ public Iterable getSiblings(final Object object, final String configuration) } return _switchResult; } - + @Override public Long getDuration(final Object object, final Object sibling, final String configuration) { final Execution execution = ((Execution) sibling); diff --git a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/FunctionDataAnalysisItemContentProvider.java b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/FunctionDataAnalysisItemContentProvider.java index 5e14e53..2edc108 100644 --- a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/FunctionDataAnalysisItemContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/FunctionDataAnalysisItemContentProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,9 +9,9 @@ */ package nl.esi.pps.tmsc.provider.dataanalysis; -import com.google.common.base.Objects; import com.google.common.collect.Iterables; import java.util.Collections; +import java.util.Objects; import java.util.Set; import nl.esi.pps.architecture.implemented.Function; import nl.esi.pps.tmsc.Execution; @@ -34,13 +34,13 @@ public class FunctionDataAnalysisItemContentProvider implements IDataAnalysisIte public Set getConfigurations(final Object object) { return Collections.singleton(IDataAnalysisItemContentProvider.DEFAULT_CONFIGURATION); } - + @Override public String getTitle(final Object object, final String configuration) { final Function function = ((Function) object); return function.getName(); } - + @Override public Iterable getSiblings(final Object object, final String configuration) { final Function function = ((Function) object); @@ -64,11 +64,11 @@ public Iterable getSiblings(final Object object, final String configuration) }; final Function1 _function_3 = (Execution it) -> { Function _function_4 = it.getFunction(); - return Boolean.valueOf(Objects.equal(_function_4, function)); + return Boolean.valueOf(Objects.equals(_function_4, function)); }; return IterableExtensions.filter(IterableExtensions.flatMap(IterableExtensions.flatMap(Iterables.filter(IterableExtensions.flatMap(resourceSet.getResources(), _function), FullScopeTMSC.class), _function_1), _function_2), _function_3); } - + @Override public Long getDuration(final Object object, final Object sibling, final String configuration) { final Execution execution = ((Execution) sibling); diff --git a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/IntervalDataAnalysisItemContentProvider.java b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/IntervalDataAnalysisItemContentProvider.java index 676be61..5b88bbd 100644 --- a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/IntervalDataAnalysisItemContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/IntervalDataAnalysisItemContentProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,10 +9,10 @@ */ package nl.esi.pps.tmsc.provider.dataanalysis; -import com.google.common.base.Objects; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Set; import nl.esi.pps.tmsc.Event; import nl.esi.pps.tmsc.EventType; @@ -35,7 +35,7 @@ public class IntervalDataAnalysisItemContentProvider implements IDataAnalysisIte public Set getConfigurations(final Object object) { return Collections.singleton(IDataAnalysisItemContentProvider.DEFAULT_CONFIGURATION); } - + @Override public String getTitle(final Object object, final String configuration) { final Interval interval = ((Interval) object); @@ -60,7 +60,7 @@ public String getTitle(final Object object, final String configuration) { _builder.append(_name_3); return _builder.toString(); } - + @Override public Iterable getSiblings(final Object object, final String configuration) { final Interval interval = ((Interval) object); @@ -96,14 +96,14 @@ public Iterable getSiblings(final Object object, final String configuration) } return pairs; } - + private Iterable getSiblings(final Event event, final String configuration) { final Function1 _function = (Event it) -> { - return Boolean.valueOf(((Objects.equal(it.eClass(), event.eClass()) && Objects.equal(it.getFunction(), event.getFunction())) && Objects.equal(it.getComponent(), event.getComponent()))); + return Boolean.valueOf(((Objects.equals(it.eClass(), event.eClass()) && Objects.equals(it.getFunction(), event.getFunction())) && Objects.equals(it.getComponent(), event.getComponent()))); }; return IterableExtensions.filter(event.getLifeline().getEvents(), _function); } - + @Override public Long getDuration(final Object object, final Object sibling, final String configuration) { final Interval interval = ((Interval) sibling); diff --git a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/MessageDataAnalysisItemContentProvider.java b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/MessageDataAnalysisItemContentProvider.java index 257862b..07adef4 100644 --- a/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/MessageDataAnalysisItemContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.edit/xtend-gen/nl/esi/pps/tmsc/provider/dataanalysis/MessageDataAnalysisItemContentProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,8 +9,8 @@ */ package nl.esi.pps.tmsc.provider.dataanalysis; -import com.google.common.base.Objects; import java.util.Collections; +import java.util.Objects; import java.util.Set; import nl.esi.pps.tmsc.Lifeline; import nl.esi.pps.tmsc.Message; @@ -28,13 +28,13 @@ public Set getConfigurations(final Object object) { Set _xifexpression = null; Lifeline _lifeline = message.getSource().getLifeline(); Lifeline _lifeline_1 = message.getTarget().getLifeline(); - boolean _notEquals = (!Objects.equal(_lifeline, _lifeline_1)); + boolean _notEquals = (!Objects.equals(_lifeline, _lifeline_1)); if (_notEquals) { _xifexpression = Collections.singleton(IDataAnalysisItemContentProvider.DEFAULT_CONFIGURATION); } return _xifexpression; } - + @Override public String getTitle(final Object object, final String configuration) { final Message message = ((Message) object); @@ -49,12 +49,12 @@ public String getTitle(final Object object, final String configuration) { _builder.append(_name_2); return _builder.toString(); } - + @Override public Iterable getSiblings(final Object object, final String configuration) { return TmscQueries.findAllOfTypeBetweenLifelines(((Message) object)); } - + @Override public Long getDuration(final Object object, final Object sibling, final String configuration) { final Message message = ((Message) sibling); diff --git a/plugins/nl.esi.pps.tmsc.editor/.classpath b/plugins/nl.esi.pps.tmsc.editor/.classpath index 0a3b82d..5aad0ff 100644 --- a/plugins/nl.esi.pps.tmsc.editor/.classpath +++ b/plugins/nl.esi.pps.tmsc.editor/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/nl.esi.pps.tmsc.editor/.settings/org.eclipse.core.resources.prefs b/plugins/nl.esi.pps.tmsc.editor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/plugins/nl.esi.pps.tmsc.editor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/nl.esi.pps.tmsc.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/nl.esi.pps.tmsc.editor/.settings/org.eclipse.jdt.core.prefs index c9545f0..23fa13b 100644 --- a/plugins/nl.esi.pps.tmsc.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/nl.esi.pps.tmsc.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=21 diff --git a/plugins/nl.esi.pps.tmsc.editor/META-INF/MANIFEST.MF b/plugins/nl.esi.pps.tmsc.editor/META-INF/MANIFEST.MF index d1029ea..bcf91fc 100644 --- a/plugins/nl.esi.pps.tmsc.editor/META-INF/MANIFEST.MF +++ b/plugins/nl.esi.pps.tmsc.editor/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: nl.esi.pps.tmsc.editor;singleton:=true Automatic-Module-Name: nl.esi.pps.tmsc.editor -Bundle-Version: 0.20.0.qualifier +Bundle-Version: 0.30.0.qualifier Bundle-ClassPath: . Bundle-Activator: nl.esi.pps.tmsc.presentation.TmscEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: nl.esi.pps.tmsc.presentation, nl.esi.pps.tmsc.provider.ext.ui;x-internal:=true, nl.esi.pps.tmsc.provider.ui;x-internal:=true, diff --git a/plugins/nl.esi.pps.tmsc.editor/build.properties b/plugins/nl.esi.pps.tmsc.editor/build.properties index 5017396..b1f744a 100644 --- a/plugins/nl.esi.pps.tmsc.editor/build.properties +++ b/plugins/nl.esi.pps.tmsc.editor/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/plugin.properties b/plugins/nl.esi.pps.tmsc.editor/plugin.properties index 78fbc39..10971f3 100644 --- a/plugins/nl.esi.pps.tmsc.editor/plugin.properties +++ b/plugins/nl.esi.pps.tmsc.editor/plugin.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/plugin.xml b/plugins/nl.esi.pps.tmsc.editor/plugin.xml index f5dcd4d..58557fb 100644 --- a/plugins/nl.esi.pps.tmsc.editor/plugin.xml +++ b/plugins/nl.esi.pps.tmsc.editor/plugin.xml @@ -1,7 +1,7 @@ - diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/EditingDomainDiagnostician.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/EditingDomainDiagnostician.java index 8c9c576..22915af 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/EditingDomainDiagnostician.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/EditingDomainDiagnostician.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/LockableAdapterFactory.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/LockableAdapterFactory.java index abd9998..65f37ac 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/LockableAdapterFactory.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/LockableAdapterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/LockingCommandStack.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/LockingCommandStack.java index dc1dbed..887047d 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/LockingCommandStack.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/LockingCommandStack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscBookmarkHelper.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscBookmarkHelper.java index 2eeb203..5aaf376 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscBookmarkHelper.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscBookmarkHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscContentOutlineComparator.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscContentOutlineComparator.java index ac1c8d1..3dd52fc 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscContentOutlineComparator.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscContentOutlineComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscContentOutlinePage.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscContentOutlinePage.java index 9df1bf0..333fc1f 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscContentOutlinePage.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscContentOutlinePage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscTimeRangeProvider.xtend b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscTimeRangeProvider.xtend index 8dae1e0..c141bb5 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscTimeRangeProvider.xtend +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/presentation/TmscTimeRangeProvider.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/AdapterFactoryDataAnalysisContentProvider.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/AdapterFactoryDataAnalysisContentProvider.java index 77581ab..952df1a 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/AdapterFactoryDataAnalysisContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/AdapterFactoryDataAnalysisContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/DataAnalysisInput.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/DataAnalysisInput.java index 7c40c1e..e9ad6bc 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/DataAnalysisInput.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/DataAnalysisInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/IDataAnalysisContentProvider.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/IDataAnalysisContentProvider.java index fd850b0..f225c5f 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/IDataAnalysisContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/IDataAnalysisContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/IDataAnalysisInput.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/IDataAnalysisInput.java index 4a84efd..4fe3e95 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/IDataAnalysisInput.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ext/ui/IDataAnalysisInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ui/EDurationPropertyEditorFactory.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ui/EDurationPropertyEditorFactory.java index 3b68c66..330b6f8 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ui/EDurationPropertyEditorFactory.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ui/EDurationPropertyEditorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ui/ETimestampFormatPropertyEditorFactory.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ui/ETimestampFormatPropertyEditorFactory.java index f7df946..b107528 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ui/ETimestampFormatPropertyEditorFactory.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/provider/ui/ETimestampFormatPropertyEditorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/AbstractRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/AbstractRenderingStrategy.java index 30f24b0..d7ee711 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/AbstractRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/AbstractRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ActivityRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ActivityRenderingStrategy.java index c5484a8..0797e16 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ActivityRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ActivityRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ComponentRenderingStrategy.xtend b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ComponentRenderingStrategy.xtend index 96bd9e6..2322552 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ComponentRenderingStrategy.xtend +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ComponentRenderingStrategy.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/DefaultRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/DefaultRenderingStrategy.java index cfe76bf..a41d024 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/DefaultRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/DefaultRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/EnumRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/EnumRenderingStrategy.java index 517328a..d341499 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/EnumRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/EnumRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/FullRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/FullRenderingStrategy.java index 86ac5d6..a343225 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/FullRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/FullRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/GroupingRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/GroupingRenderingStrategy.java index 2b9a0a7..384ff13 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/GroupingRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/GroupingRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/HighlightRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/HighlightRenderingStrategy.java index ba88760..d017d1e 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/HighlightRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/HighlightRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IRenderingSeriesConfigurator.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IRenderingSeriesConfigurator.java index 8662730..e752f05 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IRenderingSeriesConfigurator.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IRenderingSeriesConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IRenderingStrategy.java index 8682530..81979a4 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IViewerFilter.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IViewerFilter.java index 1861522..4cd24b0 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IViewerFilter.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/IViewerFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/PropertiesRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/PropertiesRenderingStrategy.java index c8b52ca..53a7a1a 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/PropertiesRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/PropertiesRenderingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ScopesRenderingStrategy.xtend b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ScopesRenderingStrategy.xtend index e75292e..ba2fa4b 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ScopesRenderingStrategy.xtend +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/rendering/plot/ScopesRenderingStrategy.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/ETimestampTickUnit.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/ETimestampTickUnit.java index f37686c..d819505 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/ETimestampTickUnit.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/ETimestampTickUnit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/LifelineContentProvider.xtend b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/LifelineContentProvider.xtend index 8dc58d9..7c1ea77 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/LifelineContentProvider.xtend +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/LifelineContentProvider.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/LifelineOrderOptimizer.xtend b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/LifelineOrderOptimizer.xtend index 2893804..56917ec 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/LifelineOrderOptimizer.xtend +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/LifelineOrderOptimizer.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/TmscPlotViewer.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/TmscPlotViewer.java index efc03c9..e281c68 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/TmscPlotViewer.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/TmscPlotViewer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/TmscPlotViewerPane.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/TmscPlotViewerPane.java index 4082b17..a3d4742 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/TmscPlotViewerPane.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/TmscPlotViewerPane.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilter.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilter.java index 85e2070..3d43ef8 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilter.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilterAction.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilterAction.java index 5f6424a..302ea59 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilterAction.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilterAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilterDialog.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilterDialog.java index e97053b..34a0188 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilterDialog.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/DurationFilterDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscDataAnalysisPage.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscDataAnalysisPage.java index 57699b6..e5ba53c 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscDataAnalysisPage.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscDataAnalysisPage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscDataAnalysisViewer.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscDataAnalysisViewer.java index a1ecc1f..2c5260f 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscDataAnalysisViewer.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscDataAnalysisViewer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscHistogramViewer.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscHistogramViewer.java index c8db290..9a94e17 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscHistogramViewer.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscHistogramViewer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscTimeSeriesViewer.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscTimeSeriesViewer.java index 222d8a5..0b3d90c 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscTimeSeriesViewer.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/dataanalysis/TmscTimeSeriesViewer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/CreateMeasurementCommand.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/CreateMeasurementCommand.java index 9a3719e..2ab1056 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/CreateMeasurementCommand.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/CreateMeasurementCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependenciesRenderer.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependenciesRenderer.java index d73e842..8b3f374 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependenciesRenderer.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependenciesRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependenciesVisibility.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependenciesVisibility.java index 6166495..159c9ae 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependenciesVisibility.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependenciesVisibility.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyAnnotation.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyAnnotation.java index 093ed45..acd477d 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyAnnotation.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyAnnotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyDataItem.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyDataItem.java index 6387c62..fbc7528 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyDataItem.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyDataItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyIncomingAnnotation.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyIncomingAnnotation.java index fe036d0..ad8ba8c 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyIncomingAnnotation.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyIncomingAnnotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyOutgoingAnnotation.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyOutgoingAnnotation.java index db8a7e6..a06ca90 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyOutgoingAnnotation.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/DependencyOutgoingAnnotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/EventNoteAnnotation.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/EventNoteAnnotation.java index b50545b..9a4fd6e 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/EventNoteAnnotation.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/EventNoteAnnotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionDataItem.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionDataItem.java index 1189e57..5c7d897 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionDataItem.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionDataItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionsRenderer.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionsRenderer.java index 37a8305..5a65b7b 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionsRenderer.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionsRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionsVisibility.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionsVisibility.java index b6e3046..9f2f6de 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionsVisibility.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/ExecutionsVisibility.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/IntervalAnnotation.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/IntervalAnnotation.java index 22af834..33b1671 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/IntervalAnnotation.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/IntervalAnnotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/RenderingStrategyRegistryReader.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/RenderingStrategyRegistryReader.java index e8b8f1d..4742402 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/RenderingStrategyRegistryReader.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/RenderingStrategyRegistryReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/RenderingStrategyViewerFilter.java b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/RenderingStrategyViewerFilter.java index 47494e3..72f071d 100644 --- a/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/RenderingStrategyViewerFilter.java +++ b/plugins/nl.esi.pps.tmsc.editor/src/nl/esi/pps/tmsc/viewers/plot/RenderingStrategyViewerFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/presentation/TmscTimeRangeProvider.java b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/presentation/TmscTimeRangeProvider.java index 0019690..723aeb9 100644 --- a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/presentation/TmscTimeRangeProvider.java +++ b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/presentation/TmscTimeRangeProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -25,6 +25,7 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions; import org.eclipse.xtext.xbase.lib.ListExtensions; import org.eclipse.xtext.xbase.lib.Pure; +import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.util.ToStringBuilder; /** @@ -35,17 +36,17 @@ public class TmscTimeRangeProvider { @Data private static class NanoTimeRange { private final boolean epoch; - + private final long start; - + private final long end; - + public NanoTimeRange(final boolean epoch, final long start, final long end) { this.epoch = epoch; this.start = Math.min(start, end); this.end = Math.max(start, end); } - + public AbstractTimeRange toTimeRange() { final long margin = Math.max(Math.round(((this.end - this.start) * 0.05)), 5); final long mStart = Math.max((this.start - margin), 0); @@ -58,7 +59,7 @@ public AbstractTimeRange toTimeRange() { } return _xifexpression; } - + @Override @Pure public int hashCode() { @@ -68,7 +69,7 @@ public int hashCode() { result = prime * result + (int) (this.start ^ (this.start >>> 32)); return prime * result + (int) (this.end ^ (this.end >>> 32)); } - + @Override @Pure public boolean equals(final Object obj) { @@ -87,7 +88,7 @@ public boolean equals(final Object obj) { return false; return true; } - + @Override @Pure public String toString() { @@ -97,23 +98,23 @@ public String toString() { b.add("end", this.end); return b.toString(); } - + @Pure public boolean isEpoch() { return this.epoch; } - + @Pure public long getStart() { return this.start; } - + @Pure public long getEnd() { return this.end; } } - + public static TimeRange getTimeRange(final Object object) { TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange = TmscTimeRangeProvider.doGetTimeRange(object); AbstractTimeRange _timeRange = null; @@ -122,15 +123,15 @@ public static TimeRange getTimeRange(final Object object) { } return _timeRange; } - + private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final Object object) { return null; } - + private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final TmscTimeRangeProvider.NanoTimeRange timeRange) { return timeRange; } - + private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final Iterable elements) { final Function1 _function = (Object it) -> { return TmscTimeRangeProvider.doGetTimeRange(it); @@ -171,7 +172,7 @@ private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final Iterabl } return _switchResult; } - + private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final ITimeRange timeRange) { TmscTimeRangeProvider.NanoTimeRange _xifexpression = null; Long _duration = timeRange.getDuration(); @@ -184,7 +185,7 @@ private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final ITimeRa } return _xifexpression; } - + private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final Event event) { TmscTimeRangeProvider.NanoTimeRange _xifexpression = null; Long _timestamp = event.getTimestamp(); @@ -197,7 +198,7 @@ private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final Event e } return _xifexpression; } - + private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final ScopedTMSC tmsc) { Collection _xifexpression = null; boolean _isEmpty = tmsc.getOrigin().isEmpty(); @@ -222,7 +223,7 @@ private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final ScopedT } return _xifexpression_1; } - + private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final Lifeline lifeline) { final Function1 _function = (Event it) -> { return it.getTimestamp(); @@ -239,7 +240,8 @@ private static TmscTimeRangeProvider.NanoTimeRange _doGetTimeRange(final Lifelin } return _xifexpression; } - + + @XbaseGenerated private static TmscTimeRangeProvider.NanoTimeRange doGetTimeRange(final Object tmsc) { if (tmsc instanceof ScopedTMSC) { return _doGetTimeRange((ScopedTMSC)tmsc); diff --git a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/rendering/plot/ComponentRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/rendering/plot/ComponentRenderingStrategy.java index bde25b4..5b99fd8 100644 --- a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/rendering/plot/ComponentRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/rendering/plot/ComponentRenderingStrategy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -18,17 +18,17 @@ @SuppressWarnings("all") public class ComponentRenderingStrategy extends GroupingRenderingStrategy { public static final String ID = (TmscEditorPlugin.getPlugin().getSymbolicName() + ".component_rendering_strategy"); - + @Override public boolean isSupported(final EditingDomain editingDomain) { return PPSPreferences.isAdvancedFeaturesEnabled(); } - + @Override protected String getGroupKey(final Execution execution) { return execution.getComponent().getName(); } - + @Override protected String getGroupKey(final Dependency dependency) { return null; diff --git a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/rendering/plot/ScopesRenderingStrategy.java b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/rendering/plot/ScopesRenderingStrategy.java index e91746f..add1479 100644 --- a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/rendering/plot/ScopesRenderingStrategy.java +++ b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/rendering/plot/ScopesRenderingStrategy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -23,12 +23,12 @@ @SuppressWarnings("all") public class ScopesRenderingStrategy extends GroupingRenderingStrategy { public static final String ID = (TmscEditorPlugin.getPlugin().getSymbolicName() + ".scopes_rendering_strategy"); - + @Override public boolean isSupported(final EditingDomain editingDomain) { return PPSPreferences.isAdvancedFeaturesEnabled(); } - + @Override public boolean select(final Viewer viewer, final Object parentElement, final Object element) { boolean _switchResult = false; @@ -46,24 +46,24 @@ public boolean select(final Viewer viewer, final Object parentElement, final Obj } return _switchResult; } - + @Override protected String getGroupKey(final Execution execution) { return null; } - + @Override protected String getGroupKey(final Dependency dependency) { return this.getGroupKey(this.getScopesGroup(dependency)); } - + private Iterable getScopesGroup(final Dependency dependency) { final Function1 _function = (ScopedTMSC it) -> { return Boolean.valueOf(ScopesRenderingStrategy.isGroupKey(it)); }; return IterableExtensions.filter(dependency.getScopes(), _function); } - + private String getGroupKey(final Iterable scopesGroup) { String _xifexpression = null; boolean _isEmpty = IterableExtensions.isEmpty(scopesGroup); @@ -80,12 +80,12 @@ private String getGroupKey(final Iterable scopesGroup) { } return _xifexpression; } - + /** * Default value for persisted {@code groupKey} property on ScopedTMSC */ private static final boolean _DEFAULT_SCOPEDTMSC_GROUPKEY = true; - + public static boolean isGroupKey(final ScopedTMSC container) { final String key = "groupKey"; final Object value = container.getProperties().get(key); @@ -94,7 +94,7 @@ public static boolean isGroupKey(final ScopedTMSC container) { } return (boolean) value; } - + public static void setGroupKey(final ScopedTMSC container, final boolean value) { final String key = "groupKey"; if (value == _DEFAULT_SCOPEDTMSC_GROUPKEY) { diff --git a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/viewers/LifelineContentProvider.java b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/viewers/LifelineContentProvider.java index c60d028..0e686ed 100644 --- a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/viewers/LifelineContentProvider.java +++ b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/viewers/LifelineContentProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,10 +9,10 @@ */ package nl.esi.pps.tmsc.viewers; -import com.google.common.base.Objects; import com.google.common.collect.Iterables; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Set; import nl.esi.pps.architecture.deployed.Host; import nl.esi.pps.architecture.implemented.Function; @@ -56,13 +56,13 @@ public LifelineContentProvider(final AdapterFactory adapterFactory) { Metric.class, MetricInstance.class, ResourceSet.class); } - + @Override protected void findContentWithinContext(final Object element, final Set content) { super.findContentWithinContext(element, content); content.remove(null); } - + @Override protected void findContent(final Object context, final Set content) { boolean _matched = false; @@ -186,7 +186,7 @@ protected void findContent(final Object context, final Set content) { _matched=true; final Function1 _function = (Lifeline it) -> { Executor _executor = it.getExecutor(); - return Boolean.valueOf(Objects.equal(_executor, context)); + return Boolean.valueOf(Objects.equals(_executor, context)); }; Iterable _filter = IterableExtensions.filter(this.findLifelines(((EObject)context)), _function); Iterables.addAll(content, _filter); @@ -197,7 +197,7 @@ protected void findContent(final Object context, final Set content) { _matched=true; final Function1 _function = (Lifeline it) -> { Host _host = it.getExecutor().getHost(); - return Boolean.valueOf(Objects.equal(_host, context)); + return Boolean.valueOf(Objects.equals(_host, context)); }; Iterable _filter = IterableExtensions.filter(this.findLifelines(((EObject)context)), _function); Iterables.addAll(content, _filter); @@ -209,7 +209,7 @@ protected void findContent(final Object context, final Set content) { final Function1 _function = (Lifeline it) -> { final Function1 _function_1 = (Event it_1) -> { Component _component = it_1.getComponent(); - return Boolean.valueOf(Objects.equal(_component, context)); + return Boolean.valueOf(Objects.equals(_component, context)); }; return Boolean.valueOf(IterableExtensions.exists(it.getEvents(), _function_1)); }; @@ -223,7 +223,7 @@ protected void findContent(final Object context, final Set content) { final Function1 _function = (Lifeline it) -> { final Function1 _function_1 = (Event it_1) -> { Function _function_2 = it_1.getFunction(); - return Boolean.valueOf(Objects.equal(_function_2, context)); + return Boolean.valueOf(Objects.equals(_function_2, context)); }; return Boolean.valueOf(IterableExtensions.exists(it.getEvents(), _function_1)); }; @@ -237,7 +237,7 @@ protected void findContent(final Object context, final Set content) { final Function1 _function = (Lifeline it) -> { final Function1 _function_1 = (Event it_1) -> { Operation _operation = it_1.getFunction().getOperation(); - return Boolean.valueOf(Objects.equal(_operation, context)); + return Boolean.valueOf(Objects.equals(_operation, context)); }; return Boolean.valueOf(IterableExtensions.exists(it.getEvents(), _function_1)); }; @@ -255,7 +255,7 @@ protected void findContent(final Object context, final Set content) { if (_operation!=null) { _interface=_operation.getInterface(); } - return Boolean.valueOf(Objects.equal(_interface, context)); + return Boolean.valueOf(Objects.equals(_interface, context)); }; return Boolean.valueOf(IterableExtensions.exists(it.getEvents(), _function_1)); }; @@ -299,7 +299,7 @@ protected void findContent(final Object context, final Set content) { super.findContent(context, content); } } - + protected Iterable getConnectedLifelines(final Event event) { final Function1 _function = (Dependency it) -> { return it.getTarget(); @@ -313,7 +313,7 @@ protected Iterable getConnectedLifelines(final Event event) { }; return IterableExtensions.map(adjacentEvents, _function_2); } - + protected Iterable findLifelines(final EObject eObject) { Iterable _elvis = null; Resource _eResource = null; @@ -336,7 +336,7 @@ protected Iterable findLifelines(final EObject eObject) { } return _elvis; } - + protected Iterable findLifelines(final ResourceSet resourceSet) { final Function1> _function = (Resource it) -> { return it.getContents(); diff --git a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/viewers/LifelineOrderOptimizer.java b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/viewers/LifelineOrderOptimizer.java index be955d8..7d22950 100644 --- a/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/viewers/LifelineOrderOptimizer.java +++ b/plugins/nl.esi.pps.tmsc.editor/xtend-gen/nl/esi/pps/tmsc/viewers/LifelineOrderOptimizer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,7 +9,6 @@ */ package nl.esi.pps.tmsc.viewers; -import com.google.common.base.Objects; import com.google.common.collect.Iterables; import com.google.common.graph.EndpointPair; import com.google.common.graph.Graph; @@ -20,6 +19,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.function.Consumer; import nl.esi.pps.common.emf.synchronizedtiming.range.TimeRange; @@ -41,10 +41,10 @@ @SuppressWarnings("all") public class LifelineOrderOptimizer { private static final Logger LOGGER = LoggerFactory.getLogger(LifelineOrderOptimizer.class); - + private LifelineOrderOptimizer() { } - + public static Collection optimizeOrder(final TimeRange timeRange, final Lifeline... lifelines) { final Set messages = LifelineOrderOptimizer.filterMessages(timeRange, lifelines); final MutableGraph graph = GraphBuilder.directed().expectedNodeCount(lifelines.length).build(); @@ -103,7 +103,7 @@ public static Collection optimizeOrder(final TimeRange timeRange, fina } return ListExtensions.reverse(sortedLifelines); } - + public static Set filterMessages(final TimeRange timeRange, final Lifeline... lifelines) { final Function1> _function = (Lifeline it) -> { return it.getEvents(); @@ -118,7 +118,7 @@ public static Set filterMessages(final TimeRange timeRange, final Lifel final Function1 _function_3 = (Message it) -> { Lifeline _lifeline = it.getSource().getLifeline(); Lifeline _lifeline_1 = it.getTarget().getLifeline(); - return Boolean.valueOf(Objects.equal(_lifeline, _lifeline_1)); + return Boolean.valueOf(Objects.equals(_lifeline, _lifeline_1)); }; final Function1 _function_4 = (Message it) -> { return Boolean.valueOf(events.contains(it.getTarget())); @@ -130,7 +130,7 @@ public static Set filterMessages(final TimeRange timeRange, final Lifel final Function1 _function_6 = (Message it) -> { Lifeline _lifeline = it.getSource().getLifeline(); Lifeline _lifeline_1 = it.getTarget().getLifeline(); - return Boolean.valueOf(Objects.equal(_lifeline, _lifeline_1)); + return Boolean.valueOf(Objects.equals(_lifeline, _lifeline_1)); }; final Function1 _function_7 = (Message it) -> { return Boolean.valueOf(events.contains(it.getSource())); @@ -138,7 +138,7 @@ public static Set filterMessages(final TimeRange timeRange, final Lifel final Iterable incomingMessages = IterableExtensions.filter(IterableExtensions.reject(IterableExtensions.flatMap(events, _function_5), _function_6), _function_7); return IterableExtensions.toSet(Queries.union(outgoingMessages, incomingMessages)); } - + public static List> disjunct(final Graph graph) { final Map> node2graph = CollectionLiterals.>newLinkedHashMap(); Set> _edges = graph.edges(); @@ -195,7 +195,7 @@ public static List> disjunct(final Graph g } return IterableExtensions.>toList(Queries.>unique(node2graph.values(), false)); } - + public static List getNodesInTopologicalOrder(final Graph graph) { final Function1 _function = (N k) -> { return k; @@ -241,7 +241,7 @@ public static List getNodesInTopologicalOrder(final Graph< } return result; } - + public static MutableGraph reverse(final Graph graph) { final MutableGraph reversed = GraphBuilder.from(graph).build(); final Consumer _function = (N n) -> { diff --git a/plugins/nl.esi.pps.tmsc.metric.edit/.classpath b/plugins/nl.esi.pps.tmsc.metric.edit/.classpath index 2103459..ad4f967 100644 --- a/plugins/nl.esi.pps.tmsc.metric.edit/.classpath +++ b/plugins/nl.esi.pps.tmsc.metric.edit/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/nl.esi.pps.tmsc.metric.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/nl.esi.pps.tmsc.metric.edit/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..3a79233 100644 --- a/plugins/nl.esi.pps.tmsc.metric.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/nl.esi.pps.tmsc.metric.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=21 diff --git a/plugins/nl.esi.pps.tmsc.metric.edit/META-INF/MANIFEST.MF b/plugins/nl.esi.pps.tmsc.metric.edit/META-INF/MANIFEST.MF index 99e9535..9d48929 100644 --- a/plugins/nl.esi.pps.tmsc.metric.edit/META-INF/MANIFEST.MF +++ b/plugins/nl.esi.pps.tmsc.metric.edit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: nl.esi.pps.tmsc.metric.edit;singleton:=true Automatic-Module-Name: nl.esi.pps.tmsc.metric.edit -Bundle-Version: 0.20.0.qualifier +Bundle-Version: 0.30.0.qualifier Bundle-ClassPath: . Bundle-Activator: nl.esi.pps.tmsc.metric.provider.MetricEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: nl.esi.pps.tmsc.metric.provider, nl.esi.pps.tmsc.metric.provider.dataanalysis Require-Bundle: org.eclipse.core.runtime, diff --git a/plugins/nl.esi.pps.tmsc.metric.edit/build.properties b/plugins/nl.esi.pps.tmsc.metric.edit/build.properties index 48b3db4..3f20d78 100644 --- a/plugins/nl.esi.pps.tmsc.metric.edit/build.properties +++ b/plugins/nl.esi.pps.tmsc.metric.edit/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.metric.edit/plugin.properties b/plugins/nl.esi.pps.tmsc.metric.edit/plugin.properties index 700d061..f763caa 100644 --- a/plugins/nl.esi.pps.tmsc.metric.edit/plugin.properties +++ b/plugins/nl.esi.pps.tmsc.metric.edit/plugin.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.metric.edit/plugin.xml b/plugins/nl.esi.pps.tmsc.metric.edit/plugin.xml index 7a9cf51..c3d91af 100644 --- a/plugins/nl.esi.pps.tmsc.metric.edit/plugin.xml +++ b/plugins/nl.esi.pps.tmsc.metric.edit/plugin.xml @@ -1,7 +1,7 @@ - diff --git a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/MetricRegistryReader.java b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/MetricRegistryReader.java index cae1414..753ddf7 100644 --- a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/MetricRegistryReader.java +++ b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/MetricRegistryReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/PropertiesMetricProcessor.xtend b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/PropertiesMetricProcessor.xtend index 61eb1f6..96ecb3e 100644 --- a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/PropertiesMetricProcessor.xtend +++ b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/PropertiesMetricProcessor.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/extension/IMetricProcessor.java b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/extension/IMetricProcessor.java index 2c9adad..4c851c7 100644 --- a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/extension/IMetricProcessor.java +++ b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/extension/IMetricProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/extension/MetricProcessor.xtend b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/extension/MetricProcessor.xtend index 77897ec..04aa167 100644 --- a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/extension/MetricProcessor.xtend +++ b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/extension/MetricProcessor.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/impl/MetricImplQueries.xtend b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/impl/MetricImplQueries.xtend index bca33e0..d556403 100644 --- a/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/impl/MetricImplQueries.xtend +++ b/plugins/nl.esi.pps.tmsc.metric/src/nl/esi/pps/tmsc/metric/impl/MetricImplQueries.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/PropertiesMetricProcessor.java b/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/PropertiesMetricProcessor.java index 049f42b..12fe80d 100644 --- a/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/PropertiesMetricProcessor.java +++ b/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/PropertiesMetricProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,7 +9,6 @@ */ package nl.esi.pps.tmsc.metric; -import com.google.common.base.Objects; import com.google.common.collect.Iterables; import java.io.Serializable; import java.text.ParseException; @@ -17,6 +16,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import java.util.Objects; import java.util.TreeSet; import nl.esi.pps.preferences.PPSPreferences; import nl.esi.pps.tmsc.Dependency; @@ -38,29 +38,29 @@ @SuppressWarnings("all") public class PropertiesMetricProcessor implements IMetricProcessor { protected static final Logger LOGGER = LoggerFactory.getLogger(PropertiesMetricProcessor.class); - + @Extension protected static final MetricFactory m_metric = MetricFactory.eINSTANCE; - + public static final String PROPERTY_METRIC_BUDGET = "metricBudget"; - + public static final String PROPERTY_METRIC_INSTANCE_FROM_ID = "metricInstanceFromID"; - + public static final String PROPERTY_METRIC_INSTANCE_TO_ID = "metricInstanceToID"; - + public static final String PROPERTY_METRIC_ACTIVITY_CUT_OFF = "metricActivityCutOff"; - + @Override public boolean isEnabled(final FullScopeTMSC tmsc) { return ((tmsc != null) && PPSPreferences.isAdvancedFeaturesEnabled()); } - + @Override public String getConfiguration(final FullScopeTMSC tmsc) { Serializable _metricBudget = PropertiesMetricProcessor.getMetricBudget(tmsc); final Serializable budget = _metricBudget; boolean _matched = false; - if (Objects.equal(budget, null)) { + if (Objects.equals(budget, null)) { _matched=true; return null; } @@ -104,7 +104,7 @@ public String getConfiguration(final FullScopeTMSC tmsc) { } return null; } - + @Override public Long getBudget(final String configuration, final Long defaultBudget) { if ((configuration != null)) { @@ -124,7 +124,7 @@ public Long getBudget(final String configuration, final Long defaultBudget) { } return defaultBudget; } - + @Override public Collection resolveInstances(final FullScopeTMSC tmsc, final String configuration) { final Function1 _function = (Event it) -> { @@ -151,7 +151,7 @@ public Collection resolveInstances(final FullScopeTMSC tmsc, fin } return Collections.unmodifiableCollection(metricInstances); } - + @Override public boolean isActivityCutOff(final Dependency dependency, final MetricInstance metricInstance) { Serializable cutOffValue = PropertiesMetricProcessor.getMetricActivityCutOff(dependency); @@ -162,10 +162,10 @@ public boolean isActivityCutOff(final Dependency dependency, final MetricInstanc } return this.isActivityCutOff(cutOffValue); } - + private boolean isActivityCutOff(final Serializable cutOffValue) { boolean _matched = false; - if (Objects.equal(cutOffValue, null)) { + if (Objects.equals(cutOffValue, null)) { _matched=true; return false; } @@ -190,13 +190,13 @@ private boolean isActivityCutOff(final Serializable cutOffValue) { return false; } } - + public static Serializable getMetricBudget(final FullScopeTMSC container) { final String key = "metricBudget"; final Object value = container.getProperties().get(key); return (Serializable) value; } - + public static void setMetricBudget(final FullScopeTMSC container, final Serializable value) { final String key = "metricBudget"; if (value == null) { @@ -205,13 +205,13 @@ public static void setMetricBudget(final FullScopeTMSC container, final Serializ container.getProperties().put(key, value); } } - + public static Serializable getMetricInstanceFromID(final Event container) { final String key = "metricInstanceFromID"; final Object value = container.getProperties().get(key); return (Serializable) value; } - + public static void setMetricInstanceFromID(final Event container, final Serializable value) { final String key = "metricInstanceFromID"; if (value == null) { @@ -220,13 +220,13 @@ public static void setMetricInstanceFromID(final Event container, final Serializ container.getProperties().put(key, value); } } - + public static Serializable getMetricInstanceToID(final Event container) { final String key = "metricInstanceToID"; final Object value = container.getProperties().get(key); return (Serializable) value; } - + public static void setMetricInstanceToID(final Event container, final Serializable value) { final String key = "metricInstanceToID"; if (value == null) { @@ -235,13 +235,13 @@ public static void setMetricInstanceToID(final Event container, final Serializab container.getProperties().put(key, value); } } - + public static Serializable getMetricActivityCutOff(final Dependency container) { final String key = "metricActivityCutOff"; final Object value = container.getProperties().get(key); return (Serializable) value; } - + public static void setMetricActivityCutOff(final Dependency container, final Serializable value) { final String key = "metricActivityCutOff"; if (value == null) { @@ -250,13 +250,13 @@ public static void setMetricActivityCutOff(final Dependency container, final Ser container.getProperties().put(key, value); } } - + public static Serializable getMetricActivityCutOff(final Execution container) { final String key = "metricActivityCutOff"; final Object value = container.getProperties().get(key); return (Serializable) value; } - + public static void setMetricActivityCutOff(final Execution container, final Serializable value) { final String key = "metricActivityCutOff"; if (value == null) { diff --git a/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/extension/MetricProcessor.java b/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/extension/MetricProcessor.java index e49478a..45771a3 100644 --- a/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/extension/MetricProcessor.java +++ b/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/extension/MetricProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,10 +9,10 @@ */ package nl.esi.pps.tmsc.metric.extension; -import com.google.common.base.Objects; import com.google.common.collect.Iterables; import java.util.Collection; import java.util.Map; +import java.util.Objects; import nl.esi.pps.tmsc.Dependency; import nl.esi.pps.tmsc.FullScopeTMSC; import nl.esi.pps.tmsc.metric.Metric; @@ -38,25 +38,25 @@ public class MetricProcessor { @Extension private static final MetricFactory m_metric = MetricFactory.eINSTANCE; - + private final Map configurationBudgets = CollectionLiterals.newLinkedHashMap(); - + @Accessors private final String id; - + @Accessors private final String name; - + @Accessors private final String category; - + @Accessors private final String modelId; - + private final Long defaultBudget; - + private final IMetricProcessor metricProcessor; - + /** * Adds a budget for a configuration */ @@ -68,28 +68,28 @@ public boolean addBudget(final String configuration, final Long budget) { this.configurationBudgets.put(configuration, budget); return true; } - + /** * Removes a budget for a configuration */ public void removeBudget(final String configuration) { this.configurationBudgets.remove(configuration); } - + /** * @see IMetricProcessor#isEnabled(FullScopeTMSC) */ public boolean isEnabled(final FullScopeTMSC tmsc) { return this.metricProcessor.isEnabled(tmsc); } - + /** * @see IMetricProcessor#isRequiredToResolveInstances(String, String) */ public boolean isRequiredToResolveInstances(final String hostName, final String componentName) { return this.metricProcessor.isRequiredToResolveInstances(hostName, componentName); } - + /** * Resolves the instances for this metric and adds them to the * {@link #getMetricModel(FullScopeTMSC) default metric model}. @@ -100,7 +100,7 @@ public boolean isRequiredToResolveInstances(final String hostName, final String public Metric analyse(final FullScopeTMSC tmsc) { return this.analyse(tmsc, MetricProcessor.getMetricModel(tmsc)); } - + /** * Resolves the instances for this metric and adds them to the {@code metricModel}. */ @@ -122,7 +122,7 @@ public Metric analyse(final FullScopeTMSC tmsc, final MetricModel metricModel) { Iterables.addAll(_instances, metricInstances); return metric; } - + /** * Convenience method that finds the Metric model in the resource of the TMSC, or * creates a new Metric model if it could not be found (and adds it to the @@ -146,16 +146,16 @@ public static MetricModel getMetricModel(final FullScopeTMSC tmsc) { } return metricModel; } - + private static Metric createMetric(final MetricProcessor metricExtension, final MetricModel metricModel) { final Function1 _function = (Metric it) -> { String _id = it.getId(); - return Boolean.valueOf(Objects.equal(_id, metricExtension.id)); + return Boolean.valueOf(Objects.equals(_id, metricExtension.id)); }; EcoreUtil.deleteAll(IterableExtensions.toList(IterableExtensions.filter(metricModel.getMetrics(), _function)), true); final Function1 _function_1 = (MetricCategory it) -> { String _name = it.getName(); - return Boolean.valueOf(Objects.equal(_name, metricExtension.category)); + return Boolean.valueOf(Objects.equals(_name, metricExtension.category)); }; MetricCategory metricCategory = IterableExtensions.findFirst(metricModel.getCategories(), _function_1); if ((metricCategory == null)) { @@ -172,26 +172,26 @@ private static Metric createMetric(final MetricProcessor metricExtension, final _metrics.add(metric); return metric; } - + /** * @see IMetricProcessor#getAnalysisTimeWindow(MetricInstance) */ public Pair getAnalysisTimeWindow(final MetricInstance metricInstance) { return this.metricProcessor.getAnalysisTimeWindow(metricInstance); } - + /** * @see IMetricProcessor#isActivityCutOff(Dependency, MetricInstance) */ public boolean isActivityCutOff(final Dependency dependency, final MetricInstance metricInstance) { return this.metricProcessor.isActivityCutOff(dependency, metricInstance); } - + @Override public String toString() { return this.id; } - + public MetricProcessor(final String id, final String name, final String category, final String modelId, final Long defaultBudget, final IMetricProcessor metricProcessor) { super(); this.id = id; @@ -201,22 +201,22 @@ public MetricProcessor(final String id, final String name, final String category this.defaultBudget = defaultBudget; this.metricProcessor = metricProcessor; } - + @Pure public String getId() { return this.id; } - + @Pure public String getName() { return this.name; } - + @Pure public String getCategory() { return this.category; } - + @Pure public String getModelId() { return this.modelId; diff --git a/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/impl/MetricImplQueries.java b/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/impl/MetricImplQueries.java index 8f4dd17..8cd2cdb 100644 --- a/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/impl/MetricImplQueries.java +++ b/plugins/nl.esi.pps.tmsc.metric/xtend-gen/nl/esi/pps/tmsc/metric/impl/MetricImplQueries.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -23,7 +23,7 @@ public static String getNameImpl(final MetricInstance metricInstance) { _builder.append(_id); return _builder.toString(); } - + public static boolean isExceedsBudgetImpl(final MetricInstance metricInstance) { final Long budget = metricInstance.getMetric().getBudget(); final Long duration = metricInstance.getDuration(); diff --git a/plugins/nl.esi.pps.tmsc.reconstruct.ui/.classpath b/plugins/nl.esi.pps.tmsc.reconstruct.ui/.classpath index 1db08c6..c001577 100644 --- a/plugins/nl.esi.pps.tmsc.reconstruct.ui/.classpath +++ b/plugins/nl.esi.pps.tmsc.reconstruct.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/nl.esi.pps.tmsc.reconstruct.ui/.settings/org.eclipse.core.resources.prefs b/plugins/nl.esi.pps.tmsc.reconstruct.ui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/plugins/nl.esi.pps.tmsc.reconstruct.ui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/nl.esi.pps.tmsc.reconstruct.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/nl.esi.pps.tmsc.reconstruct.ui/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..3a79233 100644 --- a/plugins/nl.esi.pps.tmsc.reconstruct.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/nl.esi.pps.tmsc.reconstruct.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=21 diff --git a/plugins/nl.esi.pps.tmsc.reconstruct.ui/META-INF/MANIFEST.MF b/plugins/nl.esi.pps.tmsc.reconstruct.ui/META-INF/MANIFEST.MF index 518c76a..748d060 100644 --- a/plugins/nl.esi.pps.tmsc.reconstruct.ui/META-INF/MANIFEST.MF +++ b/plugins/nl.esi.pps.tmsc.reconstruct.ui/META-INF/MANIFEST.MF @@ -2,10 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: TMSC Reconstruct UI Bundle-SymbolicName: nl.esi.pps.tmsc.reconstruct.ui;singleton:=true -Bundle-Version: 0.20.0.qualifier +Bundle-Version: 0.30.0.qualifier Bundle-Vendor: ESI (TNO) -Require-Bundle: javax.inject, - org.eclipse.osgi, +Require-Bundle: org.eclipse.osgi, org.eclipse.jface, org.eclipse.e4.ui.services, org.eclipse.e4.core.di.annotations, @@ -14,7 +13,7 @@ Require-Bundle: javax.inject, org.eclipse.core.resources, org.eclipse.emf.ecore, nl.esi.pps.tmsc.reconstruct -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: javax.annotation;version="1.2.0", javax.inject;version="1.0.0" Automatic-Module-Name: nl.esi.pps.tmsc.reconstruct.ui diff --git a/plugins/nl.esi.pps.tmsc.reconstruct.ui/build.properties b/plugins/nl.esi.pps.tmsc.reconstruct.ui/build.properties index 0681e88..8db88f4 100644 --- a/plugins/nl.esi.pps.tmsc.reconstruct.ui/build.properties +++ b/plugins/nl.esi.pps.tmsc.reconstruct.ui/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.reconstruct.ui/plugin.xml b/plugins/nl.esi.pps.tmsc.reconstruct.ui/plugin.xml index e016a78..726d3ef 100644 --- a/plugins/nl.esi.pps.tmsc.reconstruct.ui/plugin.xml +++ b/plugins/nl.esi.pps.tmsc.reconstruct.ui/plugin.xml @@ -1,7 +1,7 @@ * diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/GenerateTmscXtext.mwe2 b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/GenerateTmscXtext.mwe2 index 837d2ed..7b0eb92 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/GenerateTmscXtext.mwe2 +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/GenerateTmscXtext.mwe2 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtext.xtext b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtext.xtext index 27f3d02..13714b9 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtext.xtext +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtext.xtext @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextQueries.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextQueries.xtend index d03cca8..207fd38 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextQueries.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextQueries.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextRuntimeModule.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextRuntimeModule.xtend index 12106a9..42af23f 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextRuntimeModule.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextRuntimeModule.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextStandaloneSetup.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextStandaloneSetup.xtend index 16273da..b34ee2a 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextStandaloneSetup.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextStandaloneSetup.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextTransientValueService.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextTransientValueService.xtend index fb6bdbb..b63dc29 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextTransientValueService.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/TmscXtextTransientValueService.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/ISO8601ValueConverter.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/ISO8601ValueConverter.xtend index 75b692d..c012b6c 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/ISO8601ValueConverter.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/ISO8601ValueConverter.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/PosEBigDecimalConverter.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/PosEBigDecimalConverter.xtend index 739b6d5..192bc81 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/PosEBigDecimalConverter.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/PosEBigDecimalConverter.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/StringFallbackValueConverter.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/StringFallbackValueConverter.xtend index 588d699..a80793a 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/StringFallbackValueConverter.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/StringFallbackValueConverter.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/TmscXtextValueConverterService.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/TmscXtextValueConverterService.xtend index 07f1f68..06b5e29 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/TmscXtextValueConverterService.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/conversion/TmscXtextValueConverterService.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/formatting/TmscXtextFormatter.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/formatting/TmscXtextFormatter.xtend index 1178d72..771c58e 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/formatting/TmscXtextFormatter.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/formatting/TmscXtextFormatter.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/generator/TmscXtextGenerator.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/generator/TmscXtextGenerator.xtend index 9ceed2a..d454331 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/generator/TmscXtextGenerator.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/generator/TmscXtextGenerator.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/generator/TmscXtextToTmscTransformation.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/generator/TmscXtextToTmscTransformation.xtend index 677843a..cf759b5 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/generator/TmscXtextToTmscTransformation.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/generator/TmscXtextToTmscTransformation.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/linking/TmscXtextLinkingService.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/linking/TmscXtextLinkingService.xtend index 1f77445..51e43cc 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/linking/TmscXtextLinkingService.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/linking/TmscXtextLinkingService.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/scoping/TmscXtextScopeProvider.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/scoping/TmscXtextScopeProvider.xtend index 1f07c62..36d9a90 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/scoping/TmscXtextScopeProvider.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/scoping/TmscXtextScopeProvider.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/validation/TmscXtextValidator.xtend b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/validation/TmscXtextValidator.xtend index f6b2ae4..313e690 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/validation/TmscXtextValidator.xtend +++ b/plugins/nl.esi.pps.tmsc.xtext/src/nl/esi/pps/tmsc/xtext/validation/TmscXtextValidator.xtend @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextQueries.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextQueries.java index b6846fc..b64eb00 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextQueries.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextQueries.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -22,7 +22,7 @@ public class TmscXtextQueries { private TmscXtextQueries() { } - + public static XDependencyType getType(final XDependency xDependency) { if ((xDependency == null)) { return null; @@ -44,13 +44,13 @@ public static XDependencyType getType(final XDependency xDependency) { } return XDependencyType.MESSAGE; } - + public static String getXtextName(final PropertiesContainer container) { final String key = "xtextName"; final Object value = container.getProperties().get(key); return (String) value; } - + public static void setXtextName(final PropertiesContainer container, final String value) { final String key = "xtextName"; if (value == null) { diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextRuntimeModule.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextRuntimeModule.java index 8ca2503..073a2f5 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextRuntimeModule.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextRuntimeModule.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -28,22 +28,22 @@ public class TmscXtextRuntimeModule extends AbstractTmscXtextRuntimeModule { public Class bindIValueConverterService() { return TmscXtextValueConverterService.class; } - + @Override public Class bindILinkingService() { return TmscXtextLinkingService.class; } - + @Override public Class bindITransientValueService() { return TmscXtextTransientValueService.class; } - + @Override public Class bindIGlobalScopeProvider() { return ImportUriGlobalScopeProvider.class; } - + @Override public Class bindIFormatter() { return TmscXtextFormatter.class; diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextStandaloneSetup.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextStandaloneSetup.java index 21229f0..0dbd986 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextStandaloneSetup.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextStandaloneSetup.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextTransientValueService.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextTransientValueService.java index dc10cb1..6128cea 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextTransientValueService.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/TmscXtextTransientValueService.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,8 +9,8 @@ */ package nl.esi.pps.tmsc.xtext; -import com.google.common.base.Objects; import java.util.List; +import java.util.Objects; import nl.esi.pps.tmsc.xtext.tmscXtext.TmscXtextPackage; import nl.esi.pps.tmsc.xtext.tmscXtext.XComponent; import nl.esi.pps.tmsc.xtext.tmscXtext.XFunction; @@ -24,11 +24,11 @@ public class TmscXtextTransientValueService extends DefaultTransientValueService public boolean isCheckElementsIndividually(final EObject owner, final EStructuralFeature feature) { boolean _switchResult = false; boolean _matched = false; - if (Objects.equal(feature, TmscXtextPackage.Literals.TMSC_XTEXT_MODEL__COMPONENTS)) { + if (Objects.equals(feature, TmscXtextPackage.Literals.TMSC_XTEXT_MODEL__COMPONENTS)) { _matched=true; } if (!_matched) { - if (Objects.equal(feature, TmscXtextPackage.Literals.TMSC_XTEXT_MODEL__FUNCTIONS)) { + if (Objects.equals(feature, TmscXtextPackage.Literals.TMSC_XTEXT_MODEL__FUNCTIONS)) { _matched=true; } } @@ -40,19 +40,19 @@ public boolean isCheckElementsIndividually(final EObject owner, final EStructura } return _switchResult; } - + @Override public boolean isTransient(final EObject owner, final EStructuralFeature feature, final int index) { boolean _switchResult = false; boolean _matched = false; - if (Objects.equal(feature, TmscXtextPackage.Literals.TMSC_XTEXT_MODEL__COMPONENTS)) { + if (Objects.equals(feature, TmscXtextPackage.Literals.TMSC_XTEXT_MODEL__COMPONENTS)) { _matched=true; Object _element = TmscXtextTransientValueService.getElement(owner, feature, index); String _description = ((XComponent) _element).getDescription(); _switchResult = (_description == null); } if (!_matched) { - if (Objects.equal(feature, TmscXtextPackage.Literals.TMSC_XTEXT_MODEL__FUNCTIONS)) { + if (Objects.equals(feature, TmscXtextPackage.Literals.TMSC_XTEXT_MODEL__FUNCTIONS)) { _matched=true; Object _element_1 = TmscXtextTransientValueService.getElement(owner, feature, index); String _description_1 = ((XFunction) _element_1).getDescription(); @@ -64,7 +64,7 @@ public boolean isTransient(final EObject owner, final EStructuralFeature feature } return _switchResult; } - + private static Object getElement(final EObject owner, final EStructuralFeature feature, final int index) { final Object value = owner.eGet(feature); Object _xifexpression = null; diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/ISO8601ValueConverter.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/ISO8601ValueConverter.java index b8a68da..556c74c 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/ISO8601ValueConverter.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/ISO8601ValueConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -23,7 +23,7 @@ public class ISO8601ValueConverter implements IValueConverter { private static final BigDecimal minimumDate = BigDecimal.valueOf( ZonedDateTime.parse("1971-01-01T00:00:00Z", DateTimeFormatter.ISO_OFFSET_DATE_TIME).toInstant().getEpochSecond()); - + @Override public String toString(final BigDecimal value) throws ValueConverterException { boolean _lessThan = (value.compareTo(ISO8601ValueConverter.minimumDate) < 0); @@ -34,7 +34,7 @@ public String toString(final BigDecimal value) throws ValueConverterException { final long nanoAdjustment = value.remainder(BigDecimal.ONE).movePointRight(9).longValue(); return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(Instant.ofEpochSecond(epochSecond, nanoAdjustment)); } - + @Override public BigDecimal toValue(final String string, final INode node) throws ValueConverterException { try { diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/PosEBigDecimalConverter.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/PosEBigDecimalConverter.java index a356cc2..72467a5 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/PosEBigDecimalConverter.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/PosEBigDecimalConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -33,7 +33,7 @@ public String toString(final BigDecimal value) throws ValueConverterException { _builder_1.append(value); return _builder_1.toString(); } - + @Override public BigDecimal toValue(final String string, final INode node) throws ValueConverterException { try { diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/StringFallbackValueConverter.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/StringFallbackValueConverter.java index e2bc16f..b2d5d42 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/StringFallbackValueConverter.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/StringFallbackValueConverter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -19,9 +19,9 @@ @SuppressWarnings("all") public class StringFallbackValueConverter implements IValueConverter { private final IValueConverter fallbackValueConverter; - + private final IValueConverter stringValueConverter; - + /** * Prefer ID with fallback to STRING */ @@ -37,7 +37,7 @@ public String toString(final String value) throws ValueConverterException { } } } - + /** * Try STRING with fallback to ID */ @@ -51,7 +51,7 @@ public String toValue(final String string, final INode node) throws ValueConvert } return _xifexpression; } - + public StringFallbackValueConverter(final IValueConverter fallbackValueConverter, final IValueConverter stringValueConverter) { super(); this.fallbackValueConverter = fallbackValueConverter; diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/TmscXtextValueConverterService.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/TmscXtextValueConverterService.java index 1185593..4eeda02 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/TmscXtextValueConverterService.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/conversion/TmscXtextValueConverterService.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -20,25 +20,25 @@ public class TmscXtextValueConverterService extends DefaultTerminalConverters { @Inject private QualifiedNameValueConverter qualifiedNameValueConverter; - + @ValueConverter(rule = "IDString") public IValueConverter getIDStringConverter() { IValueConverter _ID = this.ID(); IValueConverter _STRING = this.STRING(); return new StringFallbackValueConverter(_ID, _STRING); } - + @ValueConverter(rule = "FQNString") public IValueConverter getFQNStringConverter() { IValueConverter _STRING = this.STRING(); return new StringFallbackValueConverter(this.qualifiedNameValueConverter, _STRING); } - + @ValueConverter(rule = "ISO8601") public IValueConverter getISO8601Converter() { return new ISO8601ValueConverter(); } - + @ValueConverter(rule = "POS_EBIGDECIMAL") public IValueConverter getPosEBigDecimalConverter() { return new PosEBigDecimalConverter(); diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/formatting/TmscXtextFormatter.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/formatting/TmscXtextFormatter.java index 7cdb569..9eacd07 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/formatting/TmscXtextFormatter.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/formatting/TmscXtextFormatter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -23,7 +23,7 @@ public class TmscXtextFormatter extends AbstractDeclarativeFormatter { @Inject @Extension private TmscXtextGrammarAccess tmscXtextGrammarAccess; - + @Override protected void configureFormatting(final FormattingConfig it) { it.setAutoLinewrap(120); diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/generator/TmscXtextGenerator.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/generator/TmscXtextGenerator.java index c037b01..6490799 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/generator/TmscXtextGenerator.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/generator/TmscXtextGenerator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -62,7 +62,7 @@ public class TmscXtextGenerator extends AbstractGenerator { @Inject @Extension private TmscXtextGrammarAccess tmscXtextGrammarAccess; - + @Override public void doGenerate(final Resource resource, final IFileSystemAccess2 fsa, final IGeneratorContext context) { final TmscXtextModel xtextTmsc = IterableExtensions.head(Iterables.filter(resource.getContents(), TmscXtextModel.class)); @@ -145,7 +145,7 @@ public void doGenerate(final Resource resource, final IFileSystemAccess2 fsa, fi } } } - + private FullScopeTMSC doTransform(final TmscXtextModel tmscXtext) { final Function1 _function = (XEvent it) -> { return TmscXtextGenerator.adapt(it, ICompositeNode.class); @@ -165,7 +165,7 @@ private FullScopeTMSC doTransform(final TmscXtextModel tmscXtext) { }; return ObjectExtensions.operator_doubleArrow(_transform, _function_3); } - + public static T adapt(final Notifier notifier, final Class adapterType) { Adapter _adapter = EcoreUtil.getAdapter(notifier.eAdapters(), adapterType); return ((T) _adapter); diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/generator/TmscXtextToTmscTransformation.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/generator/TmscXtextToTmscTransformation.java index 73d1c02..a483ce4 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/generator/TmscXtextToTmscTransformation.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/generator/TmscXtextToTmscTransformation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,7 +9,6 @@ */ package nl.esi.pps.tmsc.xtext.generator; -import com.google.common.base.Objects; import com.google.common.collect.Iterables; import java.io.Serializable; import java.math.BigDecimal; @@ -17,6 +16,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.Queue; import java.util.function.Consumer; @@ -87,24 +87,25 @@ import org.eclipse.xtext.xbase.lib.ListExtensions; import org.eclipse.xtext.xbase.lib.ObjectExtensions; import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; +import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class TmscXtextToTmscTransformation { @Extension private static final TmscFactory m_tmsc = TmscFactory.eINSTANCE; - + @Extension private static final SpecifiedFactory m_arch_spec = SpecifiedFactory.eINSTANCE; - + @Extension private static final ImplementedFactory m_arch_impl = ImplementedFactory.eINSTANCE; - + @Extension private static final InstantiatedFactory m_arch_inst = InstantiatedFactory.eINSTANCE; - + @Extension private static final ExampleFactory m_arch_example = ExampleFactory.eINSTANCE; - + @Transform private FullScopeTMSC _transform_transform(final TmscXtextModel tmscXtext) { ExampleArchitecture _createExampleArchitecture = TmscXtextToTmscTransformation.m_arch_example.createExampleArchitecture(); @@ -152,7 +153,7 @@ private FullScopeTMSC _transform_transform(final TmscXtextModel tmscXtext) { Iterables.addAll(_components, _map); return tmsc; } - + @Resolvable private FullScopeTMSC tmscXtextModel2FullScopeTMSC(final TmscXtextModel tmscXtext) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(tmscXtext); @@ -168,9 +169,9 @@ private FullScopeTMSC tmscXtextModel2FullScopeTMSC(final TmscXtextModel tmscXtex _init_tmscXtextModel2FullScopeTMSC(_result, tmscXtext); return _result; } - + private final HashMap, FullScopeTMSC> _createCache_tmscXtextModel2FullScopeTMSC = CollectionLiterals.newHashMap(); - + private void _init_tmscXtextModel2FullScopeTMSC(final FullScopeTMSC it, final TmscXtextModel tmscXtext) { EList _lifelines = it.getLifelines(); final Function1> _function = (XHost it_1) -> { @@ -261,7 +262,7 @@ private void _init_tmscXtextModel2FullScopeTMSC(final FullScopeTMSC it, final Tm IterableExtensions.filter(it.getEvents(), _function_10).forEach(_function_11); this.addPropertiesIfAbsent(it, tmscXtext.getProperties()); } - + @Resolvable private Interface xInterface2Interface(final XInterface xInterface) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xInterface); @@ -277,9 +278,9 @@ private Interface xInterface2Interface(final XInterface xInterface) { _init_xInterface2Interface(_result, xInterface); return _result; } - + private final HashMap, Interface> _createCache_xInterface2Interface = CollectionLiterals.newHashMap(); - + private void _init_xInterface2Interface(final Interface it, final XInterface xInterface) { this.handleXNamedArchitectureElement(it, xInterface); EList _operations = it.getOperations(); @@ -289,7 +290,7 @@ private void _init_xInterface2Interface(final Interface it, final XInterface xIn List _map = ListExtensions.map(xInterface.getOperations(), _function); Iterables.addAll(_operations, _map); } - + @Resolvable private Operation xOperation2Operation(final XOperation xOperation) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xOperation); @@ -305,13 +306,13 @@ private Operation xOperation2Operation(final XOperation xOperation) { _init_xOperation2Operation(_result, xOperation); return _result; } - + private final HashMap, Operation> _createCache_xOperation2Operation = CollectionLiterals.newHashMap(); - + private void _init_xOperation2Operation(final Operation it, final XOperation xOperation) { this.handleXNamedArchitectureElement(it, xOperation); } - + @Resolvable private Component xComponent2Component(final XComponent xComponent) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xComponent); @@ -327,9 +328,9 @@ private Component xComponent2Component(final XComponent xComponent) { _init_xComponent2Component(_result, xComponent); return _result; } - + private final HashMap, Component> _createCache_xComponent2Component = CollectionLiterals.newHashMap(); - + private void _init_xComponent2Component(final Component it, final XComponent xComponent) { this.handleXNamedArchitectureElement(it, xComponent); EList _providedInterfaces = it.getProvidedInterfaces(); @@ -345,7 +346,7 @@ private void _init_xComponent2Component(final Component it, final XComponent xCo List _map_1 = ListExtensions.map(xComponent.getRequires(), _function_1); Iterables.addAll(_requiredInterfaces, _map_1); } - + @Resolvable private Function xFunction2Function(final XFunction xFunction) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xFunction); @@ -361,9 +362,9 @@ private Function xFunction2Function(final XFunction xFunction) { _init_xFunction2Function(_result, xFunction); return _result; } - + private final HashMap, Function> _createCache_xFunction2Function = CollectionLiterals.newHashMap(); - + private void _init_xFunction2Function(final Function it, final XFunction xFunction) { this.handleXNamedArchitectureElement(it, xFunction); EList _parameters = it.getParameters(); @@ -379,7 +380,7 @@ private void _init_xFunction2Function(final Function it, final XFunction xFuncti } it.setOperation(_resolveOne); } - + private Function createFunction(final XFunction xFunction) { Function _switchResult = null; boolean _matched = false; @@ -400,7 +401,7 @@ private Function createFunction(final XFunction xFunction) { } return _switchResult; } - + @Resolvable private FunctionParameter xFunctionParameter2FunctionParameter(final XFunctionParameter xFunctionParameter) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xFunctionParameter); @@ -416,9 +417,9 @@ private FunctionParameter xFunctionParameter2FunctionParameter(final XFunctionPa _init_xFunctionParameter2FunctionParameter(_result, xFunctionParameter); return _result; } - + private final HashMap, FunctionParameter> _createCache_xFunctionParameter2FunctionParameter = CollectionLiterals.newHashMap(); - + private void _init_xFunctionParameter2FunctionParameter(final FunctionParameter it, final XFunctionParameter xFunctionParameter) { it.setName(xFunctionParameter.getName()); FunctionParameterKind _switchResult = null; @@ -444,7 +445,7 @@ private void _init_xFunctionParameter2FunctionParameter(final FunctionParameter it.setKind(_switchResult); this.addPropertiesIfAbsent(it, xFunctionParameter.getProperties()); } - + private ExampleHost xHost2Host(final XHost xHost) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xHost); final ExampleHost _result; @@ -459,9 +460,9 @@ private ExampleHost xHost2Host(final XHost xHost) { _init_xHost2Host(_result, xHost); return _result; } - + private final HashMap, ExampleHost> _createCache_xHost2Host = CollectionLiterals.newHashMap(); - + private void _init_xHost2Host(final ExampleHost it, final XHost xHost) { this.handleXNamedArchitectureElement(it, xHost); EList _executors = it.getExecutors(); @@ -471,7 +472,7 @@ private void _init_xHost2Host(final ExampleHost it, final XHost xHost) { List _map = ListExtensions.map(xHost.getExecutors(), _function); Iterables.addAll(_executors, _map); } - + @Resolvable private Executor xExecutor2Executor(final XExecutor xExecutor) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xExecutor); @@ -487,13 +488,13 @@ private Executor xExecutor2Executor(final XExecutor xExecutor) { _init_xExecutor2Executor(_result, xExecutor); return _result; } - + private final HashMap, Executor> _createCache_xExecutor2Executor = CollectionLiterals.newHashMap(); - + private void _init_xExecutor2Executor(final Executor it, final XExecutor xExecutor) { this.handleXNamedArchitectureElement(it, xExecutor); } - + private void handleXNamedArchitectureElement(final NamedArchitectureElement element, final XNamedArchitectureElement xElement) { String _description = xElement.getDescription(); boolean _tripleEquals = (_description == null); @@ -505,7 +506,7 @@ private void handleXNamedArchitectureElement(final NamedArchitectureElement elem } this.addPropertiesIfAbsent(element, xElement.getProperties()); } - + @Resolvable private Lifeline xExecutor2Lifeline(final XExecutor xExecutor) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xExecutor); @@ -521,15 +522,15 @@ private Lifeline xExecutor2Lifeline(final XExecutor xExecutor) { _init_xExecutor2Lifeline(_result, xExecutor); return _result; } - + private final HashMap, Lifeline> _createCache_xExecutor2Lifeline = CollectionLiterals.newHashMap(); - + private void _init_xExecutor2Lifeline(final Lifeline it, final XExecutor xExecutor) { it.setExecutor(this.resolveOne(xExecutor, Executor.class)); EList _events = it.getEvents(); final Function1 _function = (XEvent it_1) -> { XExecutor _executor = it_1.getExecutor(); - return Boolean.valueOf(Objects.equal(_executor, xExecutor)); + return Boolean.valueOf(Objects.equals(_executor, xExecutor)); }; final Function1 _function_1 = (XEvent it_1) -> { return this.xEvent2Event(it_1); @@ -550,7 +551,7 @@ private void _init_xExecutor2Lifeline(final Lifeline it, final XExecutor xExecut this.addPropertiesIfAbsent(it, ((XHost) _eContainer_1).getProperties()); } } - + @Resolvable private Event xEvent2Event(final XEvent xEvent) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xEvent); @@ -566,9 +567,9 @@ private Event xEvent2Event(final XEvent xEvent) { _init_xEvent2Event(_result, xEvent); return _result; } - + private final HashMap, Event> _createCache_xEvent2Event = CollectionLiterals.newHashMap(); - + private void _init_xEvent2Event(final Event it, final XEvent xEvent) { it.setTimestamp(TmscXtextToTmscTransformation.toNanos(xEvent.getTimestamp())); it.setLifeline(this.resolveOne(xEvent.getExecutor(), Lifeline.class)); @@ -604,7 +605,7 @@ private void _init_xEvent2Event(final Event it, final XEvent xEvent) { xEvent.getArguments().forEach(_function_2); this.addPropertiesIfAbsent(it, xEvent.getProperties()); } - + private Event createEvent(final XEventType type) { Event _switchResult = null; if (type != null) { @@ -621,7 +622,7 @@ private Event createEvent(final XEventType type) { } return _switchResult; } - + private Component xExecutor2Component(final XExecutor xExecutor) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xExecutor); final Component _result; @@ -636,9 +637,9 @@ private Component xExecutor2Component(final XExecutor xExecutor) { _init_xExecutor2Component(_result, xExecutor); return _result; } - + private final HashMap, Component> _createCache_xExecutor2Component = CollectionLiterals.newHashMap(); - + private void _init_xExecutor2Component(final Component it, final XExecutor xExecutor) { String _elvis = null; String _description = xExecutor.getDescription(); @@ -650,7 +651,7 @@ private void _init_xExecutor2Component(final Component it, final XExecutor xExec } it.setName(_elvis); } - + @Resolvable private Dependency xDependency2Dependency(final XDependency xDependency) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xDependency); @@ -666,9 +667,9 @@ private Dependency xDependency2Dependency(final XDependency xDependency) { _init_xDependency2Dependency(_result, xDependency); return _result; } - + private final HashMap, Dependency> _createCache_xDependency2Dependency = CollectionLiterals.newHashMap(); - + private void _init_xDependency2Dependency(final Dependency it, final XDependency xDependency) { BigDecimal _timeBound = xDependency.getTimeBound(); boolean _tripleNotEquals = (_timeBound != null); @@ -683,7 +684,7 @@ private void _init_xDependency2Dependency(final Dependency it, final XDependency TmscXtextQueries.setXtextName(it, xDependency.getName()); this.addPropertiesIfAbsent(it, xDependency.getProperties()); } - + private Dependency createDependency(final XDependency xDependency) { Dependency _switchResult = null; XDependencyType _type = TmscXtextQueries.getType(xDependency); @@ -727,7 +728,7 @@ private Dependency createDependency(final XDependency xDependency) { } return _switchResult; } - + private void addDependencyDefaults(final Dependency dependency) { if ((dependency instanceof Execution)) { throw new IllegalArgumentException("Execution is not expected for this method"); @@ -746,7 +747,7 @@ private void addDependencyDefaults(final Dependency dependency) { final XDependencyType dependencyType = _elvis; final Function1 _function = (XDependencySettings it) -> { XDependencyType _type_1 = it.getType(); - return Boolean.valueOf(Objects.equal(_type_1, dependencyType)); + return Boolean.valueOf(Objects.equals(_type_1, dependencyType)); }; final XDependencySettings dependencySettings = IterableExtensions.findFirst(this.invResolveOne(dependency.getTmsc(), TmscXtextModel.class).getDependencySettings(), _function); final TmscXtextModel tmscSettings = this.invResolveOne(dependency.getTmsc(), TmscXtextModel.class); @@ -957,7 +958,7 @@ private void addDependencyDefaults(final Dependency dependency) { } this.addPropertiesIfAbsent(dependency, _properties); } - + private void addExecutionDefaults(final Execution execution) { Function _function = execution.getFunction(); XFunction _invResolveOne = null; @@ -980,7 +981,7 @@ private void addExecutionDefaults(final Execution execution) { } this.addPropertiesIfAbsent(execution, _properties_1); } - + /** * Only adds the {@code xProperties} that are not yet set to {@code container} */ @@ -996,19 +997,19 @@ private void addPropertiesIfAbsent(final PropertiesContainer container, final Li } } } - + private Serializable _getValue(final XPropertyBooleanValue propertyValue) { return propertyValue.getValue(); } - + private Serializable _getValue(final XPropertyNumberValue propertyValue) { return propertyValue.getValue(); } - + private Serializable _getValue(final XPropertyStringValue propertyValue) { return propertyValue.getValue(); } - + private Serializable _getValue(final XPropertyMutliValue propertyValue) { final ArrayList result = CollectionLiterals.newArrayList(); final Function1 _function = (XPropertyValue it) -> { @@ -1018,7 +1019,7 @@ private Serializable _getValue(final XPropertyMutliValue propertyValue) { Iterables.addAll(result, _map); return result; } - + static Long toNanos(final BigDecimal seconds) { Long _xifexpression = null; if ((seconds == null)) { @@ -1028,7 +1029,8 @@ static Long toNanos(final BigDecimal seconds) { } return _xifexpression; } - + + @XbaseGenerated private Serializable getValue(final XPropertyValue propertyValue) { if (propertyValue instanceof XPropertyBooleanValue) { return _getValue((XPropertyBooleanValue)propertyValue); @@ -1043,28 +1045,28 @@ private Serializable getValue(final XPropertyValue propertyValue) { Arrays.asList(propertyValue).toString()); } } - + public synchronized FullScopeTMSC transform(final TmscXtextModel tmscXtext) { FullScopeTMSC result = _transform_transform(tmscXtext); _performLateFunctions(); return result; } - + private final Queue _lateFunctions = new java.util.LinkedList<>(); - + protected void _performLateFunctions() { while (!_lateFunctions.isEmpty()) { _lateFunctions.remove().run(); } } - + /** * Late functions are executed at the end of the transformation, just before returning the result. */ protected final void late(final Runnable function) { _lateFunctions.add(function); } - + private Optional _resolveOne_tmscXtextModel2FullScopeTMSC(final TmscXtextModel tmscXtext) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(tmscXtext); synchronized (_createCache_tmscXtextModel2FullScopeTMSC) { @@ -1075,22 +1077,22 @@ private Optional _resolveOne_tmscXtextModel2FullScopeTMSC(final T } } } - + private Stream _resolveAll_tmscXtextModel2FullScopeTMSC(final TmscXtextModel tmscXtext) { final Optional resolved = _resolveOne_tmscXtextModel2FullScopeTMSC(tmscXtext); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_tmscXtextModel2FullScopeTMSC(final FullScopeTMSC target, final Class typeToResolve) { return _invResolveAll_tmscXtextModel2FullScopeTMSC(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_tmscXtextModel2FullScopeTMSC(final FullScopeTMSC target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_tmscXtextModel2FullScopeTMSC.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + protected T resolveOne(final TmscXtextModel source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(FullScopeTMSC.class) || FullScopeTMSC.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_tmscXtextModel2FullScopeTMSC(source); @@ -1100,7 +1102,7 @@ protected T resolveOne(final TmscXtextModel source, final Class typeToRes } return null; } - + protected List resolveAll(final TmscXtextModel source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(FullScopeTMSC.class) || FullScopeTMSC.class.isAssignableFrom(typeToResolve)) { @@ -1109,7 +1111,7 @@ protected List resolveAll(final TmscXtextModel source, final Class typ } return resolved; } - + protected T resolveOne(final XInterface source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(Interface.class) || Interface.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_xInterface2Interface(source); @@ -1119,7 +1121,7 @@ protected T resolveOne(final XInterface source, final Class typeToResolve } return null; } - + protected List resolveAll(final XInterface source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(Interface.class) || Interface.class.isAssignableFrom(typeToResolve)) { @@ -1128,7 +1130,7 @@ protected List resolveAll(final XInterface source, final Class typeToR } return resolved; } - + protected T resolveOne(final XOperation source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(Operation.class) || Operation.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_xOperation2Operation(source); @@ -1138,7 +1140,7 @@ protected T resolveOne(final XOperation source, final Class typeToResolve } return null; } - + protected List resolveAll(final XOperation source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(Operation.class) || Operation.class.isAssignableFrom(typeToResolve)) { @@ -1147,7 +1149,7 @@ protected List resolveAll(final XOperation source, final Class typeToR } return resolved; } - + protected T resolveOne(final XComponent source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(Component.class) || Component.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_xComponent2Component(source); @@ -1157,7 +1159,7 @@ protected T resolveOne(final XComponent source, final Class typeToResolve } return null; } - + protected List resolveAll(final XComponent source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(Component.class) || Component.class.isAssignableFrom(typeToResolve)) { @@ -1166,7 +1168,7 @@ protected List resolveAll(final XComponent source, final Class typeToR } return resolved; } - + protected T resolveOne(final XFunction source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(Function.class) || Function.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_xFunction2Function(source); @@ -1176,7 +1178,7 @@ protected T resolveOne(final XFunction source, final Class typeToResolve) } return null; } - + protected List resolveAll(final XFunction source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(Function.class) || Function.class.isAssignableFrom(typeToResolve)) { @@ -1185,7 +1187,7 @@ protected List resolveAll(final XFunction source, final Class typeToRe } return resolved; } - + protected T resolveOne(final XFunctionParameter source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(FunctionParameter.class) || FunctionParameter.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_xFunctionParameter2FunctionParameter(source); @@ -1195,7 +1197,7 @@ protected T resolveOne(final XFunctionParameter source, final Class typeT } return null; } - + protected List resolveAll(final XFunctionParameter source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(FunctionParameter.class) || FunctionParameter.class.isAssignableFrom(typeToResolve)) { @@ -1204,7 +1206,7 @@ protected List resolveAll(final XFunctionParameter source, final Class } return resolved; } - + protected T resolveOne(final XExecutor source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(Executor.class) || Executor.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_xExecutor2Executor(source); @@ -1220,7 +1222,7 @@ protected T resolveOne(final XExecutor source, final Class typeToResolve) } return null; } - + protected List resolveAll(final XExecutor source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(Executor.class) || Executor.class.isAssignableFrom(typeToResolve)) { @@ -1233,7 +1235,7 @@ protected List resolveAll(final XExecutor source, final Class typeToRe } return resolved; } - + protected T resolveOne(final XEvent source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(Event.class) || Event.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_xEvent2Event(source); @@ -1243,7 +1245,7 @@ protected T resolveOne(final XEvent source, final Class typeToResolve) { } return null; } - + protected List resolveAll(final XEvent source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(Event.class) || Event.class.isAssignableFrom(typeToResolve)) { @@ -1252,7 +1254,7 @@ protected List resolveAll(final XEvent source, final Class typeToResol } return resolved; } - + protected T resolveOne(final XDependency source, final Class typeToResolve) { if (typeToResolve.isAssignableFrom(Dependency.class) || Dependency.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _resolveOne_xDependency2Dependency(source); @@ -1262,7 +1264,7 @@ protected T resolveOne(final XDependency source, final Class typeToResolv } return null; } - + protected List resolveAll(final XDependency source, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (typeToResolve.isAssignableFrom(Dependency.class) || Dependency.class.isAssignableFrom(typeToResolve)) { @@ -1271,7 +1273,7 @@ protected List resolveAll(final XDependency source, final Class typeTo } return resolved; } - + protected T invResolveOne(final FullScopeTMSC target, final Class typeToResolve) { if (TmscXtextModel.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_tmscXtextModel2FullScopeTMSC(target, typeToResolve); @@ -1281,7 +1283,7 @@ protected T invResolveOne(final FullScopeTMSC target, final Class typeToR } return null; } - + protected List invResolveAll(final FullScopeTMSC target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (TmscXtextModel.class.isAssignableFrom(typeToResolve)) { @@ -1289,7 +1291,7 @@ protected List invResolveAll(final FullScopeTMSC target, final Class t } return resolved; } - + protected T invResolveOne(final Interface target, final Class typeToResolve) { if (XInterface.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xInterface2Interface(target, typeToResolve); @@ -1299,7 +1301,7 @@ protected T invResolveOne(final Interface target, final Class typeToResol } return null; } - + protected List invResolveAll(final Interface target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XInterface.class.isAssignableFrom(typeToResolve)) { @@ -1307,7 +1309,7 @@ protected List invResolveAll(final Interface target, final Class typeT } return resolved; } - + protected T invResolveOne(final Operation target, final Class typeToResolve) { if (XOperation.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xOperation2Operation(target, typeToResolve); @@ -1317,7 +1319,7 @@ protected T invResolveOne(final Operation target, final Class typeToResol } return null; } - + protected List invResolveAll(final Operation target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XOperation.class.isAssignableFrom(typeToResolve)) { @@ -1325,7 +1327,7 @@ protected List invResolveAll(final Operation target, final Class typeT } return resolved; } - + protected T invResolveOne(final Component target, final Class typeToResolve) { if (XComponent.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xComponent2Component(target, typeToResolve); @@ -1335,7 +1337,7 @@ protected T invResolveOne(final Component target, final Class typeToResol } return null; } - + protected List invResolveAll(final Component target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XComponent.class.isAssignableFrom(typeToResolve)) { @@ -1343,7 +1345,7 @@ protected List invResolveAll(final Component target, final Class typeT } return resolved; } - + protected T invResolveOne(final Function target, final Class typeToResolve) { if (XFunction.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xFunction2Function(target, typeToResolve); @@ -1353,7 +1355,7 @@ protected T invResolveOne(final Function target, final Class typeToResolv } return null; } - + protected List invResolveAll(final Function target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XFunction.class.isAssignableFrom(typeToResolve)) { @@ -1361,7 +1363,7 @@ protected List invResolveAll(final Function target, final Class typeTo } return resolved; } - + protected T invResolveOne(final FunctionParameter target, final Class typeToResolve) { if (XFunctionParameter.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xFunctionParameter2FunctionParameter(target, typeToResolve); @@ -1371,7 +1373,7 @@ protected T invResolveOne(final FunctionParameter target, final Class typ } return null; } - + protected List invResolveAll(final FunctionParameter target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XFunctionParameter.class.isAssignableFrom(typeToResolve)) { @@ -1379,7 +1381,7 @@ protected List invResolveAll(final FunctionParameter target, final Class< } return resolved; } - + protected T invResolveOne(final Executor target, final Class typeToResolve) { if (XExecutor.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xExecutor2Executor(target, typeToResolve); @@ -1389,7 +1391,7 @@ protected T invResolveOne(final Executor target, final Class typeToResolv } return null; } - + protected List invResolveAll(final Executor target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XExecutor.class.isAssignableFrom(typeToResolve)) { @@ -1397,7 +1399,7 @@ protected List invResolveAll(final Executor target, final Class typeTo } return resolved; } - + protected T invResolveOne(final Lifeline target, final Class typeToResolve) { if (XExecutor.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xExecutor2Lifeline(target, typeToResolve); @@ -1407,7 +1409,7 @@ protected T invResolveOne(final Lifeline target, final Class typeToResolv } return null; } - + protected List invResolveAll(final Lifeline target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XExecutor.class.isAssignableFrom(typeToResolve)) { @@ -1415,7 +1417,7 @@ protected List invResolveAll(final Lifeline target, final Class typeTo } return resolved; } - + protected T invResolveOne(final Event target, final Class typeToResolve) { if (XEvent.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xEvent2Event(target, typeToResolve); @@ -1425,7 +1427,7 @@ protected T invResolveOne(final Event target, final Class typeToResolve) } return null; } - + protected List invResolveAll(final Event target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XEvent.class.isAssignableFrom(typeToResolve)) { @@ -1433,7 +1435,7 @@ protected List invResolveAll(final Event target, final Class typeToRes } return resolved; } - + protected T invResolveOne(final Dependency target, final Class typeToResolve) { if (XDependency.class.isAssignableFrom(typeToResolve)) { final Optional resolved = _invResolveOne_xDependency2Dependency(target, typeToResolve); @@ -1443,7 +1445,7 @@ protected T invResolveOne(final Dependency target, final Class typeToReso } return null; } - + protected List invResolveAll(final Dependency target, final Class typeToResolve) { List resolved = CollectionLiterals.newLinkedList(); if (XDependency.class.isAssignableFrom(typeToResolve)) { @@ -1451,7 +1453,7 @@ protected List invResolveAll(final Dependency target, final Class type } return resolved; } - + private Optional _resolveOne_xInterface2Interface(final XInterface xInterface) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xInterface); synchronized (_createCache_xInterface2Interface) { @@ -1462,22 +1464,22 @@ private Optional _resolveOne_xInterface2Interface(final XInterface xI } } } - + private Stream _resolveAll_xInterface2Interface(final XInterface xInterface) { final Optional resolved = _resolveOne_xInterface2Interface(xInterface); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xInterface2Interface(final Interface target, final Class typeToResolve) { return _invResolveAll_xInterface2Interface(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xInterface2Interface(final Interface target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xInterface2Interface.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + private Optional _resolveOne_xOperation2Operation(final XOperation xOperation) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xOperation); synchronized (_createCache_xOperation2Operation) { @@ -1488,22 +1490,22 @@ private Optional _resolveOne_xOperation2Operation(final XOperation xO } } } - + private Stream _resolveAll_xOperation2Operation(final XOperation xOperation) { final Optional resolved = _resolveOne_xOperation2Operation(xOperation); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xOperation2Operation(final Operation target, final Class typeToResolve) { return _invResolveAll_xOperation2Operation(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xOperation2Operation(final Operation target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xOperation2Operation.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + private Optional _resolveOne_xComponent2Component(final XComponent xComponent) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xComponent); synchronized (_createCache_xComponent2Component) { @@ -1514,22 +1516,22 @@ private Optional _resolveOne_xComponent2Component(final XComponent xC } } } - + private Stream _resolveAll_xComponent2Component(final XComponent xComponent) { final Optional resolved = _resolveOne_xComponent2Component(xComponent); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xComponent2Component(final Component target, final Class typeToResolve) { return _invResolveAll_xComponent2Component(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xComponent2Component(final Component target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xComponent2Component.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + private Optional _resolveOne_xFunction2Function(final XFunction xFunction) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xFunction); synchronized (_createCache_xFunction2Function) { @@ -1540,22 +1542,22 @@ private Optional _resolveOne_xFunction2Function(final XFunction xFunct } } } - + private Stream _resolveAll_xFunction2Function(final XFunction xFunction) { final Optional resolved = _resolveOne_xFunction2Function(xFunction); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xFunction2Function(final Function target, final Class typeToResolve) { return _invResolveAll_xFunction2Function(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xFunction2Function(final Function target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xFunction2Function.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + private Optional _resolveOne_xFunctionParameter2FunctionParameter(final XFunctionParameter xFunctionParameter) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xFunctionParameter); synchronized (_createCache_xFunctionParameter2FunctionParameter) { @@ -1566,22 +1568,22 @@ private Optional _resolveOne_xFunctionParameter2FunctionParam } } } - + private Stream _resolveAll_xFunctionParameter2FunctionParameter(final XFunctionParameter xFunctionParameter) { final Optional resolved = _resolveOne_xFunctionParameter2FunctionParameter(xFunctionParameter); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xFunctionParameter2FunctionParameter(final FunctionParameter target, final Class typeToResolve) { return _invResolveAll_xFunctionParameter2FunctionParameter(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xFunctionParameter2FunctionParameter(final FunctionParameter target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xFunctionParameter2FunctionParameter.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + private Optional _resolveOne_xExecutor2Executor(final XExecutor xExecutor) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xExecutor); synchronized (_createCache_xExecutor2Executor) { @@ -1592,22 +1594,22 @@ private Optional _resolveOne_xExecutor2Executor(final XExecutor xExecu } } } - + private Stream _resolveAll_xExecutor2Executor(final XExecutor xExecutor) { final Optional resolved = _resolveOne_xExecutor2Executor(xExecutor); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xExecutor2Executor(final Executor target, final Class typeToResolve) { return _invResolveAll_xExecutor2Executor(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xExecutor2Executor(final Executor target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xExecutor2Executor.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + private Optional _resolveOne_xExecutor2Lifeline(final XExecutor xExecutor) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xExecutor); synchronized (_createCache_xExecutor2Lifeline) { @@ -1618,22 +1620,22 @@ private Optional _resolveOne_xExecutor2Lifeline(final XExecutor xExecu } } } - + private Stream _resolveAll_xExecutor2Lifeline(final XExecutor xExecutor) { final Optional resolved = _resolveOne_xExecutor2Lifeline(xExecutor); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xExecutor2Lifeline(final Lifeline target, final Class typeToResolve) { return _invResolveAll_xExecutor2Lifeline(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xExecutor2Lifeline(final Lifeline target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xExecutor2Lifeline.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + private Optional _resolveOne_xEvent2Event(final XEvent xEvent) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xEvent); synchronized (_createCache_xEvent2Event) { @@ -1644,22 +1646,22 @@ private Optional _resolveOne_xEvent2Event(final XEvent xEvent) { } } } - + private Stream _resolveAll_xEvent2Event(final XEvent xEvent) { final Optional resolved = _resolveOne_xEvent2Event(xEvent); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xEvent2Event(final Event target, final Class typeToResolve) { return _invResolveAll_xEvent2Event(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xEvent2Event(final Event target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xEvent2Event.entrySet().stream().filter(e -> e.getValue() == target) .flatMap(e -> e.getKey().stream()).filter(typeToResolve::isInstance).map(typeToResolve::cast); } - + private Optional _resolveOne_xDependency2Dependency(final XDependency xDependency) { final ArrayList _cacheKey = CollectionLiterals.newArrayList(xDependency); synchronized (_createCache_xDependency2Dependency) { @@ -1670,16 +1672,16 @@ private Optional _resolveOne_xDependency2Dependency(final XDependenc } } } - + private Stream _resolveAll_xDependency2Dependency(final XDependency xDependency) { final Optional resolved = _resolveOne_xDependency2Dependency(xDependency); return Stream.of(resolved).filter(Optional::isPresent).map(Optional::get); } - + private Optional _invResolveOne_xDependency2Dependency(final Dependency target, final Class typeToResolve) { return _invResolveAll_xDependency2Dependency(target, typeToResolve).findFirst(); } - + private Stream _invResolveAll_xDependency2Dependency(final Dependency target, final Class typeToResolve) { // TODO what about synchronization here? return _createCache_xDependency2Dependency.entrySet().stream().filter(e -> e.getValue() == target) diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/linking/TmscXtextLinkingService.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/linking/TmscXtextLinkingService.java index 488c7df..4c0847c 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/linking/TmscXtextLinkingService.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/linking/TmscXtextLinkingService.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,10 +9,10 @@ */ package nl.esi.pps.tmsc.xtext.linking; -import com.google.common.base.Objects; import com.google.inject.Inject; import java.util.Collections; import java.util.List; +import java.util.Objects; import nl.esi.pps.tmsc.xtext.services.TmscXtextGrammarAccess; import nl.esi.pps.tmsc.xtext.tmscXtext.TmscXtextFactory; import nl.esi.pps.tmsc.xtext.tmscXtext.TmscXtextModel; @@ -35,11 +35,11 @@ public class TmscXtextLinkingService extends DefaultLinkingService { @Extension private final TmscXtextFactory m_tmsc = TmscXtextFactory.eINSTANCE; - + @Inject @Extension private TmscXtextGrammarAccess tmscXtextGrammarAccess; - + @Override public List getLinkedObjects(final EObject context, final EReference ref, final INode node) throws IllegalNodeException { final List result = super.getLinkedObjects(context, ref, node); @@ -51,7 +51,7 @@ public List getLinkedObjects(final EObject context, final EReference re EObject _grammarElement = node.getGrammarElement(); boolean _matched = false; CrossReference _executorXExecutorCrossReference_2_0 = this.tmscXtextGrammarAccess.getXEventAccess().getExecutorXExecutorCrossReference_2_0(); - if (Objects.equal(_grammarElement, _executorXExecutorCrossReference_2_0)) { + if (Objects.equals(_grammarElement, _executorXExecutorCrossReference_2_0)) { _matched=true; XExecutor _createXExecutor = this.m_tmsc.createXExecutor(); final Procedure1 _function = (XExecutor it) -> { @@ -64,7 +64,7 @@ public List getLinkedObjects(final EObject context, final EReference re } if (!_matched) { CrossReference _componentXComponentCrossReference_3_0 = this.tmscXtextGrammarAccess.getXEventAccess().getComponentXComponentCrossReference_3_0(); - if (Objects.equal(_grammarElement, _componentXComponentCrossReference_3_0)) { + if (Objects.equals(_grammarElement, _componentXComponentCrossReference_3_0)) { _matched=true; XComponent _createXComponent = this.m_tmsc.createXComponent(); final Procedure1 _function_1 = (XComponent it) -> { @@ -78,7 +78,7 @@ public List getLinkedObjects(final EObject context, final EReference re } if (!_matched) { CrossReference _functionXFunctionCrossReference_5_0 = this.tmscXtextGrammarAccess.getXEventAccess().getFunctionXFunctionCrossReference_5_0(); - if (Objects.equal(_grammarElement, _functionXFunctionCrossReference_5_0)) { + if (Objects.equals(_grammarElement, _functionXFunctionCrossReference_5_0)) { _matched=true; XFunction _createXFunction = this.m_tmsc.createXFunction(); final Procedure1 _function_2 = (XFunction it) -> { diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/scoping/TmscXtextScopeProvider.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/scoping/TmscXtextScopeProvider.java index 88721ef..10615fb 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/scoping/TmscXtextScopeProvider.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/scoping/TmscXtextScopeProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,7 +9,7 @@ */ package nl.esi.pps.tmsc.xtext.scoping; -import com.google.common.base.Objects; +import java.util.Objects; import nl.esi.pps.tmsc.xtext.tmscXtext.TmscXtextPackage; import nl.esi.pps.tmsc.xtext.tmscXtext.XEvent; import org.eclipse.emf.ecore.EObject; @@ -30,7 +30,7 @@ public class TmscXtextScopeProvider extends AbstractTmscXtextScopeProvider { public IScope getScope(final EObject context, final EReference reference) { IScope _switchResult = null; boolean _matched = false; - if (Objects.equal(reference, TmscXtextPackage.Literals.XEVENT_ARGUMENT__PARAMETER)) { + if (Objects.equals(reference, TmscXtextPackage.Literals.XEVENT_ARGUMENT__PARAMETER)) { _matched=true; IScope _xblockexpression = null; { diff --git a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/validation/TmscXtextValidator.java b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/validation/TmscXtextValidator.java index 4189a5f..fb310ca 100644 --- a/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/validation/TmscXtextValidator.java +++ b/plugins/nl.esi.pps.tmsc.xtext/xtend-gen/nl/esi/pps/tmsc/xtext/validation/TmscXtextValidator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community + * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community * * This program and the accompanying materials are made available * under the terms of the MIT License which is available at @@ -9,7 +9,6 @@ */ package nl.esi.pps.tmsc.xtext.validation; -import com.google.common.base.Objects; import com.google.common.collect.Iterables; import java.math.BigDecimal; import java.util.ArrayList; @@ -18,6 +17,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; @@ -71,7 +71,7 @@ @SuppressWarnings("all") public class TmscXtextValidator extends AbstractTmscXtextValidator { public static final String UNIQUE_NAME_XNAMED_ARCHITECTURE_ELEMENT = "uniqueXNamedArchitectureElement"; - + @Check public void checkUniqueXComponentName(final XNamedArchitectureElement namedElement) { final EStructuralFeature feature = namedElement.eContainingFeature(); @@ -80,7 +80,7 @@ public void checkUniqueXComponentName(final XNamedArchitectureElement namedEleme final Function1 _function = (XNamedArchitectureElement it) -> { String _name = it.getName(); String _name_1 = namedElement.getName(); - return Boolean.valueOf(Objects.equal(_name, _name_1)); + return Boolean.valueOf(Objects.equals(_name, _name_1)); }; boolean _exists = IterableExtensions.exists(siblings, _function); if (_exists) { @@ -95,9 +95,9 @@ public void checkUniqueXComponentName(final XNamedArchitectureElement namedEleme TmscXtextPackage.Literals.XNAMED_ARCHITECTURE_ELEMENT__NAME, TmscXtextValidator.UNIQUE_NAME_XNAMED_ARCHITECTURE_ELEMENT); } } - + public static final String UNIQUE_NAME_XDEPENDENCY = "uniqueXDependencyName"; - + @Check public void checkUniqueXDependencyName(final TmscXtextModel model) { final Function1> _function = (XEvent it) -> { @@ -122,9 +122,9 @@ public void checkUniqueXDependencyName(final TmscXtextModel model) { }; Iterables.concat(IterableExtensions.>filter(IterableExtensions.groupBy(IterableExtensions.flatMap(model.getEvents(), _function), _function_1).values(), _function_2)).forEach(_function_3); } - + public static final String UNIQUE_NAME_XPROPERTY = "uniqueXPropertyName"; - + @Check public void checkUniqueXPropertyName(final XProperty xProperty) { final EStructuralFeature feature = xProperty.eContainingFeature(); @@ -133,7 +133,7 @@ public void checkUniqueXPropertyName(final XProperty xProperty) { final Function1 _function = (XProperty it) -> { String _name = it.getName(); String _name_1 = xProperty.getName(); - return Boolean.valueOf(Objects.equal(_name, _name_1)); + return Boolean.valueOf(Objects.equals(_name, _name_1)); }; boolean _exists = IterableExtensions.exists(siblings, _function); if (_exists) { @@ -146,15 +146,15 @@ public void checkUniqueXPropertyName(final XProperty xProperty) { TmscXtextValidator.UNIQUE_NAME_XPROPERTY); } } - + public static final String UNIQUE_TYPE_XDEPENDENCY_DEFAULTS = "uniqueXDependencyDefaultsType"; - + @Check public void checkUniqueXDependencyDefaultsType(final XDependencySettings xDependencySettings) { final Function1 _function = (XDependencySettings it) -> { XDependencyType _type = it.getType(); XDependencyType _type_1 = xDependencySettings.getType(); - return Boolean.valueOf(Objects.equal(_type, _type_1)); + return Boolean.valueOf(Objects.equals(_type, _type_1)); }; boolean _exists = IterableExtensions.exists(EcoreUtil2.getSiblingsOfType(xDependencySettings, XDependencySettings.class), _function); if (_exists) { @@ -166,9 +166,9 @@ public void checkUniqueXDependencyDefaultsType(final XDependencySettings xDepend TmscXtextPackage.Literals.XDEPENDENCY_SETTINGS__TYPE, TmscXtextValidator.UNIQUE_TYPE_XDEPENDENCY_DEFAULTS); } } - + public static final String UNIQUE_PREFIX_XDEPENDENCY_DEFAULTS = "uniqueXDependencyDefaultsPrefix"; - + @Check public void checkUniqueXDependencyDefaultsPrefix(final XDependencySettings xDependencySettings) { String _prefix = xDependencySettings.getPrefix(); @@ -207,9 +207,9 @@ public void checkUniqueXDependencyDefaultsPrefix(final XDependencySettings xDepe TmscXtextPackage.Literals.XDEPENDENCY_SETTINGS__PREFIX, TmscXtextValidator.UNIQUE_PREFIX_XDEPENDENCY_DEFAULTS); } } - + public static final String MULTIPLE_XDEPENDENCY_RECEIVE = "multipleXDependencyReceive"; - + @Check public void checkMultipleXDependencyReceive(final TmscXtextModel model) { final HashMap> receives = CollectionLiterals.>newHashMap(); @@ -243,11 +243,11 @@ public void checkMultipleXDependencyReceive(final TmscXtextModel model) { }; MapExtensions.>filter(receives, _function_1).forEach(_function_2); } - + public static final String XDEPENDENCY_TYPE_REPLY_REQUEST = "xDependencyTypeReplyRequest"; - + public static final String XDEPENDENCY_REQUEST_TYPE_REQUEST = "xDependencyRequestTypeRequest"; - + @Check public void checkXDependencyRequestReply(final XDependency dependency) { XDependency _request = dependency.getRequest(); @@ -256,23 +256,23 @@ public void checkXDependencyRequestReply(final XDependency dependency) { return; } XDependencyType _type = TmscXtextQueries.getType(dependency); - boolean _notEquals = (!Objects.equal(_type, XDependencyType.REPLY)); + boolean _notEquals = (!Objects.equals(_type, XDependencyType.REPLY)); if (_notEquals) { this.error("Request is only applicable for a reply", TmscXtextPackage.Literals.XDEPENDENCY__REQUEST, TmscXtextValidator.XDEPENDENCY_TYPE_REPLY_REQUEST); } XDependencyType _type_1 = TmscXtextQueries.getType(dependency.getRequest()); - boolean _notEquals_1 = (!Objects.equal(_type_1, XDependencyType.REQUEST)); + boolean _notEquals_1 = (!Objects.equals(_type_1, XDependencyType.REQUEST)); if (_notEquals_1) { this.error("Request should be of type request", TmscXtextPackage.Literals.XDEPENDENCY__REQUEST, TmscXtextValidator.XDEPENDENCY_REQUEST_TYPE_REQUEST); } } - + public static final String XDEPENDENCY_TYPE_MESSAGE_DETECT_MESSAGE = "xDependencyTypeMessageControlMessage"; - + public static final String XDEPENDENCY_MESSAGE_TYPE_MESSAGE = "xDependencyMessageTypeMessage"; - + @Check public void checkXDependencyMessageControlMessage(final XDependency dependency) { XDependency _message = dependency.getMessage(); @@ -281,7 +281,7 @@ public void checkXDependencyMessageControlMessage(final XDependency dependency) return; } XDependencyType _type = TmscXtextQueries.getType(dependency); - boolean _notEquals = (!Objects.equal(_type, XDependencyType.MESSAGE_CONTROL)); + boolean _notEquals = (!Objects.equals(_type, XDependencyType.MESSAGE_CONTROL)); if (_notEquals) { this.error("Message is only applicable for a message-control", TmscXtextPackage.Literals.XDEPENDENCY__MESSAGE, TmscXtextValidator.XDEPENDENCY_TYPE_MESSAGE_DETECT_MESSAGE); @@ -301,9 +301,9 @@ public void checkXDependencyMessageControlMessage(final XDependency dependency) } else { } } - + public static final String XFUNCTION_NOT_USED = "xFunctionNotUsed"; - + @Check public void checkXFunctionNotUsed(final XFunction xFunction) { final Function1 _function = (XEvent it) -> { @@ -320,9 +320,9 @@ public void checkXFunctionNotUsed(final XFunction xFunction) { this.info(_builder.toString(), null, TmscXtextValidator.XFUNCTION_NOT_USED); } } - + public static final String XCOMPONENT_NOT_USED = "xComponentNotUsed"; - + @Check public void checkXComponentNotUsed(final XComponent xComponent) { final Function1 _function = (XEvent it) -> { @@ -339,9 +339,9 @@ public void checkXComponentNotUsed(final XComponent xComponent) { this.info(_builder.toString(), null, TmscXtextValidator.XCOMPONENT_NOT_USED); } } - + public static final String XFUNCTION_OPERATION = "xFunctionOperation"; - + @Check public void checkXFunctionOperation(final XFunction xFunction) { if (((xFunction.getOperation() == null) && (xFunction.isIpcClient() || xFunction.isIpcServer()))) { @@ -349,9 +349,9 @@ public void checkXFunctionOperation(final XFunction xFunction) { TmscXtextPackage.Literals.XFUNCTION__OPERATION, TmscXtextValidator.XFUNCTION_OPERATION); } } - + public static final String XINTERFACE_NOT_PROVIDED = "xInterfaceNotProvided"; - + @Check public void checkXInterfaceNotProvided(final XEvent xEvent) { final ICompositeNode componentNode = NodeModelUtils.getNode(xEvent.getComponent()); @@ -379,9 +379,9 @@ public void checkXInterfaceNotProvided(final XEvent xEvent) { TmscXtextPackage.Literals.XEVENT__FUNCTION, TmscXtextValidator.XINTERFACE_NOT_PROVIDED); } } - + public static final String XINTERFACE_NOT_REQUIRED = "xInterfaceNotRequired"; - + @Check public void checkXInterfaceNotRequired(final XEvent xEvent) { final ICompositeNode componentNode = NodeModelUtils.getNode(xEvent.getComponent()); @@ -409,14 +409,14 @@ public void checkXInterfaceNotRequired(final XEvent xEvent) { TmscXtextPackage.Literals.XEVENT__FUNCTION, TmscXtextValidator.XINTERFACE_NOT_REQUIRED); } } - + public static final String XEVENT_ARGUMENT_KIND_NOT_EXPECTED = "xEventArgumentKindNotExpected"; - + @Check public void checkXEventArgumentKindNotExpected(final XEvent xEvent) { EnumSet _xifexpression = null; XEventType _type = xEvent.getType(); - boolean _equals = Objects.equal(_type, XEventType.ENTRY); + boolean _equals = Objects.equals(_type, XEventType.ENTRY); if (_equals) { _xifexpression = EnumSet.of(XFunctionParameterKind.IN, XFunctionParameterKind.IN_OUT); } else { @@ -441,11 +441,11 @@ public void checkXEventArgumentKindNotExpected(final XEvent xEvent) { }; IterableExtensions.reject(xEvent.getArguments(), _function).forEach(_function_1); } - + public static final String XEVENT_ORDER_TIME = "xEventOrderTime"; - + public static final String XEVENT_ORDER_CALL_STACK = "xEventOrderCallStack"; - + @Check(CheckType.NORMAL) public void checkXEventOrder(final TmscXtextModel model) { final Function1 _function = (XEvent it) -> { @@ -471,7 +471,7 @@ public void checkXEventOrder(final TmscXtextModel model) { IterableExtensions.fold(executorEvents, null, _function_1); final Function2, XEvent, LinkedList> _function_2 = (LinkedList callStack, XEvent event) -> { XEventType _type = event.getType(); - boolean _equals = Objects.equal(_type, XEventType.ENTRY); + boolean _equals = Objects.equals(_type, XEventType.ENTRY); if (_equals) { callStack.push(event.getFunction()); } else { @@ -480,7 +480,7 @@ public void checkXEventOrder(final TmscXtextModel model) { if (_not) { final XFunction expectedFunction = callStack.pop(); XFunction _function_3 = event.getFunction(); - boolean _notEquals = (!Objects.equal(_function_3, expectedFunction)); + boolean _notEquals = (!Objects.equals(_function_3, expectedFunction)); if (_notEquals) { StringConcatenation _builder = new StringConcatenation(); _builder.append("Expected exit of function "); @@ -502,19 +502,19 @@ public void checkXEventOrder(final TmscXtextModel model) { } } } - + @Check public void checkXRenderingPropertyValue(final XPropertyStringValue propertyValue) { final EObject property = propertyValue.eContainer(); if ((property instanceof XProperty)) { String _name = ((XProperty)property).getName(); boolean _matched = false; - if (Objects.equal(_name, null)) { + if (Objects.equals(_name, null)) { _matched=true; return; } if (!_matched) { - if (Objects.equal(_name, RenderingProperties.PROPERTY_PAINT)) { + if (Objects.equals(_name, RenderingProperties.PROPERTY_PAINT)) { _matched=true; boolean _startsWith = propertyValue.getValue().startsWith("#"); if (_startsWith) { @@ -545,7 +545,7 @@ public void checkXRenderingPropertyValue(final XPropertyStringValue propertyValu } } if (!_matched) { - if (Objects.equal(_name, RenderingProperties.PROPERTY_STROKE)) { + if (Objects.equals(_name, RenderingProperties.PROPERTY_STROKE)) { _matched=true; try { Enum.valueOf(RenderingStroke.class, propertyValue.getValue()); @@ -559,7 +559,7 @@ public void checkXRenderingPropertyValue(final XPropertyStringValue propertyValu } } if (!_matched) { - if (Objects.equal(_name, RenderingProperties.PROPERTY_RENDERING_DEPENDENCIES)) { + if (Objects.equals(_name, RenderingProperties.PROPERTY_RENDERING_DEPENDENCIES)) { _matched=true; try { Enum.valueOf(RenderingDependencies.class, propertyValue.getValue()); @@ -573,7 +573,7 @@ public void checkXRenderingPropertyValue(final XPropertyStringValue propertyValu } } if (!_matched) { - if (Objects.equal(_name, RenderingProperties.PROPERTY_RENDERING_EXECUTIONS)) { + if (Objects.equals(_name, RenderingProperties.PROPERTY_RENDERING_EXECUTIONS)) { _matched=true; try { Enum.valueOf(RenderingExecutions.class, propertyValue.getValue()); diff --git a/plugins/nl.esi.pps.tmsc/.classpath b/plugins/nl.esi.pps.tmsc/.classpath index 0a3b82d..5aad0ff 100644 --- a/plugins/nl.esi.pps.tmsc/.classpath +++ b/plugins/nl.esi.pps.tmsc/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/nl.esi.pps.tmsc/.settings/org.eclipse.core.resources.prefs b/plugins/nl.esi.pps.tmsc/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/plugins/nl.esi.pps.tmsc/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/nl.esi.pps.tmsc/.settings/org.eclipse.jdt.core.prefs b/plugins/nl.esi.pps.tmsc/.settings/org.eclipse.jdt.core.prefs index c9545f0..23fa13b 100644 --- a/plugins/nl.esi.pps.tmsc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/nl.esi.pps.tmsc/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=21 diff --git a/plugins/nl.esi.pps.tmsc/META-INF/MANIFEST.MF b/plugins/nl.esi.pps.tmsc/META-INF/MANIFEST.MF index fcf8487..03db753 100644 --- a/plugins/nl.esi.pps.tmsc/META-INF/MANIFEST.MF +++ b/plugins/nl.esi.pps.tmsc/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: nl.esi.pps.tmsc;singleton:=true Automatic-Module-Name: nl.esi.pps.tmsc -Bundle-Version: 0.20.0.qualifier +Bundle-Version: 0.30.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: nl.esi.pps.tmsc, nl.esi.pps.tmsc.compare, nl.esi.pps.tmsc.impl, diff --git a/plugins/nl.esi.pps.tmsc/build.properties b/plugins/nl.esi.pps.tmsc/build.properties index 229c5d1..3711b57 100644 --- a/plugins/nl.esi.pps.tmsc/build.properties +++ b/plugins/nl.esi.pps.tmsc/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc/plugin.properties b/plugins/nl.esi.pps.tmsc/plugin.properties index 531c057..cc36d9d 100644 --- a/plugins/nl.esi.pps.tmsc/plugin.properties +++ b/plugins/nl.esi.pps.tmsc/plugin.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/plugins/nl.esi.pps.tmsc/plugin.xml b/plugins/nl.esi.pps.tmsc/plugin.xml index 8b0c2e1..3cbfd63 100644 --- a/plugins/nl.esi.pps.tmsc/plugin.xml +++ b/plugins/nl.esi.pps.tmsc/plugin.xml @@ -1,7 +1,7 @@ - - - + @@ -35,6 +35,7 @@ -XX:+UseG1GC -XX:+UseStringDeduplication --add-modules=ALL-SYSTEM +--add-opens java.base/java.util.zip=ALL-UNNAMED diff --git a/products/nl.esi.pps.product/plugin_customization.ini b/products/nl.esi.pps.product/plugin_customization.ini index 98c7496..75a1d7e 100644 --- a/products/nl.esi.pps.product/plugin_customization.ini +++ b/products/nl.esi.pps.product/plugin_customization.ini @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/products/nl.esi.pps.product/pom.xml b/products/nl.esi.pps.product/pom.xml index fed7d60..7cffc16 100644 --- a/products/nl.esi.pps.product/pom.xml +++ b/products/nl.esi.pps.product/pom.xml @@ -1,7 +1,7 @@ - 11 + 21 ${java.source} ${java.source} @@ -44,26 +44,33 @@ UTF-8 UTF-8 + ${java.source} + + + 3.9.0 + + + 3.4.1 + - 2.6.0 + 4.0.13 ${tycho.version} false - - 2.25.0 - 3.6.0 + + 2.36.0 + 2.19.0 - 2.2.2 - 2.5.7 - 2.2.4 - 2.3.4 - 9.2.20.1 + 3.0.0 + 2.5.13 + 2.3.1 + 2.3.17 1.0.3 - 4.2.rc2 + 4.6 @@ -116,11 +123,11 @@ clean verify - + org.apache.maven.plugins maven-enforcer-plugin - 1.4.1 + ${maven.enforcer.version} enforce-maven @@ -129,8 +136,11 @@ + + ${java.source} + - [3.5,) + ${maven.minimal.version} @@ -163,6 +173,7 @@ ASCIIDOC_STYLE SCRIPT_STYLE SCRIPT_STYLE + JAVADOC_STYLE JAVADOC_STYLE @@ -232,11 +243,18 @@ + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 + + org.eclipse.tycho tycho-packaging-plugin - ${tycho.version} @@ -257,15 +275,13 @@ - org.eclipse.justj.openjdk.hotspot.jre.full-11 + org.eclipse.justj.openjdk.hotspot.jre.full-${java.source} - - nl.esi.pps - nl.esi.pps.target - 0.20.0-SNAPSHOT - + + ${maven.multiModuleProjectDirectory}/releng//nl.esi.pps.target/nl.esi.pps.target.target + + consider + + + org.eclipse.tycho + tycho-source-plugin + + + false + + FAIL + ${source.feature.skip} + + + + plugin-source + + plugin-source + + + + feature-source + + feature-source + + + + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + + + default-p2-metadata-default + + false + + + + + attach-p2-metadata + package + + p2-metadata + + + + + org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.5.2 + + --add-opens java.base/java.util.zip=ALL-UNNAMED + org.apache.maven.surefire surefire-junit47 - 3.0.0-M5 + 3.5.2 @@ -301,34 +375,6 @@ org.eclipse.xtend xtend-maven-plugin - ${xtext.version} - - - - compile - xtend-install-debug-info - - - - - ${project.basedir}/xtend-gen - ${project.basedir}/xtend-gen - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - ${project.basedir}/xtend-gen - - **/* - - - - @@ -336,7 +382,7 @@ maven-assembly-plugin - 2.6 + 3.7.1 @@ -364,20 +410,95 @@ org.eclipse.tycho tycho-surefire-plugin ${tycho.version} + + --add-opens java.base/java.util.zip=ALL-UNNAMED + org.eclipse.tycho - tycho-p2-director-plugin + tycho-packaging-plugin ${tycho.version} + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + + org.eclipse.tycho + tycho-bnd-plugin + ${tycho.version} + + + + + default-process + + + + org.eclipse.tycho tycho-p2-repository-plugin ${tycho.version} + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + + org.apache.maven.plugins + maven-clean-plugin + 3.4.0 + + + + + default-clean-1 + + + + + + ${project.basedir}/xtend-gen + + **/* + + + .gitignore + + + + + + + + org.eclipse.xtend + xtend-maven-plugin + ${xtext.version} + + + + + compile + xtend-install-debug-info + testCompile + xtend-test-install-debug-info + + + + + ${project.basedir}/xtend-gen + ${project.basedir}/xtend-gen + + + org.asciidoctor @@ -399,11 +520,6 @@ asciidoctorj-pdf ${asciidoctorj.pdf.version} - - org.jruby - jruby-complete - ${jruby.version} - @@ -426,32 +542,6 @@ geneclipsetoc-maven-plugin ${geneclipsetoc.maven.plugin.version} - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - com.altran.general.emf.ecoredoc - ecoredoc-maven-plugin - [0.0.0,) - - ecoredoc - - - - - - - - - - @@ -470,7 +560,6 @@ org.eclipse.tycho tycho-packaging-plugin - ${tycho.version} @@ -542,88 +631,6 @@ - - create-plugin-source - - - ${basedir}/META-INF/MANIFEST.MF - - - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho.version} - - - plugin-source - - plugin-source - - - - - - - - - - create-feature-source - - - ${basedir}/feature.xml - - - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho.extras.version} - - ${source.feature.skip} - FAIL - - - - source-feature - - source-feature - - - - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho.version} - - - - - default-p2-metadata-default - - false - - - - - attach-p2-metadata - package - - p2-metadata - - - - - - - - eclipse-m2e @@ -666,6 +673,19 @@ + + + com.altran.general.emf.ecoredoc + ecoredoc-maven-plugin + [0.0.0,) + + ecoredoc + + + + + + diff --git a/releng/nl.esi.pps.license/.settings/org.eclipse.core.resources.prefs b/releng/nl.esi.pps.license/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/releng/nl.esi.pps.license/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/releng/nl.esi.pps.license/build.properties b/releng/nl.esi.pps.license/build.properties index 4d71ba9..b15ceb1 100644 --- a/releng/nl.esi.pps.license/build.properties +++ b/releng/nl.esi.pps.license/build.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/releng/nl.esi.pps.license/feature.properties b/releng/nl.esi.pps.license/feature.properties index 612f410..aac1b00 100644 --- a/releng/nl.esi.pps.license/feature.properties +++ b/releng/nl.esi.pps.license/feature.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community +# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community # # This program and the accompanying materials are made available # under the terms of the MIT License which is available at diff --git a/releng/nl.esi.pps.license/feature.xml b/releng/nl.esi.pps.license/feature.xml index ef8ca35..ac1a71a 100644 --- a/releng/nl.esi.pps.license/feature.xml +++ b/releng/nl.esi.pps.license/feature.xml @@ -1,7 +1,7 @@