diff --git a/agree-releng/version-management/release.digest b/agree-releng/version-management/release.digest index 03f3ddb8b..5bc312c42 100644 Binary files a/agree-releng/version-management/release.digest and b/agree-releng/version-management/release.digest differ diff --git a/agree-releng/version-management/release.xml b/agree-releng/version-management/release.xml index ce755e3f4..cfe9ad315 100644 --- a/agree-releng/version-management/release.xml +++ b/agree-releng/version-management/release.xml @@ -9,54 +9,58 @@ - - + + - - + + - - - - - - - + + + + + + + + - - + + - - - + + + - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF index a9b3b6ed5..a386120ca 100644 --- a/com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.analysis/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE Analysis Bundle-SymbolicName: com.rockwellcollins.atc.agree.analysis; singleton:=true -Bundle-Version: 2.10.100.qualifier +Bundle-Version: 2.10.200.qualifier Bundle-Activator: com.rockwellcollins.atc.agree.analysis.Activator Bundle-Vendor: Rockwell Collins, Inc. Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", @@ -28,14 +28,14 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., lib/gson.jar Import-Package: org.apache.commons.lang;version="[2.6.0,3.0.0)" -Export-Package: com.rockwellcollins.atc.agree.analysis;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.ast;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.ast.visitors;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.extentions;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.handlers;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.lustre.visitors;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.preferences;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.saving;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.translation;version="2.10.2", - com.rockwellcollins.atc.agree.analysis.views;version="2.10.2" +Export-Package: com.rockwellcollins.atc.agree.analysis;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.ast;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.ast.visitors;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.extentions;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.handlers;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.lustre.visitors;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.preferences;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.saving;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.translation;version="2.10.200", + com.rockwellcollins.atc.agree.analysis.views;version="2.10.200" Automatic-Module-Name: com.rockwellcollins.atc.agree.analysis diff --git a/com.rockwellcollins.atc.agree.analysis/pom.xml b/com.rockwellcollins.atc.agree.analysis/pom.xml index 30e4dbc59..5b67f04ed 100644 --- a/com.rockwellcollins.atc.agree.analysis/pom.xml +++ b/com.rockwellcollins.atc.agree.analysis/pom.xml @@ -24,10 +24,10 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.analysis - 2.10.100-SNAPSHOT + 2.10.200-SNAPSHOT eclipse-plugin 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 diff --git a/com.rockwellcollins.atc.agree.cli/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.cli/META-INF/MANIFEST.MF index 23af91405..3077bff53 100644 --- a/com.rockwellcollins.atc.agree.cli/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.cli/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Cli Bundle-SymbolicName: com.rockwellcollins.atc.agree.cli;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.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 diff --git a/com.rockwellcollins.atc.agree.cli/pom.xml b/com.rockwellcollins.atc.agree.cli/pom.xml index 7f907cf02..bbb1db141 100644 --- a/com.rockwellcollins.atc.agree.cli/pom.xml +++ b/com.rockwellcollins.atc.agree.cli/pom.xml @@ -4,10 +4,10 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.cli - 1.0.100-SNAPSHOT + 1.0.200-SNAPSHOT eclipse-plugin 1.5.0 diff --git a/com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF index 56ac25c23..e73cac8f3 100644 --- a/com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.codegen/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE Code Generation Bundle-SymbolicName: com.rockwellcollins.atc.agree.codegen;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Bundle-Activator: com.rockwellcollins.atc.agree.codegen.Activator Bundle-Vendor: ROCKWELLCOLLINS Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", - com.rockwellcollins.atc.agree.analysis;bundle-version="[2.8.0,3.0.0)", + com.rockwellcollins.atc.agree.analysis;bundle-version="[2.10.0,3.0.0)", com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)", org.osate.xtext.aadl2.properties;bundle-version="[3.0.0,4.0.0)", diff --git a/com.rockwellcollins.atc.agree.codegen/pom.xml b/com.rockwellcollins.atc.agree.codegen/pom.xml index 11b154a2d..bfb927279 100644 --- a/com.rockwellcollins.atc.agree.codegen/pom.xml +++ b/com.rockwellcollins.atc.agree.codegen/pom.xml @@ -24,9 +24,9 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.codegen - 2.9.100-SNAPSHOT + 2.9.200-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.doc/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.doc/META-INF/MANIFEST.MF index 93faf26e3..442b5184b 100644 --- a/com.rockwellcollins.atc.agree.doc/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE Documentation Bundle-SymbolicName: com.rockwellcollins.atc.agree.doc;singleton:=true -Bundle-Version: 2.10.100.qualifier +Bundle-Version: 2.10.200.qualifier Bundle-Vendor: ROCKWELLCOLLINS Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)" diff --git a/com.rockwellcollins.atc.agree.doc/pom.xml b/com.rockwellcollins.atc.agree.doc/pom.xml index 7d1ef51e0..e5bd7f53e 100644 --- a/com.rockwellcollins.atc.agree.doc/pom.xml +++ b/com.rockwellcollins.atc.agree.doc/pom.xml @@ -24,10 +24,10 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.doc - 2.10.100-SNAPSHOT + 2.10.200-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.examples.feature/feature.xml b/com.rockwellcollins.atc.agree.examples.feature/feature.xml index e37444abd..704181bb5 100644 --- a/com.rockwellcollins.atc.agree.examples.feature/feature.xml +++ b/com.rockwellcollins.atc.agree.examples.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/com.rockwellcollins.atc.agree.examples.feature/pom.xml b/com.rockwellcollins.atc.agree.examples.feature/pom.xml index 1f22dc4c6..6150a2a5e 100644 --- a/com.rockwellcollins.atc.agree.examples.feature/pom.xml +++ b/com.rockwellcollins.atc.agree.examples.feature/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.examples.feature - 1.0.4-SNAPSHOT + 1.0.5-SNAPSHOT eclipse-feature diff --git a/com.rockwellcollins.atc.agree.examples/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.examples/META-INF/MANIFEST.MF index 09935837d..3ea870992 100644 --- a/com.rockwellcollins.atc.agree.examples/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.examples/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Examples Bundle-SymbolicName: com.rockwellcollins.atc.agree.examples;singleton:=true -Bundle-Version: 1.0.4.qualifier +Bundle-Version: 1.0.5.qualifier Automatic-Module-Name: com.rockwellcollins.atc.agree.examples Require-Bundle: com.rockwellcollins.atc.agree.ui;bundle-version="[4.0.0,5.0.0)" Bundle-Vendor: Collins Aerospace diff --git a/com.rockwellcollins.atc.agree.examples/examples/bscu/pom.xml b/com.rockwellcollins.atc.agree.examples/examples/bscu/pom.xml index 7b596367d..5b149078e 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.4-SNAPSHOT + 1.0.5-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 f940aeb3a..4bc481ab9 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.4-SNAPSHOT + 1.0.5-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 302aa4c3e..b8e644202 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.4-SNAPSHOT + 1.0.5-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 e42c8cc92..509b4bdb0 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.4-SNAPSHOT + 1.0.5-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 9e8fddbf8..8a2d3371c 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.1-SNAPSHOT + 2.11.2-SNAPSHOT ../.. com.rockwellcollins.atc.agree examples - 1.0.4-SNAPSHOT + 1.0.5-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 e0db019bc..8b2d991ee 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.4-SNAPSHOT + 1.0.5-SNAPSHOT com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree.examples/pom.xml b/com.rockwellcollins.atc.agree.examples/pom.xml index b973f7bc1..893d5587d 100644 --- a/com.rockwellcollins.atc.agree.examples/pom.xml +++ b/com.rockwellcollins.atc.agree.examples/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.examples - 1.0.4-SNAPSHOT + 1.0.5-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree.feature/feature.xml b/com.rockwellcollins.atc.agree.feature/feature.xml index da6786b67..b273cefcd 100644 --- a/com.rockwellcollins.atc.agree.feature/feature.xml +++ b/com.rockwellcollins.atc.agree.feature/feature.xml @@ -22,7 +22,7 @@ diff --git a/com.rockwellcollins.atc.agree.feature/pom.xml b/com.rockwellcollins.atc.agree.feature/pom.xml index 4536a4d7b..f597c44ea 100644 --- a/com.rockwellcollins.atc.agree.feature/pom.xml +++ b/com.rockwellcollins.atc.agree.feature/pom.xml @@ -24,10 +24,10 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.feature eclipse-feature - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT diff --git a/com.rockwellcollins.atc.agree.site/pom.xml b/com.rockwellcollins.atc.agree.site/pom.xml index 70141f1ef..2e57af3f3 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.1-SNAPSHOT - - - com.rockwellcollins.atc.agree.site - 2.9.100-SNAPSHOT -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.2-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/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 @@ - - - - + + + + - - - + + + diff --git a/com.rockwellcollins.atc.agree.target/pom.xml b/com.rockwellcollins.atc.agree.target/pom.xml index 3c13f8739..1d8de3de5 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.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.target eclipse-target-definition diff --git a/com.rockwellcollins.atc.agree.tests/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.tests/META-INF/MANIFEST.MF index 882092773..3bef154b0 100644 --- a/com.rockwellcollins.atc.agree.tests/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: com.rockwellcollins.atc.agree.tests Bundle-ManifestVersion: 2 Bundle-Name: AGREE Language Tests Bundle-Vendor: Collins Aerospace -Bundle-Version: 2.7.100.qualifier +Bundle-Version: 2.7.200.qualifier Bundle-SymbolicName: com.rockwellcollins.atc.agree.tests;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: com.google.guava, diff --git a/com.rockwellcollins.atc.agree.tests/pom.xml b/com.rockwellcollins.atc.agree.tests/pom.xml index e94e620cc..3b528f4dd 100644 --- a/com.rockwellcollins.atc.agree.tests/pom.xml +++ b/com.rockwellcollins.atc.agree.tests/pom.xml @@ -23,10 +23,10 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.tests - 2.7.100-SNAPSHOT + 2.7.200-SNAPSHOT eclipse-test-plugin diff --git a/com.rockwellcollins.atc.agree.ui/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree.ui/META-INF/MANIFEST.MF index 40d6a946c..041070a30 100644 --- a/com.rockwellcollins.atc.agree.ui/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE front-end Bundle-Vendor: Rockwell Collins, Inc. -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.200.qualifier Bundle-SymbolicName: com.rockwellcollins.atc.agree.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, @@ -28,13 +28,13 @@ Import-Package: org.apache.log4j;version="[1.1.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.25.0,3.0.0)", org.osate.ui.wizards Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: com.rockwellcollins.atc.agree.parsing;version="4.0.0", - com.rockwellcollins.atc.agree.ui.contentassist;version="4.0.0", - com.rockwellcollins.atc.agree.ui.internal;version="4.0.0", - com.rockwellcollins.atc.agree.ui.quickfix;version="4.0.0", - com.rockwellcollins.atc.agree.unparsing;version="4.0.0", - com.rockwellcollins.atc.agree.ide.contentassist.antlr.lexer;version="4.0.0", - com.rockwellcollins.atc.agree.ide.contentassist.antlr.internal;version="4.0.0", - com.rockwellcollins.atc.agree.ide.contentassist.antlr;version="4.0.0" +Export-Package: com.rockwellcollins.atc.agree.parsing;version="4.0.200", + com.rockwellcollins.atc.agree.ui.contentassist;version="4.0.200", + com.rockwellcollins.atc.agree.ui.internal;version="4.0.200", + com.rockwellcollins.atc.agree.ui.quickfix;version="4.0.200", + com.rockwellcollins.atc.agree.unparsing;version="4.0.200", + com.rockwellcollins.atc.agree.ide.contentassist.antlr.lexer;version="4.0.200", + com.rockwellcollins.atc.agree.ide.contentassist.antlr.internal;version="4.0.200", + com.rockwellcollins.atc.agree.ide.contentassist.antlr;version="4.0.200" Bundle-Activator: com.rockwellcollins.atc.agree.ui.internal.AgreeActivator Automatic-Module-Name: com.rockwellcollins.atc.agree.ui diff --git a/com.rockwellcollins.atc.agree.ui/pom.xml b/com.rockwellcollins.atc.agree.ui/pom.xml index 2cd9f9704..44b5080ea 100644 --- a/com.rockwellcollins.atc.agree.ui/pom.xml +++ b/com.rockwellcollins.atc.agree.ui/pom.xml @@ -24,9 +24,9 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.ui - 4.0.100-SNAPSHOT + 4.0.200-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF index 9fcc65858..538293bc1 100644 --- a/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.agree/META-INF/MANIFEST.MF @@ -2,27 +2,29 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE back-end Bundle-Vendor: Rockwell Collins, Inc. -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.200.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.0", - com.rockwellcollins.atc.agree.services;version="4.0.0", - com.rockwellcollins.atc.agree.agree;version="4.0.0", - com.rockwellcollins.atc.agree.agree.impl;version="4.0.0", - com.rockwellcollins.atc.agree.agree.util;version="4.0.0", - com.rockwellcollins.atc.agree.parser.antlr;version="4.0.0", - com.rockwellcollins.atc.agree.parser.antlr.internal;version="4.0.0", - com.rockwellcollins.atc.agree.validation;version="4.0.0", - com.rockwellcollins.atc.agree.scoping;version="4.0.0", - com.rockwellcollins.atc.agree.formatting2;version="4.0.0", - com.rockwellcollins.atc.agree.linking;version="4.0.0", - com.rockwellcollins.atc.agree.serializer;version="4.0.0", - com.rockwellcollins.atc.agree.parser.antlr.lexer;version="4.0.0" +Export-Package: com.rockwellcollins.atc.agree;version="4.0.200", + com.rockwellcollins.atc.agree.services;version="4.0.200", + com.rockwellcollins.atc.agree.agree;version="4.0.200", + com.rockwellcollins.atc.agree.agree.impl;version="4.0.200", + com.rockwellcollins.atc.agree.agree.util;version="4.0.200", + com.rockwellcollins.atc.agree.parser.antlr;version="4.0.200", + com.rockwellcollins.atc.agree.parser.antlr.internal;version="4.0.200", + com.rockwellcollins.atc.agree.validation;version="4.0.200", + com.rockwellcollins.atc.agree.scoping;version="4.0.200", + com.rockwellcollins.atc.agree.formatting2;version="4.0.200", + com.rockwellcollins.atc.agree.linking;version="4.0.200", + com.rockwellcollins.atc.agree.serializer;version="4.0.200", + com.rockwellcollins.atc.agree.parser.antlr.lexer;version="4.0.200" Automatic-Module-Name: com.rockwellcollins.atc.agree diff --git a/com.rockwellcollins.atc.agree/pom.xml b/com.rockwellcollins.atc.agree/pom.xml index 273f238cf..ca21edbc6 100644 --- a/com.rockwellcollins.atc.agree/pom.xml +++ b/com.rockwellcollins.atc.agree/pom.xml @@ -24,9 +24,9 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree - 4.0.100-SNAPSHOT + 4.0.200-SNAPSHOT eclipse-plugin diff --git a/com.rockwellcollins.atc.tcg.feature/feature.xml b/com.rockwellcollins.atc.tcg.feature/feature.xml index b0b24dc0f..8c50f2a97 100644 --- a/com.rockwellcollins.atc.tcg.feature/feature.xml +++ b/com.rockwellcollins.atc.tcg.feature/feature.xml @@ -22,7 +22,7 @@ diff --git a/com.rockwellcollins.atc.tcg.feature/pom.xml b/com.rockwellcollins.atc.tcg.feature/pom.xml index 6e5effaee..174aa3aa8 100644 --- a/com.rockwellcollins.atc.tcg.feature/pom.xml +++ b/com.rockwellcollins.atc.tcg.feature/pom.xml @@ -25,11 +25,11 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.tcg.feature - 2.9.2-SNAPSHOT + 2.9.3-SNAPSHOT eclipse-feature 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/com.rockwellcollins.atc.tcg/META-INF/MANIFEST.MF b/com.rockwellcollins.atc.tcg/META-INF/MANIFEST.MF index a40a4782d..129009236 100644 --- a/com.rockwellcollins.atc.tcg/META-INF/MANIFEST.MF +++ b/com.rockwellcollins.atc.tcg/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test Case Generator Bundle-SymbolicName: com.rockwellcollins.atc.tcg;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Bundle-Activator: com.rockwellcollins.atc.tcg.Activator Require-Bundle: org.osate.aadl2.modelsupport;bundle-version="[7.0.0,8.0.0)", org.eclipse.ui.console;bundle-version="[3.5.300,4.0.0)", @@ -11,12 +11,12 @@ Require-Bundle: org.osate.aadl2.modelsupport;bundle-version="[7.0.0,8.0.0)", org.osate.aadl2.instantiation;bundle-version="[3.0.0,4.0.0)", org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)", com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", - com.rockwellcollins.atc.agree.analysis;bundle-version="[2.8.0,3.0.0)", + com.rockwellcollins.atc.agree.analysis;bundle-version="[2.10.0,3.0.0)", org.osate.ge;bundle-version="[3.0.0,4.0.0)", com.collins.trustedsystems.jkindapi;bundle-version="[4.0.0,5.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: Rockwell Collins Comment: Import-Package: edu.uah.rsesc.aadlsimulator.agree.ext -Export-Package: com.rockwellcollins.atc.tcg.extensions;version="2.9.1" +Export-Package: com.rockwellcollins.atc.tcg.extensions;version="2.9.200" Automatic-Module-Name: com.rockwellcollins.atc.tcg diff --git a/com.rockwellcollins.atc.tcg/pom.xml b/com.rockwellcollins.atc.tcg/pom.xml index 53296924d..4bf44659e 100644 --- a/com.rockwellcollins.atc.tcg/pom.xml +++ b/com.rockwellcollins.atc.tcg/pom.xml @@ -25,11 +25,11 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.tcg - 2.9.100-SNAPSHOT + 2.9.200-SNAPSHOT com.rockwellcollins.atc.tcg eclipse-plugin 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 diff --git a/edu.uah.rsesc.aadlsimulator.agree.feature/feature.xml b/edu.uah.rsesc.aadlsimulator.agree.feature/feature.xml index e46c44a49..34446b318 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.feature/feature.xml +++ b/edu.uah.rsesc.aadlsimulator.agree.feature/feature.xml @@ -22,7 +22,7 @@ + version="2.9.3.qualifier"> Copyright (c) 2018, Rockwell Collins. diff --git a/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml b/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml index 55c6b77c4..af4d39b97 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree.feature/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.agree.feature - 2.9.2-SNAPSHOT + 2.9.3-SNAPSHOT eclipse-feature diff --git a/edu.uah.rsesc.aadlsimulator.agree.ui/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.agree.ui/META-INF/MANIFEST.MF index 03a33c9ee..a21b59362 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.ui/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.agree.ui/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AADL Simulator AGREE UI Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator.agree.ui;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Bundle-Vendor: The University of Alabama in Huntsville Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: edu.uah.rsesc.aadlsimulator.ui;bundle-version="[2.8.0,3.0.0)", - edu.uah.rsesc.aadlsimulator;bundle-version="[2.8.0,3.0.0)", - edu.uah.rsesc.aadlsimulator.agree;bundle-version="[2.8.0,3.0.0)", +Require-Bundle: edu.uah.rsesc.aadlsimulator.ui;bundle-version="[2.9.0,3.0.0)", + edu.uah.rsesc.aadlsimulator;bundle-version="[2.9.0,3.0.0)", + edu.uah.rsesc.aadlsimulator.agree;bundle-version="[2.9.0,3.0.0)", org.eclipse.swt;bundle-version="[3.116.0,4.0.0)", org.eclipse.jface;bundle-version="[3.22.0,4.0.0)", org.eclipse.equinox.registry;bundle-version="[3.10.0,4.0.0)", org.eclipse.osgi;bundle-version="[3.16.0,4.0.0)", - com.rockwellcollins.atc.agree.analysis;bundle-version="[2.8.0,3.0.0)", + com.rockwellcollins.atc.agree.analysis;bundle-version="[2.10.0,3.0.0)", org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.e4.core.contexts;bundle-version="[1.8.0,2.0.0)", @@ -21,9 +21,9 @@ Require-Bundle: edu.uah.rsesc.aadlsimulator.ui;bundle-version="[2.8.0,3.0.0)", org.eclipse.debug.core;bundle-version="[3.18.0,4.0.0)", com.rockwellcollins.atc.agree;bundle-version="[4.0.0,5.0.0)", org.eclipse.debug.ui;bundle-version="[3.14.0,4.0.0)", - com.rockwellcollins.atc.tcg;bundle-version="[2.8.0,3.0.0)", + com.rockwellcollins.atc.tcg;bundle-version="[2.9.0,3.0.0)", org.eclipse.xtext.ui;bundle-version="[2.25.0,3.0.0)", - edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.0.0,4.0.0)", + edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.1.0,4.0.0)", com.collins.trustedsystems.jkindapi;bundle-version="[4.0.0,5.0.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: edu.uah.rsesc.aadlsimulator.agree.ui diff --git a/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml index c11901dd5..fbde476a1 100644 --- a/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree.ui/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.agree.ui - 2.9.100-SNAPSHOT + 2.9.200-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.agree/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.agree/META-INF/MANIFEST.MF index 9066ef648..4ac2d2902 100644 --- a/edu.uah.rsesc.aadlsimulator.agree/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.agree/META-INF/MANIFEST.MF @@ -2,25 +2,25 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AADL Simulator AGREE Components Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator.agree;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", 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)", - com.rockwellcollins.atc.agree.analysis;bundle-version="[2.8.0,3.0.0)", - edu.uah.rsesc.aadlsimulator;bundle-version="[2.8.0,3.0.0)", + com.rockwellcollins.atc.agree.analysis;bundle-version="[2.10.0,3.0.0)", + edu.uah.rsesc.aadlsimulator;bundle-version="[2.9.0,3.0.0)", org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)", - edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.0.0,4.0.0)", + edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.1.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.14.0,4.0.0)", org.osate.workspace;bundle-version="[4.0.0,5.0.0)", org.osate.aadl2.modelsupport;bundle-version="[7.0.0,8.0.0)", com.collins.trustedsystems.jkindapi;bundle-version="[4.0.0,5.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy -Export-Package: edu.uah.rsesc.aadlsimulator.agree;version="2.9.1", - edu.uah.rsesc.aadlsimulator.agree.engine;version="2.9.1", - edu.uah.rsesc.aadlsimulator.agree.ext;version="2.9.1", - edu.uah.rsesc.aadlsimulator.agree.services;version="2.9.1", - edu.uah.rsesc.aadlsimulator.agree.sim;version="2.9.1" +Export-Package: edu.uah.rsesc.aadlsimulator.agree;version="2.9.200", + edu.uah.rsesc.aadlsimulator.agree.engine;version="2.9.200", + edu.uah.rsesc.aadlsimulator.agree.ext;version="2.9.200", + edu.uah.rsesc.aadlsimulator.agree.services;version="2.9.200", + edu.uah.rsesc.aadlsimulator.agree.sim;version="2.9.200" Bundle-Vendor: The University of Alabama in Huntsville Automatic-Module-Name: edu.uah.rsesc.aadlsimulator.agree diff --git a/edu.uah.rsesc.aadlsimulator.agree/pom.xml b/edu.uah.rsesc.aadlsimulator.agree/pom.xml index 01fc8e6ec..17ab34367 100644 --- a/edu.uah.rsesc.aadlsimulator.agree/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.agree/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.agree - 2.9.100-SNAPSHOT + 2.9.200-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.doc/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.doc/META-INF/MANIFEST.MF index a97ade4a5..26e263c05 100644 --- a/edu.uah.rsesc.aadlsimulator.doc/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AADL Simulator Documentation Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator.doc;singleton:=true -Bundle-Version: 2.7.100.qualifier +Bundle-Version: 2.7.200.qualifier Bundle-Vendor: The University of Alabama in Huntsville Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)" diff --git a/edu.uah.rsesc.aadlsimulator.doc/pom.xml b/edu.uah.rsesc.aadlsimulator.doc/pom.xml index c1a6f06ec..32774f1e6 100644 --- a/edu.uah.rsesc.aadlsimulator.doc/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.doc/pom.xml @@ -22,12 +22,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.doc - 2.7.100-SNAPSHOT + 2.7.200-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.feature/feature.xml b/edu.uah.rsesc.aadlsimulator.feature/feature.xml index 604204316..48c6815df 100644 --- a/edu.uah.rsesc.aadlsimulator.feature/feature.xml +++ b/edu.uah.rsesc.aadlsimulator.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/edu.uah.rsesc.aadlsimulator.feature/pom.xml b/edu.uah.rsesc.aadlsimulator.feature/pom.xml index ea9e99ed3..7c25c7ff5 100644 --- a/edu.uah.rsesc.aadlsimulator.feature/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.feature/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.feature - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT eclipse-feature diff --git a/edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF index f71867e02..5290f6a8a 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AADL Simulator UI Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator.ui;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Bundle-Vendor: The University of Alabama in Huntsville Bundle-Classpath: ., lib/jogamp-fat.jar, @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)", org.osate.aadl2.modelsupport;bundle-version="[7.0.0,8.0.0)", org.osate.aadl2;bundle-version="[5.0.0,6.0.0)", - edu.uah.rsesc.aadlsimulator;bundle-version="[2.8.0,3.0.0)", + edu.uah.rsesc.aadlsimulator;bundle-version="[2.9.0,3.0.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.122.0,4.0.0)", org.eclipse.xtext.util;bundle-version="[2.25.0,3.0.0)", @@ -33,15 +33,15 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.0,3.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)" + edu.uah.rsesc.aadlsimulator.xtext.ui;bundle-version="[3.1.0,4.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 -Export-Package: edu.uah.rsesc.aadlsimulator.ui;version="2.9.1", - edu.uah.rsesc.aadlsimulator.ui.ext;version="2.9.1", - edu.uah.rsesc.aadlsimulator.ui.launch;version="2.9.1", - edu.uah.rsesc.aadlsimulator.ui.services;version="2.9.1" +Export-Package: edu.uah.rsesc.aadlsimulator.ui;version="2.9.200", + edu.uah.rsesc.aadlsimulator.ui.ext;version="2.9.200", + edu.uah.rsesc.aadlsimulator.ui.launch;version="2.9.200", + edu.uah.rsesc.aadlsimulator.ui.services;version="2.9.200" Bundle-Activator: edu.uah.rsesc.aadlsimulator.ui.Activator Import-Package: org.apache.log4j;version="[1.2.15,2.0.0)", org.osgi.service.event;version="[1.0.0,2.0.0)" diff --git a/edu.uah.rsesc.aadlsimulator.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.ui/pom.xml index aeeb8a218..40e066c89 100644 --- a/edu.uah.rsesc.aadlsimulator.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.ui/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.ui - 2.9.100-SNAPSHOT + 2.9.200-SNAPSHOT eclipse-plugin 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.ui/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.xtext.ui/META-INF/MANIFEST.MF index 7e46051d8..264e6d868 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext.ui/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.xtext.ui/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AADL Simulator Xtext UI Bundle-Vendor: The University of Alabama in Huntsville -Bundle-Version: 3.1.100.qualifier +Bundle-Version: 3.1.200.qualifier Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator.xtext.ui;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, +Require-Bundle: edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.1.0,4.0.0)";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="[2.25.0,3.0.0)", org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", @@ -16,5 +16,5 @@ Require-Bundle: edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.0.0,4.0.0)" Import-Package: org.apache.log4j;version="[1.1.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: edu.uah.rsesc.aadlsimulator.xtext.ui.internal.XtextActivator -Export-Package: edu.uah.rsesc.aadlsimulator.xtext.ui;version="3.1.1" +Export-Package: edu.uah.rsesc.aadlsimulator.xtext.ui;version="3.1.200" Automatic-Module-Name: edu.uah.rsesc.aadlsimulator.xtext.ui diff --git a/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml b/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml index 88d54c9c6..0eb175564 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.xtext.ui/pom.xml @@ -5,12 +5,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.xtext.ui - 3.1.100-SNAPSHOT + 3.1.200-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF index ce0fca0d8..1396ce499 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator.xtext/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AADL Simulator Xtext Bundle-Vendor: The University of Alabama in Huntsville -Bundle-Version: 3.1.100.qualifier +Bundle-Version: 3.1.200.qualifier Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator.xtext;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="[2.25.0,3.0.0)";visibility:=reexport, @@ -15,20 +15,21 @@ 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.1", - edu.uah.rsesc.aadlsimulator.xtext.inputConstraint;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.inputConstraint.impl;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.inputConstraint.util;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.parser.antlr;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.parser.antlr.internal;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.serializer;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.services;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.util;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.validation;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.formatting;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.ide.contentassist.antlr;version="3.1.1", - edu.uah.rsesc.aadlsimulator.xtext.ide.contentassist.antlr.internal;version="3.1.1" +Export-Package: edu.uah.rsesc.aadlsimulator.xtext;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.inputConstraint;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.inputConstraint.impl;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.inputConstraint.util;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.parser.antlr;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.parser.antlr.internal;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.serializer;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.services;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.util;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.validation;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.formatting;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.ide.contentassist.antlr;version="3.1.200", + edu.uah.rsesc.aadlsimulator.xtext.ide.contentassist.antlr.internal;version="3.1.200" Automatic-Module-Name: edu.uah.rsesc.aadlsimulator.xtext 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.aadlsimulator.xtext/pom.xml b/edu.uah.rsesc.aadlsimulator.xtext/pom.xml index f3f199f84..3d9e77a79 100644 --- a/edu.uah.rsesc.aadlsimulator.xtext/pom.xml +++ b/edu.uah.rsesc.aadlsimulator.xtext/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator.xtext - 3.1.100-SNAPSHOT + 3.1.200-SNAPSHOT eclipse-plugin 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 {} 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; diff --git a/edu.uah.rsesc.aadlsimulator/META-INF/MANIFEST.MF b/edu.uah.rsesc.aadlsimulator/META-INF/MANIFEST.MF index d7f426c35..f34b3919b 100644 --- a/edu.uah.rsesc.aadlsimulator/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.aadlsimulator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AADL Simulator Bundle-SymbolicName: edu.uah.rsesc.aadlsimulator;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Bundle-Vendor: The University of Alabama in Huntsville Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.18.0,4.0.0)", @@ -16,11 +16,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", org.osate.aadl2.modelsupport;bundle-version="[7.0.0,8.0.0)", org.eclipse.xtext;bundle-version="[2.25.0,3.0.0)", org.osate.core;bundle-version="[5.0.0,6.0.0)", - edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.0.0,4.0.0)" + edu.uah.rsesc.aadlsimulator.xtext;bundle-version="[3.1.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy -Export-Package: edu.uah.rsesc.aadlsimulator;version="2.9.1", - edu.uah.rsesc.aadlsimulator.launch;version="2.9.1", - edu.uah.rsesc.aadlsimulator.services;version="2.9.1" +Export-Package: edu.uah.rsesc.aadlsimulator;version="2.9.200", + edu.uah.rsesc.aadlsimulator.launch;version="2.9.200", + edu.uah.rsesc.aadlsimulator.services;version="2.9.200" Service-Component: components/DefaultSimulationService.xml Automatic-Module-Name: edu.uah.rsesc.aadlsimulator diff --git a/edu.uah.rsesc.aadlsimulator/pom.xml b/edu.uah.rsesc.aadlsimulator/pom.xml index 9cf829619..045937e03 100644 --- a/edu.uah.rsesc.aadlsimulator/pom.xml +++ b/edu.uah.rsesc.aadlsimulator/pom.xml @@ -25,12 +25,12 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.aadlsimulator edu.uah.rsesc.aadlsimulator - 2.9.100-SNAPSHOT + 2.9.200-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.agree.ge.ui/META-INF/MANIFEST.MF b/edu.uah.rsesc.agree.ge.ui/META-INF/MANIFEST.MF index fd2b7cf47..12c52e05a 100644 --- a/edu.uah.rsesc.agree.ge.ui/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.agree.ge.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE UI extensions to the OSATE Graphical Editor Bundle-SymbolicName: edu.uah.rsesc.agree.ge.ui;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Bundle-Vendor: The University of Alabama in Huntsville Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.osate.aadl2.edit;bundle-version="[5.0.0,6.0.0)", org.osate.ui;bundle-version="[6.0.0,7.0.0)", org.osate.annexsupport;bundle-version="[4.0.1,5.0.0)", - edu.uah.rsesc.agree.ge;bundle-version="[2.8.0,3.0.0)", + edu.uah.rsesc.agree.ge;bundle-version="[2.9.0,3.0.0)", com.rockwellcollins.atc.agree.ui;bundle-version="[4.0.0,5.0.0)", org.osate.xtext.aadl2.ui;bundle-version="[7.0.0,8.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/edu.uah.rsesc.agree.ge.ui/pom.xml b/edu.uah.rsesc.agree.ge.ui/pom.xml index 94ac53c03..58c4ff759 100644 --- a/edu.uah.rsesc.agree.ge.ui/pom.xml +++ b/edu.uah.rsesc.agree.ge.ui/pom.xml @@ -4,9 +4,9 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.agree.ge.ui - 2.9.100-SNAPSHOT + 2.9.200-SNAPSHOT eclipse-plugin diff --git a/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF b/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF index 306b4605d..37c430caf 100644 --- a/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF +++ b/edu.uah.rsesc.agree.ge/META-INF/MANIFEST.MF @@ -2,14 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AGREE extensions to the OSATE Graphical Editor Bundle-SymbolicName: edu.uah.rsesc.agree.ge;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier 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.1", - edu.uah.rsesc.agree.ge.businessObjectHandlers;version="2.9.1" +Export-Package: edu.uah.rsesc.agree.ge;version="2.9.200", + edu.uah.rsesc.agree.ge.businessObjectHandlers;version="2.9.200" Automatic-Module-Name: edu.uah.rsesc.agree.ge diff --git a/edu.uah.rsesc.agree.ge/pom.xml b/edu.uah.rsesc.agree.ge/pom.xml index a1f6a6659..5fed738cd 100644 --- a/edu.uah.rsesc.agree.ge/pom.xml +++ b/edu.uah.rsesc.agree.ge/pom.xml @@ -4,9 +4,9 @@ com.rockwellcollins.atc.agree com.rockwellcollins.atc.agree.parent - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT edu.uah.rsesc.agree.ge - 2.9.100-SNAPSHOT + 2.9.200-SNAPSHOT eclipse-plugin diff --git a/pom.xml b/pom.xml index bd20c7e4f..95e45ffd4 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.rockwellcollins.atc.agree - 2.11.1-SNAPSHOT + 2.11.2-SNAPSHOT com.rockwellcollins.atc.agree.parent pom @@ -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