From 931015078f21fd919cdd4af176921562e97ca9d7 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Wed, 18 Sep 2024 10:42:58 -0500 Subject: [PATCH 01/11] Update target for OSATE 2.14.0 --- ...om.rockwellcollins.atc.agree.target.target | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/com.rockwellcollins.atc.agree.target/com.rockwellcollins.atc.agree.target.target b/com.rockwellcollins.atc.agree.target/com.rockwellcollins.atc.agree.target.target index 0fe4330e4..eed50fa0e 100644 --- a/com.rockwellcollins.atc.agree.target/com.rockwellcollins.atc.agree.target.target +++ b/com.rockwellcollins.atc.agree.target/com.rockwellcollins.atc.agree.target.target @@ -1,10 +1,9 @@ - + - @@ -17,35 +16,32 @@ + - - + - - - - - + - + - + - + + @@ -71,14 +67,14 @@ - - - - + + + + - - - + + + From c7c33e6cfe1053b861c842c0958ff2ac316cde08 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 20 Sep 2024 14:37:00 -0500 Subject: [PATCH 02/11] Update POM versions for next development --- com.rockwellcollins.atc.agree.analysis/pom.xml | 2 +- com.rockwellcollins.atc.agree.cli/pom.xml | 2 +- com.rockwellcollins.atc.agree.codegen/pom.xml | 2 +- com.rockwellcollins.atc.agree.doc/pom.xml | 2 +- com.rockwellcollins.atc.agree.examples.feature/pom.xml | 2 +- com.rockwellcollins.atc.agree.examples/pom.xml | 2 +- com.rockwellcollins.atc.agree.feature/pom.xml | 2 +- com.rockwellcollins.atc.agree.tests/pom.xml | 2 +- com.rockwellcollins.atc.agree.ui/pom.xml | 2 +- com.rockwellcollins.atc.agree/pom.xml | 2 +- com.rockwellcollins.atc.tcg.feature/pom.xml | 2 +- com.rockwellcollins.atc.tcg/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.agree/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.doc/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.feature/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.ui/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.xtext/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator/pom.xml | 2 +- edu.uah.rsesc.agree.ge.ui/pom.xml | 2 +- edu.uah.rsesc.agree.ge/pom.xml | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/com.rockwellcollins.atc.agree.analysis/pom.xml b/com.rockwellcollins.atc.agree.analysis/pom.xml index 9e21c32e2..99319a923 100644 --- a/com.rockwellcollins.atc.agree.analysis/pom.xml +++ b/com.rockwellcollins.atc.agree.analysis/pom.xml @@ -27,7 +27,7 @@ 2.11.0 com.rockwellcollins.atc.agree.analysis - 2.10.2 + 2.10.3-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.cli/pom.xml b/com.rockwellcollins.atc.agree.cli/pom.xml index 3a0f20579..34b99a56a 100644 --- a/com.rockwellcollins.atc.agree.cli/pom.xml +++ b/com.rockwellcollins.atc.agree.cli/pom.xml @@ -7,7 +7,7 @@ 2.11.0 com.rockwellcollins.atc.agree.cli - 1.0.1 + 1.0.2-SNAPSHOT eclipse-plugin 1.5.0 diff --git a/com.rockwellcollins.atc.agree.codegen/pom.xml b/com.rockwellcollins.atc.agree.codegen/pom.xml index 21b373457..2f3cd87ab 100644 --- a/com.rockwellcollins.atc.agree.codegen/pom.xml +++ b/com.rockwellcollins.atc.agree.codegen/pom.xml @@ -27,6 +27,6 @@ 2.11.0 com.rockwellcollins.atc.agree.codegen - 2.9.1 + 2.9.2-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.doc/pom.xml b/com.rockwellcollins.atc.agree.doc/pom.xml index 860c51edd..84a728fcf 100644 --- a/com.rockwellcollins.atc.agree.doc/pom.xml +++ b/com.rockwellcollins.atc.agree.doc/pom.xml @@ -27,7 +27,7 @@ 2.11.0 com.rockwellcollins.atc.agree.doc - 2.10.0 + 2.10.1-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.examples.feature/pom.xml b/com.rockwellcollins.atc.agree.examples.feature/pom.xml index 8e1333361..14b450d41 100644 --- a/com.rockwellcollins.atc.agree.examples.feature/pom.xml +++ b/com.rockwellcollins.atc.agree.examples.feature/pom.xml @@ -30,7 +30,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.examples.feature - 1.0.3 + 1.0.4-SNAPSHOT eclipse-feature diff --git a/com.rockwellcollins.atc.agree.examples/pom.xml b/com.rockwellcollins.atc.agree.examples/pom.xml index 2a38ec2ce..70780f4e8 100644 --- a/com.rockwellcollins.atc.agree.examples/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/pom.xml @@ -30,7 +30,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.examples - 1.0.2 + 1.0.3-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.feature/pom.xml b/com.rockwellcollins.atc.agree.feature/pom.xml index 6107a5855..1838df65b 100644 --- a/com.rockwellcollins.atc.agree.feature/pom.xml +++ b/com.rockwellcollins.atc.agree.feature/pom.xml @@ -28,6 +28,6 @@ com.rockwellcollins.atc.agree.feature eclipse-feature - 2.11.0 + 2.11.1-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree.tests/pom.xml b/com.rockwellcollins.atc.agree.tests/pom.xml index 2dd2c6306..63355cce0 100644 --- a/com.rockwellcollins.atc.agree.tests/pom.xml +++ b/com.rockwellcollins.atc.agree.tests/pom.xml @@ -26,7 +26,7 @@ 2.11.0 com.rockwellcollins.atc.agree.tests - 2.7.4 + 2.7.5-SNAPSHOT eclipse-test-plugin diff --git a/com.rockwellcollins.atc.agree.ui/pom.xml b/com.rockwellcollins.atc.agree.ui/pom.xml index 3796d2586..86a54bb9e 100644 --- a/com.rockwellcollins.atc.agree.ui/pom.xml +++ b/com.rockwellcollins.atc.agree.ui/pom.xml @@ -27,6 +27,6 @@ 2.11.0 com.rockwellcollins.atc.agree.ui - 4.0.0 + 4.0.1-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree/pom.xml b/com.rockwellcollins.atc.agree/pom.xml index 58b564cbe..5fb77f9a9 100644 --- a/com.rockwellcollins.atc.agree/pom.xml +++ b/com.rockwellcollins.atc.agree/pom.xml @@ -27,6 +27,6 @@ 2.11.0 com.rockwellcollins.atc.agree - 4.0.0 + 4.0.1-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.tcg.feature/pom.xml b/com.rockwellcollins.atc.tcg.feature/pom.xml index 7f8ce1212..485d83a1d 100644 --- a/com.rockwellcollins.atc.tcg.feature/pom.xml +++ b/com.rockwellcollins.atc.tcg.feature/pom.xml @@ -29,7 +29,7 @@ com.rockwellcollins.atc.tcg.feature - 2.9.1 + 2.9.2-SNAPSHOT eclipse-feature diff --git a/com.rockwellcollins.atc.tcg/pom.xml b/com.rockwellcollins.atc.tcg/pom.xml index 8070e4c63..e4d4be0c7 100644 --- a/com.rockwellcollins.atc.tcg/pom.xml +++ b/com.rockwellcollins.atc.tcg/pom.xml @@ -29,7 +29,7 @@ com.rockwellcollins.atc.tcg - 2.9.1 + 2.9.2-SNAPSHOT com.rockwellcollins.atc.tcg eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml b/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml index 5d10c47c0..fcdaef995 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml @@ -30,7 +30,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.agree.feature - 2.9.1 + 2.9.2-SNAPSHOT eclipse-feature diff --git a/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml index 6118f4995..3c865a3f1 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml @@ -30,7 +30,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.agree.ui - 2.9.1 + 2.9.2-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.agree/pom.xml b/edu.uah.rsesc.aadlsimulator.agree/pom.xml index 34fc78381..fb0936c69 100644 --- a/edu.uah.rsesc.aadlsimulator.agree/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree/pom.xml @@ -30,7 +30,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.agree - 2.9.1 + 2.9.2-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.doc/pom.xml b/edu.uah.rsesc.aadlsimulator.doc/pom.xml index 2ba62d9a6..cf432df65 100644 --- a/edu.uah.rsesc.aadlsimulator.doc/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.doc/pom.xml @@ -27,7 +27,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.doc - 2.7.3 + 2.7.4-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.feature/pom.xml b/edu.uah.rsesc.aadlsimulator.feature/pom.xml index 926c0996a..db0db153d 100644 --- a/edu.uah.rsesc.aadlsimulator.feature/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.feature/pom.xml @@ -30,7 +30,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.feature - 3.1.1 + 3.1.2-SNAPSHOT eclipse-feature diff --git a/edu.uah.rsesc.aadlsimulator.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.ui/pom.xml index 8f372afa8..978141c06 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.ui/pom.xml @@ -30,7 +30,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.ui - 2.9.1 + 2.9.2-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml index 1bc9fbc47..1ccddf620 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml @@ -10,7 +10,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.xtext.ui - 3.1.1 + 3.1.2-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.xtext/pom.xml b/edu.uah.rsesc.aadlsimulator.xtext/pom.xml index 614a29626..30ae6ce09 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.xtext/pom.xml @@ -30,7 +30,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.xtext - 3.1.1 + 3.1.2-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator/pom.xml b/edu.uah.rsesc.aadlsimulator/pom.xml index 1cdb3aaa4..22158a3ec 100644 --- a/edu.uah.rsesc.aadlsimulator/pom.xml +++ b/edu.uah.rsesc.aadlsimulator/pom.xml @@ -30,7 +30,7 @@ edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator - 2.9.1 + 2.9.2-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.agree.ge.ui/pom.xml b/edu.uah.rsesc.agree.ge.ui/pom.xml index 9ee10fd91..8b2fde61a 100644 --- a/edu.uah.rsesc.agree.ge.ui/pom.xml +++ b/edu.uah.rsesc.agree.ge.ui/pom.xml @@ -7,6 +7,6 @@ 2.11.0 edu.uah.rsesc.agree.ge.ui - 2.9.1 + 2.9.2-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.agree.ge/pom.xml b/edu.uah.rsesc.agree.ge/pom.xml index 81aa05809..31444aa2b 100644 --- a/edu.uah.rsesc.agree.ge/pom.xml +++ b/edu.uah.rsesc.agree.ge/pom.xml @@ -7,6 +7,6 @@ 2.11.0 edu.uah.rsesc.agree.ge - 2.9.1 + 2.9.2-SNAPSHOT eclipse-plugin From b9c6a214454088716407a1c964915266ea3de1a9 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 20 Sep 2024 14:38:44 -0500 Subject: [PATCH 03/11] Update top-level pom deps and tycho --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2d1ee8231..f8b5eba28 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 17 --> - 2.7.5 - 2.7.5 + 3.0.5 + 3.0.5 http://download.eclipse.org - 2.30.0 + 2.33.0 @@ -488,12 +488,12 @@ Eclipse p2 - ${eclipse.mirror}/releases/2023-03/ + ${eclipse.mirror}/releases/2023-12/ Osate2 p2 - https://osate-build.sei.cmu.edu/download/osate/stable/2.13.0-vfinal/updates/ + https://osate-build.sei.cmu.edu/download/osate/stable/2.14.0-vfinal/updates/ codehaus-snapshots From 820d31561a994159aa85ccfc8b66df2a12ad22f8 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 20 Sep 2024 14:39:32 -0500 Subject: [PATCH 04/11] Remove generator for removed xtext formater --- .../aadlsimulator/xtext/GenerateInputConstraint.mwe2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/edu.uah.rsesc.aadlsimulator.xtext/src/edu/uah/rsesc/aadlsimulator/xtext/GenerateInputConstraint.mwe2 b/edu.uah.rsesc.aadlsimulator.xtext/src/edu/uah/rsesc/aadlsimulator/xtext/GenerateInputConstraint.mwe2 index 4b0fbfbf5..4fe1bb00b 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/src/edu/uah/rsesc/aadlsimulator/xtext/GenerateInputConstraint.mwe2 +++ b/edu.uah.rsesc.aadlsimulator.xtext/src/edu/uah/rsesc/aadlsimulator/xtext/GenerateInputConstraint.mwe2 @@ -23,7 +23,7 @@ module edu.uah.rsesc.aadlsimulator.xtext.GenerateInputConstraint import org.eclipse.emf.mwe.utils.* import org.eclipse.xtext.xtext.generator.* import org.eclipse.xtext.xtext.generator.model.project.* -import org.eclipse.xtext.generator.* +import org.eclipse.xtext.xtext.generator.* var projectName = "edu.uah.rsesc.aadlsimulator.xtext" var rootPath = ".." @@ -90,10 +90,10 @@ Workflow { } // formatter API - fragment = adapter.FragmentAdapter { - fragment = formatting.FormatterFragment { - } - } +// fragment = adapter.FragmentAdapter { +// fragment = formatting.FormatterFragment { +// } +// } // a custom ResourceFactory for use with EMF fragment = resourceFactory.ResourceFactoryFragment2 auto-inject {} From a02c7b2a586b93f788b1a29363dd057739b982b4 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 20 Sep 2024 14:43:26 -0500 Subject: [PATCH 05/11] Update dependency versions --- com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF | 6 ++++-- edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF | 2 +- edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF | 3 ++- edu.uah.rsesc.aadlsimulator.xtext/build.properties | 2 +- edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF index 36c4861d4..263ee9150 100644 --- a/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF @@ -5,12 +5,14 @@ Bundle-Vendor: Rockwell Collins, Inc. Bundle-Version: 4.0.1.qualifier Bundle-SymbolicName: com.rockwellcollins.atc.agree; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.25.0,3.0.0)";resolution:=optional, +Require-Bundle: org.eclipse.xtext.xtext.generator;bundle-version="[2.25.0,3.0.0)";resolution:=optional, org.eclipse.emf.mwe2.launch;bundle-version="[2.12.0,3.0.0)";resolution:=optional, org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", org.osate.xtext.aadl2;bundle-version="[7.0.0,8.0.0)", org.osate.xtext.aadl2.properties;bundle-version="[3.0.0,4.0.0)", - org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)" + org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)", + org.eclipse.xtext;bundle-version="[2.33.0,3.0.0)", + org.eclipse.xtext.util;bundle-version="[2.33.0,3.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: com.rockwellcollins.atc.agree;version="4.0.1", com.rockwellcollins.atc.agree.services;version="4.0.1", diff --git a/edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF index 53d6a3a9e..e50adca49 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF @@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.emf.common;bundle-version="[2.22.0,3.0.0)", org.osate.ge;bundle-version="[3.0.0,4.0.0)", edu.uah.rsesc.aadlsimulator.xtext.ui;bundle-version="[3.0.0,4.0.0)", - javax.annotation;bundle-version="[1.3.0,2.0.0)" + jakarta.annotation-api;bundle-version="[2.1.0,3.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Service-Component: components/DefaultSimulationUIService.xml diff --git a/edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF index 2492e3d32..748b02460 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.25.0,3.0.0)";visibility:=re org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.common.types;bundle-version="[2.25.0,3.0.0)", org.eclipse.xtend.lib;bundle-version="[2.25.0,3.0.0)", - org.eclipse.emf.mwe.utils;bundle-version="[1.5.0,2.0.0)" + org.eclipse.emf.mwe.utils;bundle-version="[1.5.0,2.0.0)", + org.eclipse.xtext.xtext.generator;bundle-version="[2.25.0,3.0.0)" Import-Package: org.apache.log4j;version="[1.2.15,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: edu.uah.rsesc.aadlsimulator.xtext;version="3.1.2", diff --git a/edu.uah.rsesc.aadlsimulator.xtext/build.properties b/edu.uah.rsesc.aadlsimulator.xtext/build.properties index 7c5589191..764dcd9e0 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/build.properties +++ b/edu.uah.rsesc.aadlsimulator.xtext/build.properties @@ -6,7 +6,7 @@ bin.includes = model/generated/,\ .,\ plugin.xml additional.bundles = org.eclipse.xtext.xbase,\ - org.eclipse.xtext.generator,\ + org.eclipse.xtext.xtext.generator,\ org.apache.commons.logging,\ org.eclipse.emf.codegen.ecore,\ org.eclipse.emf.mwe2.launch,\ diff --git a/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF b/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF index 97532e01a..55928b1b9 100644 --- a/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", org.osate.ge;bundle-version="[3.0.0,4.0.0)", - org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)" + org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)", + org.eclipse.xtext.util;bundle-version="[2.33.0,3.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: edu.uah.rsesc.agree.ge;version="2.9.2", From dbc3c97fe421a97b45dc7d1877827cd71ef13763 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Fri, 20 Sep 2024 14:43:58 -0500 Subject: [PATCH 06/11] Update old javax apis to jakarta --- .../impl/DefaultSimulationUIService.java | 126 +++++---- .../ui/views/PropertiesView.java | 108 ++++---- .../aadlsimulator/ui/views/StatusView.java | 80 +++--- .../aadlsimulator/ui/views/VariablesView.java | 245 +++++++++--------- .../xtext/util/InputConstraintHelper.java | 3 +- 5 files changed, 270 insertions(+), 292 deletions(-) diff --git a/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/services/impl/DefaultSimulationUIService.java b/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/services/impl/DefaultSimulationUIService.java index 42bc60b18..0d025840a 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/services/impl/DefaultSimulationUIService.java +++ b/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/services/impl/DefaultSimulationUIService.java @@ -2,20 +2,20 @@ Copyright (c) 2015, Rockwell Collins. Developed with the sponsorship of Defense Advanced Research Projects Agency (DARPA). -Permission is hereby granted, free of charge, to any person obtaining a copy of this data, -including any software or models in source or binary form, as well as any drawings, specifications, +Permission is hereby granted, free of charge, to any person obtaining a copy of this data, +including any software or models in source or binary form, as well as any drawings, specifications, and documentation (collectively "the Data"), to deal in the Data without restriction, including -without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Data. -THE DATA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS, SPONSORS, DEVELOPERS, CONTRIBUTORS, OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +THE DATA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS, SPONSORS, DEVELOPERS, CONTRIBUTORS, OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. */ package edu.uah.rsesc.aadlsimulator.ui.services.impl; @@ -26,8 +26,6 @@ and documentation (collectively "the Data"), to deal in the Data without restric import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; -import javax.inject.Inject; - import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.e4.core.contexts.EclipseContextFactory; @@ -46,9 +44,9 @@ and documentation (collectively "the Data"), to deal in the Data without restric import edu.uah.rsesc.aadlsimulator.EngineStateChangedEvent; import edu.uah.rsesc.aadlsimulator.EngineStateChangedEvent.Cause; import edu.uah.rsesc.aadlsimulator.NullSimulationEngineEventListener; -import edu.uah.rsesc.aadlsimulator.SimulationEngineState; -import edu.uah.rsesc.aadlsimulator.SimulationEngineEventListener; import edu.uah.rsesc.aadlsimulator.SimulationEngine; +import edu.uah.rsesc.aadlsimulator.SimulationEngineEventListener; +import edu.uah.rsesc.aadlsimulator.SimulationEngineState; import edu.uah.rsesc.aadlsimulator.services.SimulationEngineChangeListener; import edu.uah.rsesc.aadlsimulator.services.SimulationService; import edu.uah.rsesc.aadlsimulator.ui.events.BeforeStepForwardEvent; @@ -57,6 +55,7 @@ and documentation (collectively "the Data"), to deal in the Data without restric import edu.uah.rsesc.aadlsimulator.ui.services.SimulatorState; import edu.uah.rsesc.aadlsimulator.ui.services.SimulatorStateListener; import edu.uah.rsesc.aadlsimulator.ui.services.StepForwardCanceledException; +import jakarta.inject.Inject; public class DefaultSimulationUIService implements SimulationUIService { private class ActiveSimulation { @@ -66,14 +65,14 @@ public ActiveSimulation(final SimulationEngine engine, final SimulationEngineEve this.console = Objects.requireNonNull(console, "console must not be null"); this.stateChangeListener = Objects.requireNonNull(stateChangeListener, "stateChangeListener must not be null"); } - + public final SimulationEngine engine; public SimulationEngineState state; public int selectedFrameIndex = SimulatorState.NO_FRAME_INDEX_SELECTED; public SimulationEngineEventListener stateChangeListener; public IConsole console; - }; - + }; + private final IEventBroker eventBroker; private final SimulationService simulationService; private final Map simulationEngineToActiveSimulationMap = new HashMap(); @@ -82,56 +81,53 @@ public ActiveSimulation(final SimulationEngine engine, final SimulationEngineEve private volatile SimulatorState simulatorState = new SimpleSimulatorState(null, null, SimulatorState.NO_FRAME_INDEX_SELECTED); private volatile boolean uiLocked = false; private volatile boolean updatePending = false; // True if the sending of a simulator state change notification is queued - + @Inject public DefaultSimulationUIService(final IEventBroker eventBroker) { this.eventBroker = Objects.requireNonNull(eventBroker, "eventBroker must not be null"); simulationService = Objects.requireNonNull(EclipseContextFactory.getServiceContext(FrameworkUtil.getBundle(getClass()).getBundleContext()).get(SimulationService.class), "unable to get simulation service"); - simulationService.addSimulationEngineChangeListener(new SimulationEngineChangeListener() { + simulationService.addSimulationEngineChangeListener(new SimulationEngineChangeListener() { @Override public void onSimulationEngineCreated(final SimulationEngine engine) { if(currentActiveSimulation != null) { throw new RuntimeException("Only one simulation may run at a time."); } - + setCurrentSimulationEngine(engine); - + // When a simulation engine is created, load the system instance in the OSATE Graphical Editor final SystemInstance systemInstance = engine.getSystemInstance(); if(systemInstance != null) { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - final GraphicalEditorService editorService = Objects.requireNonNull((GraphicalEditorService)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(GraphicalEditorService.class), "unable to retrieve Graphical Editor Service"); - editorService.openBusinessObject(systemInstance); - } + Display.getDefault().asyncExec(() -> { + final GraphicalEditorService editorService = Objects.requireNonNull(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(GraphicalEditorService.class), "unable to retrieve Graphical Editor Service"); + editorService.openBusinessObject(systemInstance); }); } } - + @Override public void onSimulationEngineDisposed(final SimulationEngine engine) { setCurrentSimulationEngine(null); } }); } - + @Override public SimulatorState getCurrentState() { return simulatorState; } - + private synchronized void setCurrentSimulationEngine(final SimulationEngine newCurrentSimulationEngine) { // Ensure simulation is not locked this.uiLocked = false; - + // Unregister simulation engine and the frame state change listener if(currentActiveSimulation != null) { currentActiveSimulation.engine.removeEventListener(currentActiveSimulation.stateChangeListener); - ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new IConsole[]{currentActiveSimulation.console}); + ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new IConsole[]{currentActiveSimulation.console}); simulationEngineToActiveSimulationMap.remove(currentActiveSimulation.engine); } - + // Adjust the active simulation engine if(newCurrentSimulationEngine == null) { currentActiveSimulation = null; @@ -142,29 +138,29 @@ private synchronized void setCurrentSimulationEngine(final SimulationEngine newC ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[]{newConsole}); final MessageConsoleStream consoleStream = newConsole.newMessageStream(); consoleStream.println("Simulation Started"); - + final SimulationEngineEventListener engineEventListener = new NullSimulationEngineEventListener() { @Override public void onSimulationEngineStateChanged(final EngineStateChangedEvent e) { final int newSelectedFrameIndex; - if(e.getCause() == Cause.STEP_FORWARD || e.getCause() == Cause.STEP_BACKWARD) { + if(e.getCause() == Cause.STEP_FORWARD || e.getCause() == Cause.STEP_BACKWARD) { newSelectedFrameIndex = e.getEngineState().getNumberOfFrames() == 0 ? SimulatorState.NO_FRAME_INDEX_SELECTED : (e.getEngineState().getNumberOfFrames() - 1); } else { newSelectedFrameIndex = simulatorState.getSelectedFrameIndex(); } - updateActivateSimulation(newCurrentSimulationEngine, e.getEngineState(), newSelectedFrameIndex); + updateActivateSimulation(newCurrentSimulationEngine, e.getEngineState(), newSelectedFrameIndex); } }; - + currentActiveSimulation = new ActiveSimulation(newCurrentSimulationEngine, engineEventListener, newConsole); simulationEngineToActiveSimulationMap.put(newCurrentSimulationEngine, currentActiveSimulation); newCurrentSimulationEngine.addEventListener(engineEventListener); } - + updateCurrentState(); } - + private synchronized void updateActivateSimulation(final SimulationEngine engine, final SimulationEngineState state, final int newSelectedFrameIndex) { final ActiveSimulation activeSimulation = simulationEngineToActiveSimulationMap.get(engine); if(activeSimulation != null) { @@ -173,7 +169,7 @@ private synchronized void updateActivateSimulation(final SimulationEngine engine } updateCurrentState(); } - + private void updateCurrentState() { // Update the simulator state variable if(currentActiveSimulation == null) { @@ -181,53 +177,51 @@ private void updateCurrentState() { } else { simulatorState = new SimpleSimulatorState(currentActiveSimulation.engine, currentActiveSimulation.state, currentActiveSimulation.selectedFrameIndex); } - - // Notify listeners in the display thread. In cases where many state changes occur in a short amount of time, do not notify UI listeners of all changes. + + // Notify listeners in the display thread. In cases where many state changes occur in a short amount of time, do not notify UI listeners of all changes. // Guaranteed to notify listeners of the first and last change in a sequence. - final Runnable notificationRunnable = new Runnable() { - @Override - public void run() { - updatePending = false; - - // Notify simulation engine change listeners - for(final SimulatorStateListener l : stateChangeListeners) { - l.onSimulatorStateChanged(simulatorState); - } - } + final Runnable notificationRunnable = () -> { + updatePending = false; + + // Notify simulation engine change listeners + for(final SimulatorStateListener l : stateChangeListeners) { + l.onSimulatorStateChanged(simulatorState); + } }; - + if(!updatePending) { updatePending = true; Display.getDefault().asyncExec(notificationRunnable); } } - + @Override public void addStateChangeListener(final SimulatorStateListener listener) { Objects.requireNonNull(listener, "listener must not be null"); stateChangeListeners.add(listener); } - + @Override public void removeStateChangeListener(final SimulatorStateListener listener) { Objects.requireNonNull(listener, "listener must not be null"); stateChangeListeners.remove(listener); } - - @Override + + @Override public boolean canStepForward() { return currentActiveSimulation != null && currentActiveSimulation.state.canStepForward() && !uiLocked; } - - @Override + + @Override public boolean canStepBackward() { return currentActiveSimulation != null && currentActiveSimulation.state.canStepBackward() && !uiLocked; - } - + } + + @Override public void prepareToStepForward() throws StepForwardCanceledException { final BeforeStepForwardEvent beforeStepForwardEvent = new BeforeStepForwardEvent(); eventBroker.send(SimulatorUIEvents.BEFORE_STEP_FORWARD, beforeStepForwardEvent); - + if(beforeStepForwardEvent.isStepCanceled()) { throw new StepForwardCanceledException(beforeStepForwardEvent.getCancellationReason()); } @@ -244,24 +238,24 @@ public void stepForward() { final Status status = new Status(IStatus.ERROR, FrameworkUtil.getBundle(getClass()).getSymbolicName(), "Unable to Step Forward", ex); StatusManager.getManager().handle(status, StatusManager.SHOW); } - } - + } + @Override public synchronized void lockUserInterface() { this.uiLocked = true; updateCurrentState(); } - + @Override public synchronized void unlockUserInterface() { this.uiLocked = false; updateCurrentState(); } - + @Override public boolean isUserInterfaceLocked() { return this.uiLocked; - } + } @Override public synchronized void setSelectedFrameIndex(final int newFrameIndex) { diff --git a/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/PropertiesView.java b/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/PropertiesView.java index b8a3444ed..54ffcc97c 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/PropertiesView.java +++ b/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/PropertiesView.java @@ -2,33 +2,27 @@ Copyright (c) 2015, Rockwell Collins. Developed with the sponsorship of Defense Advanced Research Projects Agency (DARPA). -Permission is hereby granted, free of charge, to any person obtaining a copy of this data, -including any software or models in source or binary form, as well as any drawings, specifications, +Permission is hereby granted, free of charge, to any person obtaining a copy of this data, +including any software or models in source or binary form, as well as any drawings, specifications, and documentation (collectively "the Data"), to deal in the Data without restriction, including -without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Data. -THE DATA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS, SPONSORS, DEVELOPERS, CONTRIBUTORS, OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +THE DATA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS, SPONSORS, DEVELOPERS, CONTRIBUTORS, OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. */ package edu.uah.rsesc.aadlsimulator.ui.views; import java.util.Objects; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Composite; @@ -39,30 +33,29 @@ and documentation (collectively "the Data"), to deal in the Data without restric import edu.uah.rsesc.aadlsimulator.ui.ext.CommandContext; import edu.uah.rsesc.aadlsimulator.ui.ext.SimpleCommandContext; import edu.uah.rsesc.aadlsimulator.ui.services.SimulationUIService; -import edu.uah.rsesc.aadlsimulator.ui.services.SimulatorState; import edu.uah.rsesc.aadlsimulator.ui.services.SimulatorStateListener; import edu.uah.rsesc.aadlsimulator.ui.services.SimulatorUIExtensionService; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; public class PropertiesView { private final SimulationUIService simulationUiService; private final SimulatorUIExtensionService extService; private SimulationEngine engine; private SimulationEngineState engineState; - - private final SimulatorStateListener stateListener = new SimulatorStateListener() { - @Override - public void onSimulatorStateChanged(final SimulatorState simulatorState) { - final SimulationEngine engine = simulatorState.getSimulationEngine(); - PropertiesView.this.engine = engine; - if(engine == null) { - engineState = null; - } else { - engineState = simulatorState.getEngineState(); - } - propertiesStateViewer.setInput(engineState); + + private final SimulatorStateListener stateListener = simulatorState -> { + final SimulationEngine engine = simulatorState.getSimulationEngine(); + this.engine = engine; + if(engine == null) { + engineState = null; + } else { + engineState = simulatorState.getEngineState(); } + this.propertiesStateViewer.setInput(engineState); }; - + private PropertiesStateViewer propertiesStateViewer; @Inject @@ -74,36 +67,33 @@ public PropertiesView(final SimulationUIService simulationUiService, final Simul @PostConstruct void createView(final Composite parent) { propertiesStateViewer = new PropertiesStateViewer(parent); - propertiesStateViewer.addPropertyMenuListener(new IMenuListener() { - @Override - public void menuAboutToShow(final IMenuManager manager) { - // Only populate the menu if a single property is selected - final IStructuredSelection selection = propertiesStateViewer.getSelection(); - if(selection.size() == 1 && engineState != null && engine != null) { - final Object selectedProperty = selection.getFirstElement(); - - // Populate context menu using command extensions - final CommandContext cmdCtx = new SimpleCommandContext(selectedProperty, engineState, engine); - - for(final Command cmd : extService.getCommands()) { - if(cmd.isAvailable(cmdCtx)) { - manager.add(new Action(cmd.getLabel(cmdCtx)) { - @Override - public boolean isEnabled() { - return cmd.isActivatable(cmdCtx); - } - - @Override - public void run() { - cmd.activate(cmdCtx); - } - }); - } + propertiesStateViewer.addPropertyMenuListener(manager -> { + // Only populate the menu if a single property is selected + final IStructuredSelection selection = propertiesStateViewer.getSelection(); + if(selection.size() == 1 && engineState != null && engine != null) { + final Object selectedProperty = selection.getFirstElement(); + + // Populate context menu using command extensions + final CommandContext cmdCtx = new SimpleCommandContext(selectedProperty, engineState, engine); + + for(final Command cmd : extService.getCommands()) { + if(cmd.isAvailable(cmdCtx)) { + manager.add(new Action(cmd.getLabel(cmdCtx)) { + @Override + public boolean isEnabled() { + return cmd.isActivatable(cmdCtx); + } + + @Override + public void run() { + cmd.activate(cmdCtx); + } + }); } } } }); - + // Add listener and populate UI with current state simulationUiService.addStateChangeListener(stateListener); stateListener.onSimulatorStateChanged(simulationUiService.getCurrentState()); @@ -113,18 +103,18 @@ public void run() { public void preDestroy() { simulationUiService.removeStateChangeListener(stateListener); } - + public void setFocus() { if(propertiesStateViewer != null) { propertiesStateViewer.getControl().setFocus(); } } - + public void setShowOnlyErrorsAndWarnings(final boolean value) { if(value) { propertiesStateViewer.setFilters(new PropertyStatusStyleFilter[] { new PropertyStatusStyleFilter(PropertyStatus.Style.OK, PropertyStatus.Style.INFO) }); } else { - propertiesStateViewer.resetFilters(); - } + propertiesStateViewer.resetFilters(); + } } } diff --git a/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/StatusView.java b/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/StatusView.java index 983a9590a..baceac6e4 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/StatusView.java +++ b/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/StatusView.java @@ -2,64 +2,60 @@ Copyright (c) 2015, Rockwell Collins. Developed with the sponsorship of Defense Advanced Research Projects Agency (DARPA). -Permission is hereby granted, free of charge, to any person obtaining a copy of this data, -including any software or models in source or binary form, as well as any drawings, specifications, +Permission is hereby granted, free of charge, to any person obtaining a copy of this data, +including any software or models in source or binary form, as well as any drawings, specifications, and documentation (collectively "the Data"), to deal in the Data without restriction, including -without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Data. -THE DATA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS, SPONSORS, DEVELOPERS, CONTRIBUTORS, OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +THE DATA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS, SPONSORS, DEVELOPERS, CONTRIBUTORS, OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. */ package edu.uah.rsesc.aadlsimulator.ui.views; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; + import edu.uah.rsesc.aadlsimulator.SimulationEngine; import edu.uah.rsesc.aadlsimulator.SimulationEngineState; import edu.uah.rsesc.aadlsimulator.ui.services.SimulationUIService; -import edu.uah.rsesc.aadlsimulator.ui.services.SimulatorState; import edu.uah.rsesc.aadlsimulator.ui.services.SimulatorStateListener; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; public class StatusView { private final SimulationUIService simulationUiService; - - private final SimulatorStateListener stateListener = new SimulatorStateListener() { - @Override - public void onSimulatorStateChanged(final SimulatorState simulatorState) { - final SimulationEngine engine = simulatorState.getSimulationEngine(); - if(engine == null) { - container.setVisible(false); - } else { - container.setVisible(true); - componentImplementationLabel.setText(engine.getSystemInstance().getComponentImplementation().getQualifiedName()); - typeLabel.setText(engine.getSimulationType()); - statusLabel.setText(engine.getCurrentState().getStatusDescription()); - } - - final SimulationEngineState engineState = simulatorState.getEngineState(); - statusLabel.setForeground(engineState != null && engineState.isStatusError() ? Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED) : null); - - container.layout(); - } + + private final SimulatorStateListener stateListener = simulatorState -> { + final SimulationEngine engine = simulatorState.getSimulationEngine(); + if(engine == null) { + this.container.setVisible(false); + } else { + this.container.setVisible(true); + this.componentImplementationLabel.setText(engine.getSystemInstance().getComponentImplementation().getQualifiedName()); + this.typeLabel.setText(engine.getSimulationType()); + this.statusLabel.setText(engine.getCurrentState().getStatusDescription()); + } + + final SimulationEngineState engineState = simulatorState.getEngineState(); + this.statusLabel.setForeground(engineState != null && engineState.isStatusError() ? Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED) : null); + + this.container.layout(); }; - - private Composite container; + + private Composite container; private Label componentImplementationLabel; private Label typeLabel; private Label statusLabel; @@ -73,9 +69,9 @@ public StatusView(final SimulationUIService simulationUiService) { void createView(final Composite parent) { container = new Composite(parent, SWT.NONE); container.setVisible(false); - final GridLayout gridLayout = new GridLayout(2, false); + final GridLayout gridLayout = new GridLayout(2, false); container.setLayout(gridLayout); - + addLabel(container, "Component"); componentImplementationLabel = addWrappingLabel(container, ""); @@ -84,9 +80,9 @@ void createView(final Composite parent) { addLabel(container, "Status"); statusLabel = addWrappingLabel(container, ""); - + container.layout(); - + // Add listener and populate UI with current state simulationUiService.addStateChangeListener(stateListener); stateListener.onSimulatorStateChanged(simulationUiService.getCurrentState()); @@ -96,17 +92,17 @@ void createView(final Composite parent) { public void preDestroy() { simulationUiService.removeStateChangeListener(stateListener); } - + private Label addLabel(final Composite parent, final String txt) { final Label label = new Label(parent, SWT.NONE); GridDataFactory.swtDefaults().align(SWT.LEFT, SWT.TOP).applyTo(label); label.setText(txt); return label; } - + private Label addWrappingLabel(final Composite parent, final String txt) { final Label label = new Label(parent, SWT.WRAP); - GridDataFactory.swtDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(label); + GridDataFactory.swtDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(label); label.setText(txt); return label; } diff --git a/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/VariablesView.java b/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/VariablesView.java index f1f3befae..df53a0876 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/VariablesView.java +++ b/edu.uah.rsesc.aadlsimulator.ui/src/edu/uah/rsesc/aadlsimulator/ui/views/VariablesView.java @@ -2,20 +2,20 @@ Copyright (c) 2015, Rockwell Collins. Developed with the sponsorship of Defense Advanced Research Projects Agency (DARPA). -Permission is hereby granted, free of charge, to any person obtaining a copy of this data, -including any software or models in source or binary form, as well as any drawings, specifications, +Permission is hereby granted, free of charge, to any person obtaining a copy of this data, +including any software or models in source or binary form, as well as any drawings, specifications, and documentation (collectively "the Data"), to deal in the Data without restriction, including -without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Data. -THE DATA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS, SPONSORS, DEVELOPERS, CONTRIBUTORS, OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +THE DATA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS, SPONSORS, DEVELOPERS, CONTRIBUTORS, OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. */ package edu.uah.rsesc.aadlsimulator.ui.views; @@ -29,10 +29,6 @@ and documentation (collectively "the Data"), to deal in the Data without restric import java.util.Objects; import java.util.TreeSet; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; - import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.e4.core.di.annotations.Optional; @@ -122,10 +118,13 @@ and documentation (collectively "the Data"), to deal in the Data without restric import edu.uah.rsesc.aadlsimulator.xtext.util.InputConstraintHelper; import edu.uah.rsesc.aadlsimulator.xtext.util.ReferenceTypeResolver; import edu.uah.rsesc.aadlsimulator.xtext.util.ResultType; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; public class VariablesView { private final static int VARIABLE_NAME_COLUMN_INDEX = 0; - + // Helper classes class VariableContentProvider implements ITreeContentProvider { private SimulatorState currentState; @@ -154,7 +153,7 @@ public Object[] getElements(final Object inputElement) { public Object[] getChildren(final Object parentElement) { if(currentState == null) { return new Object[0]; - } + } return currentState.getEngineState().getChildElements(parentElement).toArray(); } @@ -181,11 +180,11 @@ public SimulatorState getCurrentState() { return currentState; } } - + static class ConstraintError { public final String constraint; public final String errorMessage; - + public ConstraintError(final String constraint, final String errorMessage) { this.constraint = Objects.requireNonNull(constraint, "constraint must not be null"); this.errorMessage = Objects.requireNonNull(errorMessage, "errorMessage must not be null"); @@ -196,8 +195,8 @@ class NextValueEditingSupport extends EditingSupport { private final SimulationUIService simulationUIService; private final VariableValueCellEditor cellEditor; private Object currentElement; - - final ReferenceTypeResolver refResolver = new ReferenceTypeResolver() { + + final ReferenceTypeResolver refResolver = new ReferenceTypeResolver() { @Override public ResultType getElementReferenceType(final ElementRefExpression reference) { final SimulationEngineState engineState = getVariableContentProvider().getCurrentState().getEngineState(); @@ -210,7 +209,7 @@ public ResultType getElementReferenceType(final ElementRefExpression reference) final VariableType referencedVariableType = engineState.getElementType(referencedElement); return variableTypeToResultType(referencedVariableType); } - + @Override public ResultType getConstReferenceType(final ConstRefExpression reference) { final SimulationEngineState engineState = getVariableContentProvider().getCurrentState().getEngineState(); @@ -224,7 +223,7 @@ public ResultType getConstReferenceType(final ConstRefExpression reference) { return variableTypeToResultType(referencedVariableType); } }; - + public NextValueEditingSupport(final SimulationUIService simulationUIService, final TreeViewer treeViewer) { super(treeViewer); this.simulationUIService = Objects.requireNonNull(simulationUIService, "simulationUIService must not be null"); @@ -232,12 +231,12 @@ public NextValueEditingSupport(final SimulationUIService simulationUIService, fi @Override protected Object openDialogBox(final Control cellEditorWindow) { final SimulationEngineState engineState = getVariableContentProvider().getCurrentState().getEngineState(); - final Model model = new DefaultInputConstraintDialogModel(inputConstraintHelper, refResolver, engineState); + final Model model = new DefaultInputConstraintDialogModel(inputConstraintHelper, refResolver, engineState); final InputConstraintHelper.Result parseResult = inputConstraintHelper.parse(getRawValue()); if(!parseResult.isValid()) { throw new RuntimeException("Unable to parse current constraint."); } - + final VariableType variableType = Objects.requireNonNull(engineState.getElementType(currentElement), "unable to retrieve element type"); final String variableName = Objects.requireNonNull(engineState.getElementName(currentElement), "unable to retrieve element name"); final Result result = InputConstraintDialog.show(this.getControl().getShell(), model, variableName, parseResult.getInputConstraint(), variableTypeToResultType(variableType), engineState.getNumberOfFrames()); @@ -261,13 +260,13 @@ protected Object openDialogBox(final Control cellEditorWindow) { return result.getErrorMessage(); } }); - + cellEditor.addListener(new ICellEditorListener() { @Override public void applyEditorValue() { // Update the viewer if the value failed validation. If validation succeeded, update() is called as part of setValue() if(cellEditor.getErrorMessage() != null) { - getViewer().update(currentElement, null); + getViewer().update(currentElement, null); } } @@ -290,19 +289,19 @@ public void editorValueChanged(final boolean oldValidState, final boolean newVal final String errorMessage = cellEditor.getErrorMessage(); elementToConstraintErrorMap.put(currentElement, new ConstraintError(cellEditor.getRawValue(), errorMessage)); } - + updateCellEditorErrorState(); } - } + } }); } - + public void dispose() { if(cellEditor != null) { cellEditor.dispose(); } } - + public void updateCellEditorErrorState() { cellEditor.setErrorState(elementToConstraintErrorMap.get(currentElement)); } @@ -334,13 +333,13 @@ protected Object getValue(final Object element) { final ConstraintError constraintError = elementToConstraintErrorMap.get(element); if(constraintError != null) { return constraintError.constraint; - } - + } + final SimulationEngineState engineState = simulationUiService.getCurrentState().getEngineState(); if(engineState== null) { return ""; } - + final InputConstraint ic = engineState.getElementInputConstraintForNextFrame(element); if(ic == null) { return ""; @@ -351,9 +350,9 @@ protected Object getValue(final Object element) { } @Override - protected void setValue(final Object element, final Object value) { + protected void setValue(final Object element, final Object value) { try { - // Parse the constraint. + // Parse the constraint. final InputConstraintHelper.Result parseResult = inputConstraintHelper.parse(value instanceof String ? value.toString() : null); if(parseResult.isValid()) { // Set constraint @@ -371,31 +370,31 @@ protected void setValue(final Object element, final Object value) { StatusManager.getManager().handle(status, StatusManager.LOG | StatusManager.SHOW); } } - - + + Shell getShell() { return treeViewer.getTree().getShell(); } } - + static ResultType variableTypeToResultType(final VariableType vt) { switch(vt) { case BOOLEAN: return ResultType.BOOLEAN; - + case REAL: return ResultType.REAL; - + case INTEGER: return ResultType.INTEGER; - + case NONE: return null; } - + throw new RuntimeException("Unhandled type: " + vt); } - + private class ValueCellLabelProvider extends OwnerDrawLabelProvider { private final VariableContentProvider contentProvider; private int frameIndex = 0; @@ -420,7 +419,7 @@ public void update(final ViewerCell cell) { super.update(cell); } - + private Color getForeground(final Object element) { final SimulatorState state = contentProvider.getCurrentState(); final Color foreground; @@ -436,7 +435,7 @@ private Color getForeground(final Object element) { foreground = null; } } - + return foreground; } @@ -448,8 +447,8 @@ private String getText(final Object element) { } return ValueFormatter.formatValue(state.getEngineState().getElementValue(frameIndex, element)); - } - + } + @Override public String getToolTipText(final Object element) { // Get the name of the frame state element @@ -463,7 +462,7 @@ public String getToolTipText(final Object element) { } } } - + return super.getToolTipText(element); } @@ -471,7 +470,7 @@ public String getToolTipText(final Object element) { @Override protected void measure(Event event, Object element) { } - + @Override protected void erase(Event event, Object element) { // If the cell is highlighted, draw the color in the background @@ -484,28 +483,28 @@ protected void erase(Event event, Object element) { final Rectangle bounds = event.getBounds(); gc.fillRectangle(bounds); gc.setBackground(oldBackground); - + // Ensure that selection and hover indicators are not drawn for the highlighted cell event.detail &= ~SWT.SELECTED; event.detail &= ~SWT.HOT; break; } } - + // Disable drawing foreground. paint() will draw the foreground text in order to fix coloring issues when the row is selected. event.detail &= ~SWT.FOREGROUND; } - + @Override protected void paint(final Event event, final Object element) { // Draw just the text with the appropriate background color final TreeItem item = (TreeItem) event.item; final Rectangle textBounds = item.getTextBounds(event.index); final GC gc = event.gc; - final String txt = item.getText(event.index); + final String txt = item.getText(event.index); gc.setForeground(item.getForeground(event.index)); String drawTxt = txt; - + // Check the width of the text and truncate it as necessary final int maxWidth = Math.max(gc.getClipping().width-6, textBounds.width); if(maxWidth > 0) { @@ -514,7 +513,7 @@ protected void paint(final Event event, final Object element) { truncatedTxt = truncatedTxt.substring(0, truncatedTxt.length()-1); drawTxt = truncatedTxt + "..."; } - + gc.drawString(drawTxt, textBounds.x, textBounds.y, true); } } @@ -533,7 +532,7 @@ public VariablesTreeViewer(final Composite parent, final int style) { public TreeItem findTreeItemByElement(final Object element) { final Widget w = super.findItem(element); return w instanceof TreeItem ? (TreeItem)w : null; - } + } } // Stores information about a column. Needed because TreeViewer/TreeViewerColumn doesn't provide a mechanism for accessing the TreeViewerColumn and label provider @@ -571,7 +570,7 @@ private static final class TreeSelectionTracker { public TreeSelectionTracker(final TreeViewer treeViewer) { treeViewer.getTree().addMenuDetectListener(e -> { - final Point point = Display.getDefault().map(null, treeViewer.getTree(), new Point(e.x, e.y)); + final Point point = Display.getDefault().map(null, treeViewer.getTree(), new Point(e.x, e.y)); final ViewerCell cell = treeViewer.getCell(point); if(cell != null && cell.getItem() != null) { treeItemData = cell.getItem().getData(); @@ -583,7 +582,7 @@ public TreeSelectionTracker(final TreeViewer treeViewer) { } public boolean isSelectionValid() { - return treeItemData != null; + return treeItemData != null; } public Object getSelectedTreeItemData() { @@ -606,7 +605,7 @@ public CellColorInfo(final Object treeItemData, final int frameIndex, final RGB this.frameIndex = frameIndex; this.cellBackgroundColor = colorManager.createColor(Objects.requireNonNull(cellBackgroundRgb, "cellBackgroundRgb must not be null")); } - + public void dispose() { colorManager.destroy(ColorDescriptor.createFrom(cellBackgroundColor)); } @@ -629,15 +628,15 @@ public Object getTreeItemData () { private void update(SimulatorState simulatorState) { // Store the simulation engine state and store the element to constraint error map when the number of frames changes. // Don't clear in all cases because there are other changes which shouldn't affect the simulation variables view - if(currentEngineState == null || + if(currentEngineState == null || simulatorState.getEngineState() == null || simulatorState.getEngineState().getNumberOfFrames() != currentEngineState.getNumberOfFrames()) { elementToConstraintErrorMap.clear(); currentEngineState = simulatorState.getEngineState(); } - + if(treeViewer != null && !editingTreeViewer) { - startEditingTreeViewer(); + startEditingTreeViewer(); final TreeItem topItem = treeViewer.getTree().getTopItem(); final Object topElement = topItem == null ? null : topItem.getData(); @@ -695,18 +694,18 @@ private void update(SimulatorState simulatorState) { private MenuManager contextMenuMgr = new MenuManager(); Map elementToConstraintErrorMap = new HashMap<>(); // Stores the current errors related to user inputs private SimulationEngineState currentEngineState; - + final ControlListener resizeListener = new ControlAdapter() { @Override public void controlResized(final ControlEvent e) { if(!editingTreeViewer) { startEditingTreeViewer(); - update(); + update(); stopEditingTreeViewer(); } } }; - + final SelectionListener valueColumnSelectedListener = new SelectionAdapter() { @Override public void widgetSelected(final SelectionEvent e) { @@ -716,7 +715,7 @@ public void widgetSelected(final SelectionEvent e) { } } }; - + // Disabled when introducing the VariableViewPart to prevent workspaces from using this class directly due to stored workspace settings. @Inject public VariablesView(final SimulationUIService simulationUiService, final SimulatorUIExtensionService extService) { this.simulationUiService = Objects.requireNonNull(simulationUiService, "simulationUiService must not be null"); @@ -724,7 +723,7 @@ public VariablesView(final SimulationUIService simulationUiService, final Simula } @PostConstruct - void createView(final Composite parent) { + void createView(final Composite parent) { final Display display = parent.getDisplay(); colorManager = new DeviceResourceManager(display); unchangedValueColor = colorManager.createColor(new RGB(192, 192, 192)); @@ -733,7 +732,7 @@ void createView(final Composite parent) { redImage = createColorIconImage(display, red); yellowImage = createColorIconImage(display, yellow); customColorImage = createColorIconImage(display, customRgb); - + // Create root composite final Composite root = new Composite(parent, SWT.NONE); final GridLayout rootLayout = new GridLayout(1, false); @@ -765,29 +764,29 @@ public int compare(final Viewer viewer, final Object e1, final Object e2) { } else if(io2 instanceof ComponentInstance && !(io1 instanceof ComponentInstance)) { return 1; } - + // Sort feature instances before the remainder if(io1 instanceof FeatureInstance && !(io2 instanceof FeatureInstance)) { return -1; } else if(io2 instanceof FeatureInstance && !(io1 instanceof FeatureInstance)) { return 1; } - + final String n1 = contentProvider.currentState.getEngineState().getElementName(e1); final String n2 = contentProvider.currentState.getEngineState().getElementName(e2); return getComparator().compare(n1, n2); } }); - + treeViewer.setFilters(new ViewerFilter[] { new ViewerFilter() { @Override public boolean select(final Viewer viewer, final Object parentElement, final Object element) { return !contentProvider.currentState.getEngineState().isElementHidden(element); - } + } } }); - + // Create columns final TreeViewerColumn nameColumn = new TreeViewerColumn(treeViewer, SWT.NONE); nameColumn.getColumn().setWidth(200); @@ -799,7 +798,7 @@ public void update(final ViewerCell cell) { cell.setText(getText(cell.getElement())); cell.setImage(getImage(cell.getElement())); } - + private String getText(final Object element) { // Get the name of the frame state element final SimulatorState state = contentProvider.getCurrentState(); @@ -809,14 +808,14 @@ private String getText(final Object element) { return state.getEngineState().getElementName(element); } - + private Image getImage(final Object element) { final SimulatorState state = contentProvider.getCurrentState(); if(state == null) { return null; } - final InstanceObject instanceObject = state.getEngineState().getElementInstanceObject(element); + final InstanceObject instanceObject = state.getEngineState().getElementInstanceObject(element); return instanceObject == null ? null : UiUtil.getModelElementLabelProvider().getImage(instanceObject); } }); @@ -829,45 +828,45 @@ private Image getImage(final Object element) { public void initialize(final ColumnViewer viewer, final ViewerColumn column) { super.initialize(viewer, column, true); } - + @Override public void update(final ViewerCell cell) { final String constraintTxt = getConstraintText(cell.getElement()); final String txt; final Color foreground; if(constraintTxt == null) { - // Attempt to retrieve the value for the next frame from from the engine state. + // Attempt to retrieve the value for the next frame from from the engine state. final SimulatorState state = contentProvider.getCurrentState(); if(state == null) { txt = ""; } else { final SimulationEngineState engineState = state.getEngineState(); - txt = ValueFormatter.formatValue(engineState.getElementValue(engineState.getNumberOfFrames(), cell.getElement())); + txt = ValueFormatter.formatValue(engineState.getElementValue(engineState.getNumberOfFrames(), cell.getElement())); } foreground = unchangedValueColor; } else { txt = constraintTxt; foreground = null; } - + cell.setText(txt); cell.setForeground(foreground); - + super.update(cell); } - + private String getConstraintText(final Object element) { // Return the invalid value if the input that was entered is not correct final ConstraintError constraintError = elementToConstraintErrorMap.get(element); if(constraintError != null) { return constraintError.constraint; } - + final SimulationEngineState engineState = simulationUiService.getCurrentState().getEngineState(); if(engineState == null) { return null; } - + final InputConstraint ic = engineState.getElementInputConstraintForNextFrame(element); if(ic == null) { return null; @@ -875,7 +874,7 @@ private String getConstraintText(final Object element) { return inputConstraintHelper.unparse(ic); } - + @Override public String getToolTipText(final Object element) { final ConstraintError constraintError = elementToConstraintErrorMap.get(element); @@ -887,9 +886,9 @@ public String getToolTipText(final Object element) { } @Override - protected void measure(final Event event, final Object element) { + protected void measure(final Event event, final Object element) { } - + @Override protected void erase(final Event event, final Object element) { // Color cells which contain invalid values @@ -900,12 +899,12 @@ protected void erase(final Event event, final Object element) { final Rectangle bounds = event.getBounds(); gc.fillRectangle(bounds); gc.setBackground(oldBackground); - + // Ensure that selection and hover indicators are not drawn for the highlighted cell event.detail &= ~SWT.SELECTED; event.detail &= ~SWT.HOT; } - + // Disable drawing foreground. paint() will draw the foreground text in order to fix coloring issues when the row is selected. event.detail &= ~SWT.FOREGROUND; } @@ -916,10 +915,10 @@ protected void paint(final Event event, final Object element) { final TreeItem item = (TreeItem) event.item; final Rectangle textBounds = item.getTextBounds(event.index); final GC gc = event.gc; - final String txt = item.getText(event.index); + final String txt = item.getText(event.index); gc.setForeground(item.getForeground(event.index)); String drawTxt = txt; - + // Check the width of the text and truncate it as necessary final int maxWidth = Math.max(gc.getClipping().width-6, textBounds.width); if(maxWidth > 0) { @@ -928,7 +927,7 @@ protected void paint(final Event event, final Object element) { truncatedTxt = truncatedTxt.substring(0, truncatedTxt.length()-1); drawTxt = truncatedTxt + "..."; } - + gc.drawString(drawTxt, textBounds.x, textBounds.y, true); } } @@ -958,7 +957,7 @@ public void widgetSelected(final SelectionEvent e) { update(); stopEditingTreeViewer(); } - } + } }); GridDataFactory.fillDefaults().grab(true, false).applyTo(frameSlider); @@ -1067,11 +1066,11 @@ private ValueColumn createFrameValueColumn(final TreeViewer treeViewer, final Va @PreDestroy public void preDestroy() { simulationUiService.removeStateChangeListener(stateListener); - + if(nextValueEditingSupport != null) { nextValueEditingSupport.dispose(); } - + // Dispose of OS resources colorManager.dispose(); greenImage.dispose(); @@ -1080,24 +1079,24 @@ public void preDestroy() { customColorImage.dispose(); contextMenuMgr.dispose(); } - + public void scrollToAndSelectStateElement(final Object stateElement) { // Expand the tree so that the item is visible treeViewer.expandToLevel(stateElement, 1); - + // Find the tree item final TreeItem treeItem = treeViewer.findTreeItemByElement(stateElement); - + if(treeItem != null) { // Scroll if the item is not visible final Rectangle treeItemBounds = treeItem.getBounds(); final Rectangle treeBounds = treeViewer.getTree().getBounds(); - final int treeItemAreaHeight = treeBounds.height - treeViewer.getTree().getHeaderHeight(); // Take into account the size of the header because tree item bounds start at Y=0 but are not drawn at Y=0 + final int treeItemAreaHeight = treeBounds.height - treeViewer.getTree().getHeaderHeight(); // Take into account the size of the header because tree item bounds start at Y=0 but are not drawn at Y=0 final boolean treeItemVisible = treeItemBounds.y >= 0 && treeItemAreaHeight >= treeItemBounds.y && treeItemAreaHeight >= (treeItemBounds.y+treeItemBounds.height); if(!treeItemVisible) { treeViewer.getTree().setTopItem(treeItem); } - + // Select the item treeViewer.getTree().select(treeItem); } @@ -1116,7 +1115,7 @@ void beforeCreateStepArguments(final @UIEventTopic(SimulatorUIEvents.BEFORE_STEP } } } - + // Cancel the step if(elementToConstraintErrorMap.size() > 0) { event.cancelStep(new Throwable("One or more user constraints is invalid.")); @@ -1142,7 +1141,7 @@ private void fillContextMenu(final MenuManager contextMenu, final Tree tree) { final int valueColumnsSize = valueColumns.size(); final int valueColumnIndex = selectedColumnIndex - (treeViewer.getTree().getColumnCount() - valueColumnsSize); final SimulationEngine engine = simulationUiService.getCurrentState().getSimulationEngine(); - + // Create the Show in Graphical View Menu Item if(selectedColumnIndex == VARIABLE_NAME_COLUMN_INDEX) { final Object element = treeSelectionTracker.getSelectedTreeItemData(); @@ -1155,10 +1154,10 @@ public void run() { } }); } - + // Populate context menu using command extensions final CommandContext cmdCtx = new SimpleCommandContext(element, engine.getCurrentState(), engine); - + for(final Command cmd : extService.getCommands()) { if(cmd.isAvailable(cmdCtx)) { contextMenu.add(new Action(cmd.getLabel(cmdCtx)) { @@ -1166,7 +1165,7 @@ public void run() { public boolean isEnabled() { return cmd.isActivatable(cmdCtx); } - + @Override public void run() { cmd.activate(cmdCtx); @@ -1175,7 +1174,7 @@ public void run() { } } } - + // Highlight Menu final MenuManager subMenu = new MenuManager("Highlight"); if (valueColumnIndex >= 0) { @@ -1234,7 +1233,7 @@ public void run() { } }); contextMenu.add(subMenu); - + final CellColorInfo cellColorInfo = getCellColorInfo(treeItemData, frameIndex); if (cellColorInfo != null) { final CellColorInfo removeCellColorInfo = cellColorInfo; @@ -1249,7 +1248,7 @@ public void run() { }); } } - + // Reset all Highlights if (!cellColorInfos.isEmpty()) { //Resets tree, erases highlights @@ -1265,31 +1264,31 @@ public void run() { cellColorInfos.clear(); treeViewer.getTree().redraw(); } - } + } } }); } } } - + public void setFocus() { if(treeViewer != null) { treeViewer.getTree().setFocus(); } } - + private void showInGraphicalView(final InstanceObject io) { - assert(io != null); - + assert(io != null); + // Open the graphical editor final GraphicalEditorService editorService = Objects.requireNonNull(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(GraphicalEditorService.class), "unable to retrieve Graphical Editor Service"); final SimulationEngine engine = simulationUiService.getCurrentState().getSimulationEngine(); - if(engine != null && engine.getSystemInstance() != null) { + if(engine != null && engine.getSystemInstance() != null) { final GraphicalEditor editor = editorService.openBusinessObject(engine.getSystemInstance()); editor.selectDiagramElementsForBusinessObject(io); - }; + }; } - + private Image createColorIconImage(final Device device, final RGB rgb) { final Image image = new Image(device, 16, 16); @@ -1299,7 +1298,7 @@ private Image createColorIconImage(final Device device, final RGB rgb) { return image; } - + private void fillColorIconImage(final Image image, final RGB rgb) { final GC gc = new GC(image); final Color color = new Color(image.getDevice(), rgb); @@ -1308,20 +1307,20 @@ private void fillColorIconImage(final Image image, final RGB rgb) { color.dispose(); gc.dispose(); } - + private void highlightCell(final Object treeItemData, final int frameIndex, final RGB rgb) { final CellColorInfo existingCellColorInfo = getCellColorInfo(treeItemData, frameIndex); //If selected cell is already in cellColorInfos, update color if (existingCellColorInfo != null) { existingCellColorInfo.dispose(); cellColorInfos.remove(existingCellColorInfo); - } - + } + // Create a new cell color info cellColorInfos.add(new CellColorInfo(treeItemData, frameIndex, rgb)); treeViewer.getTree().redraw(); } - + private CellColorInfo getCellColorInfo(final Object treeItemData, final int frameIndex) { for (final CellColorInfo cellColorInfo : cellColorInfos) { if (cellColorInfo.getFrameIndex() == frameIndex && cellColorInfo.getTreeItemData().equals(treeItemData)) { @@ -1330,17 +1329,17 @@ private CellColorInfo getCellColorInfo(final Object treeItemData, final int fram } return null; } - + private ValueColumn getValueColumn(final TreeColumn treeColumn) { for(final ValueColumn valueColumn : valueColumns) { if(valueColumn.column == treeColumn) { return valueColumn; } } - + return null; } - + private String buildColumnHeader(final int columnFrameIndex) { String columnTxt = "Step " + (columnFrameIndex + 1); if(simulationUiService.getCurrentState().getSelectedFrameIndex() == columnFrameIndex) { diff --git a/edu.uah.rsesc.aadlsimulator.xtext/src/edu/uah/rsesc/aadlsimulator/xtext/util/InputConstraintHelper.java b/edu.uah.rsesc.aadlsimulator.xtext/src/edu/uah/rsesc/aadlsimulator/xtext/util/InputConstraintHelper.java index dc07e0454..f4ed689eb 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/src/edu/uah/rsesc/aadlsimulator/xtext/util/InputConstraintHelper.java +++ b/edu.uah.rsesc.aadlsimulator.xtext/src/edu/uah/rsesc/aadlsimulator/xtext/util/InputConstraintHelper.java @@ -26,8 +26,6 @@ import java.util.Map; import java.util.Objects; -import javax.inject.Inject; - import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.URI; @@ -47,6 +45,7 @@ import edu.uah.rsesc.aadlsimulator.xtext.inputConstraint.InputConstraint; import edu.uah.rsesc.aadlsimulator.xtext.inputConstraint.InputConstraintPackage; import edu.uah.rsesc.aadlsimulator.xtext.validation.InputConstraintValidator; +import jakarta.inject.Inject; public class InputConstraintHelper { private final IParser parser; From 17c79dcac38bffb560bf6fce1490ad5a8e0b2eb6 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Mon, 23 Sep 2024 05:45:16 -0500 Subject: [PATCH 07/11] Update parent pom for next development --- .../pom.xml | 2 +- com.rockwellcollins.atc.agree.cli/pom.xml | 2 +- com.rockwellcollins.atc.agree.codegen/pom.xml | 2 +- com.rockwellcollins.atc.agree.doc/pom.xml | 2 +- .../pom.xml | 2 +- .../examples/bscu/pom.xml | 2 +- .../examples/car/pom.xml | 2 +- .../examples/codependence/pom.xml | 2 +- .../examples/microwave/pom.xml | 2 +- .../examples/pom.xml | 4 +- .../examples/toy_example/pom.xml | 2 +- .../pom.xml | 2 +- com.rockwellcollins.atc.agree.feature/pom.xml | 2 +- com.rockwellcollins.atc.agree.site/pom.xml | 43 ++++++++++--------- com.rockwellcollins.atc.agree.target/pom.xml | 2 +- com.rockwellcollins.atc.agree.tests/pom.xml | 2 +- com.rockwellcollins.atc.agree.ui/pom.xml | 2 +- com.rockwellcollins.atc.agree/pom.xml | 2 +- com.rockwellcollins.atc.tcg.feature/pom.xml | 2 +- com.rockwellcollins.atc.tcg/pom.xml | 2 +- .../pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.agree/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.doc/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.feature/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.ui/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator.xtext/pom.xml | 2 +- edu.uah.rsesc.aadlsimulator/pom.xml | 2 +- edu.uah.rsesc.agree.ge.ui/pom.xml | 2 +- edu.uah.rsesc.agree.ge/pom.xml | 2 +- pom.xml | 2 +- 32 files changed, 54 insertions(+), 53 deletions(-) diff --git a/com.rockwellcollins.atc.agree.analysis/pom.xml b/com.rockwellcollins.atc.agree.analysis/pom.xml index 99319a923..124d5d4e0 100644 --- a/com.rockwellcollins.atc.agree.analysis/pom.xml +++ b/com.rockwellcollins.atc.agree.analysis/pom.xml @@ -24,7 +24,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.analysis 2.10.3-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree.cli/pom.xml b/com.rockwellcollins.atc.agree.cli/pom.xml index 34b99a56a..57522adbf 100644 --- a/com.rockwellcollins.atc.agree.cli/pom.xml +++ b/com.rockwellcollins.atc.agree.cli/pom.xml @@ -4,7 +4,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.cli 1.0.2-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree.codegen/pom.xml b/com.rockwellcollins.atc.agree.codegen/pom.xml index 2f3cd87ab..b31a7f422 100644 --- a/com.rockwellcollins.atc.agree.codegen/pom.xml +++ b/com.rockwellcollins.atc.agree.codegen/pom.xml @@ -24,7 +24,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.codegen 2.9.2-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree.doc/pom.xml b/com.rockwellcollins.atc.agree.doc/pom.xml index 84a728fcf..9414ac35d 100644 --- a/com.rockwellcollins.atc.agree.doc/pom.xml +++ b/com.rockwellcollins.atc.agree.doc/pom.xml @@ -24,7 +24,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.doc 2.10.1-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree.examples.feature/pom.xml b/com.rockwellcollins.atc.agree.examples.feature/pom.xml index 14b450d41..1f22dc4c6 100644 --- a/com.rockwellcollins.atc.agree.examples.feature/pom.xml +++ b/com.rockwellcollins.atc.agree.examples.feature/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree.examples/examples/bscu/pom.xml b/com.rockwellcollins.atc.agree.examples/examples/bscu/pom.xml index 2aec4c707..e3d2b6a85 100644 --- a/com.rockwellcollins.atc.agree.examples/examples/bscu/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/examples/bscu/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree examples - 1.0.2 + 1.0.3-SNAPSHOT com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree.examples/examples/car/pom.xml b/com.rockwellcollins.atc.agree.examples/examples/car/pom.xml index 5acbc1e7c..233f95c1e 100644 --- a/com.rockwellcollins.atc.agree.examples/examples/car/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/examples/car/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree examples - 1.0.2 + 1.0.3-SNAPSHOT com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree.examples/examples/codependence/pom.xml b/com.rockwellcollins.atc.agree.examples/examples/codependence/pom.xml index 52c6bf8d8..909cda199 100644 --- a/com.rockwellcollins.atc.agree.examples/examples/codependence/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/examples/codependence/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree examples - 1.0.2 + 1.0.3-SNAPSHOT com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree.examples/examples/microwave/pom.xml b/com.rockwellcollins.atc.agree.examples/examples/microwave/pom.xml index dc0d25e0d..1f4f01c65 100644 --- a/com.rockwellcollins.atc.agree.examples/examples/microwave/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/examples/microwave/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree examples - 1.0.2 + 1.0.3-SNAPSHOT com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree.examples/examples/pom.xml b/com.rockwellcollins.atc.agree.examples/examples/pom.xml index 5090e0d4e..cf9120ff9 100644 --- a/com.rockwellcollins.atc.agree.examples/examples/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/examples/pom.xml @@ -25,13 +25,13 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT ../.. com.rockwellcollins.atc.agree examples - 1.0.2 + 1.0.3-SNAPSHOT pom diff --git a/com.rockwellcollins.atc.agree.examples/examples/toy_example/pom.xml b/com.rockwellcollins.atc.agree.examples/examples/toy_example/pom.xml index 708a7ac7b..92d9d84d2 100644 --- a/com.rockwellcollins.atc.agree.examples/examples/toy_example/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/examples/toy_example/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree examples - 1.0.2 + 1.0.3-SNAPSHOT com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree.examples/pom.xml b/com.rockwellcollins.atc.agree.examples/pom.xml index 70780f4e8..599e79e84 100644 --- a/com.rockwellcollins.atc.agree.examples/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree.feature/pom.xml b/com.rockwellcollins.atc.agree.feature/pom.xml index 1838df65b..4536a4d7b 100644 --- a/com.rockwellcollins.atc.agree.feature/pom.xml +++ b/com.rockwellcollins.atc.agree.feature/pom.xml @@ -24,7 +24,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.feature eclipse-feature diff --git a/com.rockwellcollins.atc.agree.site/pom.xml b/com.rockwellcollins.atc.agree.site/pom.xml index 5bfd0ea5b..58bce29c8 100644 --- a/com.rockwellcollins.atc.agree.site/pom.xml +++ b/com.rockwellcollins.atc.agree.site/pom.xml @@ -1,21 +1,22 @@ - - 4.0.0 - - com.rockwellcollins.atc.agree - com.rockwellcollins.atc.agree.parent - 2.11.0 - - - com.rockwellcollins.atc.agree.site - 2.9.2 -eclipse-repository - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho.version} - + + 4.0.0 + + com.rockwellcollins.atc.agree + com.rockwellcollins.atc.agree.parent + 2.11.1-SNAPSHOT + + + com.rockwellcollins.atc.agree.site + eclipse-repository + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho.version} + assemble-repository package @@ -24,7 +25,7 @@ - - - + + + \ No newline at end of file diff --git a/com.rockwellcollins.atc.agree.target/pom.xml b/com.rockwellcollins.atc.agree.target/pom.xml index 0a25b9db3..3c13f8739 100644 --- a/com.rockwellcollins.atc.agree.target/pom.xml +++ b/com.rockwellcollins.atc.agree.target/pom.xml @@ -23,7 +23,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.target eclipse-target-definition diff --git a/com.rockwellcollins.atc.agree.tests/pom.xml b/com.rockwellcollins.atc.agree.tests/pom.xml index 63355cce0..d433fc797 100644 --- a/com.rockwellcollins.atc.agree.tests/pom.xml +++ b/com.rockwellcollins.atc.agree.tests/pom.xml @@ -23,7 +23,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.tests 2.7.5-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree.ui/pom.xml b/com.rockwellcollins.atc.agree.ui/pom.xml index 86a54bb9e..0cbd95040 100644 --- a/com.rockwellcollins.atc.agree.ui/pom.xml +++ b/com.rockwellcollins.atc.agree.ui/pom.xml @@ -24,7 +24,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.ui 4.0.1-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree/pom.xml b/com.rockwellcollins.atc.agree/pom.xml index 5fb77f9a9..291110cee 100644 --- a/com.rockwellcollins.atc.agree/pom.xml +++ b/com.rockwellcollins.atc.agree/pom.xml @@ -24,7 +24,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree 4.0.1-SNAPSHOT diff --git a/com.rockwellcollins.atc.tcg.feature/pom.xml b/com.rockwellcollins.atc.tcg.feature/pom.xml index 485d83a1d..6e5effaee 100644 --- a/com.rockwellcollins.atc.tcg.feature/pom.xml +++ b/com.rockwellcollins.atc.tcg.feature/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.tcg.feature diff --git a/com.rockwellcollins.atc.tcg/pom.xml b/com.rockwellcollins.atc.tcg/pom.xml index e4d4be0c7..2f315b225 100644 --- a/com.rockwellcollins.atc.tcg/pom.xml +++ b/com.rockwellcollins.atc.tcg/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.tcg diff --git a/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml b/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml index fcdaef995..55c6b77c4 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml index 3c865a3f1..1bb0c685a 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator.agree/pom.xml b/edu.uah.rsesc.aadlsimulator.agree/pom.xml index fb0936c69..9b6f8833f 100644 --- a/edu.uah.rsesc.aadlsimulator.agree/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator.doc/pom.xml b/edu.uah.rsesc.aadlsimulator.doc/pom.xml index cf432df65..cd3955f33 100644 --- a/edu.uah.rsesc.aadlsimulator.doc/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.doc/pom.xml @@ -22,7 +22,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator.feature/pom.xml b/edu.uah.rsesc.aadlsimulator.feature/pom.xml index db0db153d..ea9e99ed3 100644 --- a/edu.uah.rsesc.aadlsimulator.feature/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.feature/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.ui/pom.xml index 978141c06..ded1823bb 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.ui/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml index 1ccddf620..79de9f1de 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml @@ -5,7 +5,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator.xtext/pom.xml b/edu.uah.rsesc.aadlsimulator.xtext/pom.xml index 30ae6ce09..72ffb7042 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.xtext/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator/pom.xml b/edu.uah.rsesc.aadlsimulator/pom.xml index 22158a3ec..6ceecf6ca 100644 --- a/edu.uah.rsesc.aadlsimulator/pom.xml +++ b/edu.uah.rsesc.aadlsimulator/pom.xml @@ -25,7 +25,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.agree.ge.ui/pom.xml b/edu.uah.rsesc.agree.ge.ui/pom.xml index 8b2fde61a..3f09ec700 100644 --- a/edu.uah.rsesc.agree.ge.ui/pom.xml +++ b/edu.uah.rsesc.agree.ge.ui/pom.xml @@ -4,7 +4,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.agree.ge.ui 2.9.2-SNAPSHOT diff --git a/edu.uah.rsesc.agree.ge/pom.xml b/edu.uah.rsesc.agree.ge/pom.xml index 31444aa2b..7d2d1cc2c 100644 --- a/edu.uah.rsesc.agree.ge/pom.xml +++ b/edu.uah.rsesc.agree.ge/pom.xml @@ -4,7 +4,7 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.0 + 2.11.1-SNAPSHOT edu.uah.rsesc.agree.ge 2.9.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index f8b5eba28..720729d54 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.rockwellcollins.atc.agree - 2.11.0 + 2.11.1-SNAPSHOT com.rockwellcollins.atc.agree.parent pom From 075a11a0b228e0ddf1a2b7c745c52fe5b0ab2e2d Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Mon, 23 Sep 2024 10:19:33 -0500 Subject: [PATCH 08/11] Remove plugin version nature from non-plugin projects --- .../.project | 34 ------------------- .../.project | 34 ------------------- 2 files changed, 68 deletions(-) diff --git a/com.rockwellcollins.atc.tcg.standalone/.project b/com.rockwellcollins.atc.tcg.standalone/.project index 363b31f92..95a09c169 100644 --- a/com.rockwellcollins.atc.tcg.standalone/.project +++ b/com.rockwellcollins.atc.tcg.standalone/.project @@ -15,43 +15,9 @@ - - org.eclipse.oomph.version.VersionBuilder - - - check.feature.closure.completeness - true - - - check.feature.closure.content - true - - - check.maven.pom - true - - - ignore.feature.content.redundancy - true - - - ignore.lower.bound.dependency.ranges - false - - - ignore.schema.builder - true - - - release.path - /agree-releng/version-management/release.xml - - - org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature - org.eclipse.oomph.version.VersionNature diff --git a/edu.uah.rsesc.aadlsimulator.agree.eval.test/.project b/edu.uah.rsesc.aadlsimulator.agree.eval.test/.project index 2d8b32701..6a4e503a4 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.eval.test/.project +++ b/edu.uah.rsesc.aadlsimulator.agree.eval.test/.project @@ -15,43 +15,9 @@ - - org.eclipse.oomph.version.VersionBuilder - - - check.feature.closure.completeness - true - - - check.feature.closure.content - true - - - check.maven.pom - true - - - ignore.feature.content.redundancy - true - - - ignore.lower.bound.dependency.ranges - false - - - ignore.schema.builder - true - - - release.path - /agree-releng/version-management/release.xml - - - org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature - org.eclipse.oomph.version.VersionNature From f0c5e8f24927fc53932f6a7dbb618b335879a6df Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Mon, 23 Sep 2024 10:23:55 -0500 Subject: [PATCH 09/11] Add plugin version nature to cli plugin --- com.rockwellcollins.atc.agree.cli/.project | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/com.rockwellcollins.atc.agree.cli/.project b/com.rockwellcollins.atc.agree.cli/.project index 1bede2f08..5fb836308 100644 --- a/com.rockwellcollins.atc.agree.cli/.project +++ b/com.rockwellcollins.atc.agree.cli/.project @@ -20,9 +20,43 @@ + + org.eclipse.oomph.version.VersionBuilder + + + check.feature.closure.completeness + true + + + check.feature.closure.content + true + + + check.maven.pom + true + + + ignore.feature.content.redundancy + true + + + ignore.lower.bound.dependency.ranges + false + + + ignore.schema.builder + true + + + release.path + /agree-releng/version-management/release.xml + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.oomph.version.VersionNature From d76c112777e3473de1a18a6626420cc412d5d4fe Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Mon, 23 Sep 2024 10:29:58 -0500 Subject: [PATCH 10/11] Add version ranges to cli dependencies --- .../META-INF/MANIFEST.MF | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/com.rockwellcollins.atc.agree.cli/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.cli/META-INF/MANIFEST.MF index 85f9d47ae..f95c4f34a 100644 --- a/com.rockwellcollins.atc.agree.cli/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.cli/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ Bundle-SymbolicName: com.rockwellcollins.atc.agree.cli;singleton:=true Bundle-Version: 1.0.2.qualifier Bundle-Activator: com.rockwellcollins.atc.agree.cli.Activator Bundle-Vendor: ROCKWELLCOLLINS -Require-Bundle: org.osate.xtext.aadl2, - com.rockwellcollins.atc.agree, - org.osate.aadl2, - org.osate.pluginsupport, - org.osate.aadl2.instantiation, - com.collins.trustedsystems.jkindapi, - com.rockwellcollins.atc.agree.analysis, - org.osate.annexsupport +Require-Bundle: org.osate.xtext.aadl2;bundle-version="[7.0.0,8.0.0)", + com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", + org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", + org.osate.pluginsupport;bundle-version="[7.2.0,8.0.0)", + org.osate.aadl2.instantiation;bundle-version="[3.0.0,4.0.0)", + com.collins.trustedsystems.jkindapi;bundle-version="[4.5.0,5.0.0)", + com.rockwellcollins.atc.agree.analysis;bundle-version="[2.10.0,3.0.0)", + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: com.rockwellcollins.atc.agree.cli Bundle-ActivationPolicy: lazy From 36e8208f36d7005a06c59722f3be0be500ea21d8 Mon Sep 17 00:00:00 2001 From: Karl Hoech Date: Mon, 23 Sep 2024 10:30:58 -0500 Subject: [PATCH 11/11] Update version management for release --- .../version-management/release.digest | Bin 2123 -> 2189 bytes agree-releng/version-management/release.xml | 80 +++++++++--------- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/agree-releng/version-management/release.digest b/agree-releng/version-management/release.digest index 9cfed2844c4592630d44016c07f09bc40709ea2e..577264d348dc0c7268dc3343ba50d490de35156d 100644 GIT binary patch delta 758 zcmX>t&?`7$8H;QQgXUyLMx}{oO$=x$2{xcL;cX`%k zmlyg`zADi9&4lDNho96QDq)bGT)-kRIgXK6r1I>+XRcFwnC{R?!aI$-})%MO@C|w82wupbd(XvzP=$ zp4+8QI&Se`#kvaK3sod8Z$z!r0v!VDJ&Uc#~(>mD0G-q}kKJh$jwYK`! z5(df10c>KE-!buubDT-jn|DMcW^wow&aYkirs}Fii%S^ffi}yaI+5{f#IrA3HyPGU zNSeYnaq^U2J8AtA2EEC3ta6jLGslUqv(VeTv9&CE@O+owm{t^ZSP*^CJW+H+@Dty^~;WEWK>)_cs4lIkO zR;vI03JD4swThC|iV}oUtL9sx)ApS9sQx#d{mGMKG5fE!C4;O4x_xpOtDs12g5}m) zFE92E*)->SXQC9W{+cFEu4b(id86ZhhW+#weuG|9`_c){e&76$?V9*cezH27kjQWS zP)6=GwU(@EX&x&tU3|URPcvw;FPpNs%`@TC|7+!A7q;eHXid<~Sj67!RKg$!vJJ%p z8~h%;Gd|Dz>}YZR_l=<`N6dn@$CfZ?g9G9r+cfd1@iH?cL);4r8?!&R%$t6fgGCb< zP>@8CoP!h+6RbiUZg$wMJK5nCHlezd_4{nwhoBHIU{RaAgXILh42c*8Z-R~}6pN*JUk7qCc7j$`B%IV4zc{|5KQ39Ek`7Cmxl>O_8?zaJ*o zGa89!s;t_(T&?uRr;U7?GgLFu(o`OvE@4mvYLrt+$xkjVWT<0cWnf?s*%)eq|(m$f#A6q*jz5Jhpw;Ikn#g9E>woJIw1lwKvpm?#X)~D}ipG9L6drzRflM zne?-)^D16PP1D6EKDMm2K3l?I0Cw^m)(8mD9Clseg$OVSuAS*MrBiIa zY}MZB!Y>a`KFe+`vVFms8){#B#rl(bf<@o!iFo-l$4!>uh!r_vuz@pm=?|_Xzv$D; MtA4S{>pZ*)0Imib761SM diff --git a/agree-releng/version-management/release.xml b/agree-releng/version-management/release.xml index ce755e3f4..e6e608662 100644 --- a/agree-releng/version-management/release.xml +++ b/agree-releng/version-management/release.xml @@ -9,54 +9,58 @@ - - + + - - + + - - - - - - - + + + + + + + + - - + + - - - + + + - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +