From 2c04c92251fbc9d7c11e92e9803a9d8d2386a21e Mon Sep 17 00:00:00 2001 From: Lutz Wrage Date: Mon, 7 Mar 2022 19:01:44 -0500 Subject: [PATCH 1/5] Add error manager to annex instantiation methods Add method to instantiate annexes at system instance --- .../AnnexInstantiationController.java | 28 ++++++++++++++++--- .../aadl2/instantiation/InstantiateModel.java | 2 +- .../osate/annexsupport/AnnexInstantiator.java | 15 +++++++--- .../annexsupport/AnnexInstantiatorProxy.java | 18 ++++++++++-- 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/AnnexInstantiationController.java b/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/AnnexInstantiationController.java index 1c35a72cc48..4cdb00a249d 100644 --- a/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/AnnexInstantiationController.java +++ b/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/AnnexInstantiationController.java @@ -32,6 +32,7 @@ import org.osate.aadl2.Element; import org.osate.aadl2.instance.ComponentInstance; import org.osate.aadl2.instance.util.InstanceUtil; +import org.osate.aadl2.modelsupport.errorreporting.AnalysisErrorReporterManager; import org.osate.aadl2.modelsupport.modeltraversal.ForAllElement; import org.osate.annexsupport.AnnexInstantiator; import org.osate.annexsupport.AnnexInstantiatorRegistry; @@ -42,15 +43,33 @@ */ public class AnnexInstantiationController extends ForAllElement { - public void instantiateAllAnnexes(ComponentInstance root) { + private AnnexInstantiatorRegistry registry = (AnnexInstantiatorRegistry) AnnexRegistry + .getRegistry(AnnexRegistry.ANNEX_INSTANTIATOR_EXT_ID); + + private Set allAnnexes = new HashSet(); + + AnalysisErrorReporterManager errorManager; + + AnnexInstantiationController(AnalysisErrorReporterManager errorManager) { + super(); + this.errorManager = errorManager; + } + + void instantiateAllAnnexes(ComponentInstance root) { processPostOrderComponentInstance(root); + for (String annexName : allAnnexes) { + AnnexInstantiator instantiator = registry.getAnnexInstantiator(annexName); + + if (instantiator != null) { + instantiator.instantiateAnnex(root, annexName, errorManager); + } + } + } @Override protected void action(Element obj) { ComponentInstance instance = (ComponentInstance) obj; - AnnexInstantiatorRegistry registry = (AnnexInstantiatorRegistry) AnnexRegistry - .getRegistry(AnnexRegistry.ANNEX_INSTANTIATOR_EXT_ID); Set annexes = new HashSet(); if (InstanceUtil.getComponentImplementation(instance, 0, null) != null) { @@ -76,8 +95,9 @@ protected void action(Element obj) { AnnexInstantiator instantiator = registry.getAnnexInstantiator(annexName); if (instantiator != null) { - instantiator.instantiateAnnex(instance, annexName); + instantiator.instantiateAnnex(instance, annexName, errorManager); } + allAnnexes.add(annexName); } } diff --git a/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/InstantiateModel.java b/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/InstantiateModel.java index fa2183c5db3..174e8d7d987 100644 --- a/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/InstantiateModel.java +++ b/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/InstantiateModel.java @@ -466,7 +466,7 @@ public void fillSystemInstance(SystemInstance root) throws InterruptedException // instantiation of annexes monitor.subTask("Instantiating annexes"); - AnnexInstantiationController aic = new AnnexInstantiationController(); + AnnexInstantiationController aic = new AnnexInstantiationController(errManager); aic.instantiateAllAnnexes(root); if (monitor.isCanceled()) { throw new InterruptedException(); diff --git a/core/org.osate.annexsupport/src/org/osate/annexsupport/AnnexInstantiator.java b/core/org.osate.annexsupport/src/org/osate/annexsupport/AnnexInstantiator.java index d1eac91d4d3..6f3529562f1 100644 --- a/core/org.osate.annexsupport/src/org/osate/annexsupport/AnnexInstantiator.java +++ b/core/org.osate.annexsupport/src/org/osate/annexsupport/AnnexInstantiator.java @@ -24,14 +24,21 @@ package org.osate.annexsupport; import org.osate.aadl2.instance.ComponentInstance; +import org.osate.aadl2.instance.SystemInstance; +import org.osate.aadl2.modelsupport.errorreporting.AnalysisErrorReporterManager; /** - * @author lwrage - * @version $Id: AnnexInstantiator.java,v 1.3 2009-05-01 18:05:14 jseibel Exp $ */ public interface AnnexInstantiator { /** - * @since 2.0 + * This method is called once for each annex for each component instance + * @since 4.0 */ - void instantiateAnnex(ComponentInstance instance, String annexName); + void instantiateAnnex(ComponentInstance instance, String annexName, AnalysisErrorReporterManager errorManager); + + /** + * This method is called once at the end per system instance. + * @since 4.0 + */ + void instantiateAnnex(SystemInstance instance, String annexName, AnalysisErrorReporterManager errorManager); } diff --git a/core/org.osate.annexsupport/src/org/osate/annexsupport/AnnexInstantiatorProxy.java b/core/org.osate.annexsupport/src/org/osate/annexsupport/AnnexInstantiatorProxy.java index 5dd32fd885f..05902e24b11 100644 --- a/core/org.osate.annexsupport/src/org/osate/annexsupport/AnnexInstantiatorProxy.java +++ b/core/org.osate.annexsupport/src/org/osate/annexsupport/AnnexInstantiatorProxy.java @@ -25,6 +25,8 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.osate.aadl2.instance.ComponentInstance; +import org.osate.aadl2.instance.SystemInstance; +import org.osate.aadl2.modelsupport.errorreporting.AnalysisErrorReporterManager; /** * @author lwrage @@ -46,13 +48,24 @@ public class AnnexInstantiatorProxy extends AnnexProxy implements AnnexInstantia * @since 2.0 */ @Override - public void instantiateAnnex(ComponentInstance instance, String annexName) { + public void instantiateAnnex(ComponentInstance instance, String annexName, + AnalysisErrorReporterManager errorManager) { AnnexInstantiator instantiator = getInstantiator(); if (instantiator == null) { return; } - instantiator.instantiateAnnex(instance, annexName); + instantiator.instantiateAnnex(instance, annexName, errorManager); + } + + @Override + public void instantiateAnnex(SystemInstance instance, String annexName, AnalysisErrorReporterManager errorManager) { + AnnexInstantiator instantiator = getInstantiator(); + + if (instantiator == null) { + return; + } + instantiator.instantiateAnnex(instance, annexName, errorManager); } private AnnexInstantiator getInstantiator() { @@ -67,4 +80,5 @@ private AnnexInstantiator getInstantiator() { } return instantiator; } + } From f4e7e4464f5d9f48bf631d3df3f905d126a4a4d5 Mon Sep 17 00:00:00 2001 From: Lutz Wrage Date: Mon, 7 Mar 2022 19:03:34 -0500 Subject: [PATCH 2/5] Update versions --- .../org.osate.alisa.common.ui/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.osate.alisa.workbench/META-INF/MANIFEST.MF | 2 +- alisa/org.osate.assure/META-INF/MANIFEST.MF | 4 ++-- .../org.osate.codegen.checker/META-INF/MANIFEST.MF | 2 +- ba/org.osate.ba/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- core/org.osate.aadl2.instantiation/pom.xml | 2 +- core/org.osate.annexsupport/META-INF/MANIFEST.MF | 2 +- core/org.osate.build.coverage.report/pom.xml | 14 +++++++------- core/org.osate.help/pom.xml | 14 +++++++------- core/org.osate.ui/META-INF/MANIFEST.MF | 2 +- core/org.osate.xtext.aadl2.ui/META-INF/MANIFEST.MF | 4 ++-- core/org.osate.xtext.aadl2/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- ge/org.osate.ge/META-INF/MANIFEST.MF | 4 ++-- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/alisa/org.osate.alisa.common.ui/META-INF/MANIFEST.MF b/alisa/org.osate.alisa.common.ui/META-INF/MANIFEST.MF index 95b4d516bc7..4883069bd25 100644 --- a/alisa/org.osate.alisa.common.ui/META-INF/MANIFEST.MF +++ b/alisa/org.osate.alisa.common.ui/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.osate.alisa.common;bundle-version="[3.0.0,4.0.0)";visibility org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.20.0,3.0.0)", org.eclipse.compare;bundle-version="[3.7.0,4.0.0)", org.osate.aadl2;bundle-version="[4.0.0,5.0.0)", - org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)", + org.osate.aadl2.instantiation;bundle-version="[2.0.0,3.0.0)", org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)", org.osate.xtext.aadl2;bundle-version="[6.2.0,7.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)", diff --git a/alisa/org.osate.alisa.workbench.ui/META-INF/MANIFEST.MF b/alisa/org.osate.alisa.workbench.ui/META-INF/MANIFEST.MF index b9090848bc3..8fcd34e5353 100644 --- a/alisa/org.osate.alisa.workbench.ui/META-INF/MANIFEST.MF +++ b/alisa/org.osate.alisa.workbench.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.osate.alisa.workbench;bundle-version="[3.0.0,4.0.0)";visibil org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.osate.aadl2;bundle-version="[4.0.0,5.0.0)", - org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)", + org.osate.aadl2.instantiation;bundle-version="[2.0.0,3.0.0)", org.osate.ui;bundle-version="[6.3.0,7.0.0)", org.osate.assure;bundle-version="[3.0.0,4.0.0)", org.eclipse.jdt.debug.ui;bundle-version="[3.10.0,4.0.0)", diff --git a/alisa/org.osate.alisa.workbench/META-INF/MANIFEST.MF b/alisa/org.osate.alisa.workbench/META-INF/MANIFEST.MF index d8596b112ad..280f760469b 100644 --- a/alisa/org.osate.alisa.workbench/META-INF/MANIFEST.MF +++ b/alisa/org.osate.alisa.workbench/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re org.osate.aadl2;bundle-version="[4.0.0,5.0.0)", org.osate.reqspec;bundle-version="[3.0.0,4.0.0)", org.osate.alisa.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)", + org.osate.aadl2.instantiation;bundle-version="[2.0.0,3.0.0)", org.osate.categories;bundle-version="[3.0.0,4.0.0)", org.eclipse.xtext.ui;bundle-version="[2.20.0,3.0.0)";visibility:=reexport, org.objectweb.asm;bundle-version="[9.1.0,9.2.0)";resolution:=optional, diff --git a/alisa/org.osate.assure/META-INF/MANIFEST.MF b/alisa/org.osate.assure/META-INF/MANIFEST.MF index ac56e9edc39..425e4c3f2ac 100644 --- a/alisa/org.osate.assure/META-INF/MANIFEST.MF +++ b/alisa/org.osate.assure/META-INF/MANIFEST.MF @@ -36,13 +36,13 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.20.0,3.0.0)", org.eclipse.compare;bundle-version="[3.5.101,4.0.0)", org.osate.alisa.workbench;bundle-version="[3.0.0,4.0.0)", - org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)", + org.osate.aadl2.instantiation;bundle-version="[2.0.0,3.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)", org.eclipse.xsemantics.runtime;bundle-version="[1.8.1,2.0.0)", org.osate.results;bundle-version="[3.0.0,4.0.0)", org.osate.xtext.aadl2;bundle-version="[6.2.0,7.0.0)", org.osate.organization;bundle-version="[3.0.0,4.0.0)", - org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)" + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)" Import-Package: com.rockwellcollins.atc.resolute.analysis.execution;resolution:=optional, com.rockwellcollins.atc.resolute.analysis.results;resolution:=optional, com.rockwellcollins.atc.resolute.analysis.values;resolution:=optional, diff --git a/analyses/org.osate.codegen.checker/META-INF/MANIFEST.MF b/analyses/org.osate.codegen.checker/META-INF/MANIFEST.MF index 0cdf963848f..9216d0f301f 100644 --- a/analyses/org.osate.codegen.checker/META-INF/MANIFEST.MF +++ b/analyses/org.osate.codegen.checker/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.115.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)", org.eclipse.emf.common;bundle-version="[2.11.1,3.0.0)", org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", - org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)", + org.osate.aadl2.instantiation;bundle-version="[2.0.0,3.0.0)", org.osate.aadl2;bundle-version="[4.0.0,5.0.0)", org.eclipse.help;bundle-version="[3.6.0,4.0.0)", org.osate.aadl2.contrib;bundle-version="[2.0.0,3.0.0)", diff --git a/ba/org.osate.ba/META-INF/MANIFEST.MF b/ba/org.osate.ba/META-INF/MANIFEST.MF index 0d1d78e5f22..f64b1231ed1 100644 --- a/ba/org.osate.ba/META-INF/MANIFEST.MF +++ b/ba/org.osate.ba/META-INF/MANIFEST.MF @@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)";visibility:=reexport, org.osate.aadl2;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.osate.aadl2.modelsupport;bundle-version="[6.1.0,7.0.0)", - org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)", + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)", org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)", org.osate.ui;bundle-version="[6.3.0,7.0.0)", org.osate.utils;bundle-version="[2.0.0,3.0.0)";visibility:=reexport diff --git a/core/org.osate.aadl2.instantiation/META-INF/MANIFEST.MF b/core/org.osate.aadl2.instantiation/META-INF/MANIFEST.MF index 44d9b2d5776..67eccb5b7ce 100644 --- a/core/org.osate.aadl2.instantiation/META-INF/MANIFEST.MF +++ b/core/org.osate.aadl2.instantiation/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Instance Plug-in Bundle-SymbolicName: org.osate.aadl2.instantiation;singleton:=true -Bundle-Version: 1.2.1.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.osate.aadl2.instantiation.InstancePlugin Bundle-Vendor: CMU/SEI @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)", org.osate.aadl2.modelsupport;bundle-version="[6.1.0,7.0.0)", org.osate.aadl2;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.transaction;bundle-version="[1.3.0,2.0.0)", - org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)", + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)", org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)", org.osate.aadl2.contrib;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy diff --git a/core/org.osate.aadl2.instantiation/pom.xml b/core/org.osate.aadl2.instantiation/pom.xml index 1e3e9248670..84c9a30adab 100644 --- a/core/org.osate.aadl2.instantiation/pom.xml +++ b/core/org.osate.aadl2.instantiation/pom.xml @@ -12,7 +12,7 @@ org.osate org.osate.aadl2.instantiation - 1.2.1-SNAPSHOT + 2.0.0-SNAPSHOT eclipse-plugin diff --git a/core/org.osate.annexsupport/META-INF/MANIFEST.MF b/core/org.osate.annexsupport/META-INF/MANIFEST.MF index 5f707154612..33317f67f55 100644 --- a/core/org.osate.annexsupport/META-INF/MANIFEST.MF +++ b/core/org.osate.annexsupport/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Annex Plug-in Bundle-SymbolicName: org.osate.annexsupport;singleton:=true -Bundle-Version: 3.2.3.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.osate.annexsupport.AnnexPlugin Bundle-Vendor: CMU/SEI diff --git a/core/org.osate.build.coverage.report/pom.xml b/core/org.osate.build.coverage.report/pom.xml index a5870aa3e3f..f28b11a93c7 100644 --- a/core/org.osate.build.coverage.report/pom.xml +++ b/core/org.osate.build.coverage.report/pom.xml @@ -204,7 +204,7 @@ org.osate org.osate.aadl2.instance.ui - 1.0.10-SNAPSHOT + 1.1.0-SNAPSHOT true compile @@ -302,7 +302,7 @@ org.osate org.osate.aadl2.instantiation - 1.2.1-SNAPSHOT + 2.0.0-SNAPSHOT true compile @@ -316,7 +316,7 @@ org.osate org.osate.aadl2.instance.textual - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT true compile @@ -330,7 +330,7 @@ org.osate org.osate.aadl2.instance.textual.ui - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT true compile @@ -351,7 +351,7 @@ org.osate org.osate.aadl2.modelsupport - 6.0.2-SNAPSHOT + 6.1.0-SNAPSHOT true compile @@ -568,7 +568,7 @@ org.osate org.osate.ba - 5.1.2-SNAPSHOT + 5.1.3-SNAPSHOT true compile @@ -582,7 +582,7 @@ org.osate org.osate.utils - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT true compile diff --git a/core/org.osate.help/pom.xml b/core/org.osate.help/pom.xml index b7603c1232f..82030a7a6c3 100644 --- a/core/org.osate.help/pom.xml +++ b/core/org.osate.help/pom.xml @@ -35,27 +35,27 @@ org.osate org.osate.aadl2.instance.textual - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT org.osate org.osate.aadl2.instance.textual.ui - 2.0.9-SNAPSHOT + 3.0.0-SNAPSHOT org.osate org.osate.aadl2.instance.ui - 1.0.10-SNAPSHOT + 1.1.0-SNAPSHOT org.osate org.osate.aadl2.instantiation - 1.2.1-SNAPSHOT + 2.0.0-SNAPSHOT org.osate org.osate.aadl2.modelsupport - 6.0.2-SNAPSHOT + 6.1.0-SNAPSHOT org.osate @@ -110,12 +110,12 @@ org.osate org.osate.ba.feature - 5.2.0-SNAPSHOT + 5.2.1-SNAPSHOT org.osate org.osate.utils.feature - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT org.osate diff --git a/core/org.osate.ui/META-INF/MANIFEST.MF b/core/org.osate.ui/META-INF/MANIFEST.MF index 5f7c4a0a780..c0a260be6d2 100644 --- a/core/org.osate.ui/META-INF/MANIFEST.MF +++ b/core/org.osate.ui/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)", org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)", org.osate.xtext.aadl2.properties.ui;bundle-version="[4.1.0,5.0.0)", - org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)", + org.osate.aadl2.instantiation;bundle-version="[2.0.0,3.0.0)", org.osate.xtext.aadl2;bundle-version="[6.2.0,7.0.0)", org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)", org.osate.pluginsupport;bundle-version="[7.1.0,8.0.0)", diff --git a/core/org.osate.xtext.aadl2.ui/META-INF/MANIFEST.MF b/core/org.osate.xtext.aadl2.ui/META-INF/MANIFEST.MF index 7349cc64e88..34ada4df37d 100644 --- a/core/org.osate.xtext.aadl2.ui/META-INF/MANIFEST.MF +++ b/core/org.osate.xtext.aadl2.ui/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui.editors;bundle-version="[3.7.0,4.0.0)", org.osate.aadl2;bundle-version="[4.0.0,5.0.0)", org.eclipse.compare;bundle-version="[3.5.0,4.0.0)", org.osate.aadl2.modelsupport;bundle-version="[6.1.0,7.0.0)", - org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)", + org.osate.aadl2.instantiation;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)", org.eclipse.xtext.builder;bundle-version="[2.20.0,3.0.0)";visibility:=reexport, @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui.editors;bundle-version="[3.7.0,4.0.0)", org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)";visibility:=reexport, org.osate.xtext.aadl2.properties.ui;bundle-version="[4.1.0,5.0.0)";visibility:=reexport, org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)", - org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)", + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.20.0,3.0.0)", org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)", diff --git a/core/org.osate.xtext.aadl2/META-INF/MANIFEST.MF b/core/org.osate.xtext.aadl2/META-INF/MANIFEST.MF index b7bb641b115..6cbdfeed484 100644 --- a/core/org.osate.xtext.aadl2/META-INF/MANIFEST.MF +++ b/core/org.osate.xtext.aadl2/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.20.0,3.0.0)";reso org.antlr.runtime;bundle-version="[3.2.0,4.0.0)", org.osate.aadl2.modelsupport;bundle-version="[6.1.0,7.0.0)";visibility:=reexport, org.eclipse.emf.mwe2.launch;bundle-version="[2.1.0,3.0.0)";resolution:=optional, - org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)", + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)", org.eclipse.xtext.common.types;bundle-version="[2.20.0,3.0.0)", org.eclipse.xtext.xbase;bundle-version="[2.20.0,3.0.0)";resolution:=optional;visibility:=reexport, org.eclipse.emf.mwe.utils;bundle-version="[1.5.0,2.0.0)";resolution:=optional, diff --git a/emv2/org.osate.xtext.aadl2.errormodel.ui/META-INF/MANIFEST.MF b/emv2/org.osate.xtext.aadl2.errormodel.ui/META-INF/MANIFEST.MF index 6bc31253f3e..8f03b7ffb07 100644 --- a/emv2/org.osate.xtext.aadl2.errormodel.ui/META-INF/MANIFEST.MF +++ b/emv2/org.osate.xtext.aadl2.errormodel.ui/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.osate.xtext.aadl2.errormodel;bundle-version="[6.2.0,7.0.0)"; org.osate.xtext.aadl2.properties.ui;bundle-version="[4.1.0,5.0.0)", org.osate.aadl2;bundle-version="[4.0.0,5.0.0)", org.osate.aadl2.modelsupport;bundle-version="[6.1.0,7.0.0)", - org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)", + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)", org.osate.xtext.aadl2.ui;bundle-version="[6.3.0,7.0.0)", diff --git a/emv2/org.osate.xtext.aadl2.errormodel/META-INF/MANIFEST.MF b/emv2/org.osate.xtext.aadl2.errormodel/META-INF/MANIFEST.MF index dc60e264881..1619fe61e1a 100644 --- a/emv2/org.osate.xtext.aadl2.errormodel/META-INF/MANIFEST.MF +++ b/emv2/org.osate.xtext.aadl2.errormodel/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.osate.aadl2.modelsupport;bundle-version="[6.1.0,7.0.0)", org.eclipse.ui;bundle-version="[3.7.0,4.0.0)", - org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)", + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)", org.objectweb.asm;bundle-version="[9.1.0,9.2.0)";resolution:=optional, org.eclipse.uml2.codegen.ecore;bundle-version="[1.9.100,3.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)", diff --git a/ge/org.osate.ge/META-INF/MANIFEST.MF b/ge/org.osate.ge/META-INF/MANIFEST.MF index e6c930824f2..f8d13338bfb 100644 --- a/ge/org.osate.ge/META-INF/MANIFEST.MF +++ b/ge/org.osate.ge/META-INF/MANIFEST.MF @@ -21,8 +21,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.115.0,4.0.0)", org.eclipse.jface;bundle-version="[3.18.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", - org.osate.aadl2.instantiation;bundle-version="[1.2.0,2.0.0)", - org.osate.annexsupport;bundle-version="[3.2.0,4.0.0)", + org.osate.aadl2.instantiation;bundle-version="[2.0.0,3.0.0)", + org.osate.annexsupport;bundle-version="[4.0.0,5.0.0)", org.osate.ge.diagram;bundle-version="[2.0.0,3.0.0)", org.eclipse.ltk.ui.refactoring;bundle-version="[3.10.0,4.0.0)", org.eclipse.elk.core;bundle-version="[0.3.0,1.0.0)", From 622bd556a62b3c242aa09705b4f7998a58e7588a Mon Sep 17 00:00:00 2001 From: Joe Seibel <1824701+joeseibel@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:55:23 -0500 Subject: [PATCH 3/5] Updated version. --- core/org.osate.annexsupport/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.osate.annexsupport/pom.xml b/core/org.osate.annexsupport/pom.xml index 4d6a28af3ec..9390f9e03cb 100644 --- a/core/org.osate.annexsupport/pom.xml +++ b/core/org.osate.annexsupport/pom.xml @@ -12,7 +12,7 @@ org.osate org.osate.annexsupport - 3.2.3-SNAPSHOT + 4.0.0-SNAPSHOT eclipse-plugin From 57277eb3e9884fbe13ad280bb36fb1d2a068c82d Mon Sep 17 00:00:00 2001 From: Joe Seibel <1824701+joeseibel@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:59:06 -0500 Subject: [PATCH 4/5] Upgraded manifest for Java 11. --- core/org.osate.annexsupport/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.osate.annexsupport/META-INF/MANIFEST.MF b/core/org.osate.annexsupport/META-INF/MANIFEST.MF index 33317f67f55..b6a8864b830 100644 --- a/core/org.osate.annexsupport/META-INF/MANIFEST.MF +++ b/core/org.osate.annexsupport/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.115.0,4.0.0)", org.osate.aadl2.modelsupport;bundle-version="[6.1.0,7.0.0)", org.osate.xtext.aadl2.properties;bundle-version="[3.1.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.osate.aadl2, org.osate.aadl2.instance, org.osate.aadl2.instance.util, From 9e702b9bd011762f9142dba3cccd292f3bf58782 Mon Sep 17 00:00:00 2001 From: Joe Seibel <1824701+joeseibel@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:59:27 -0500 Subject: [PATCH 5/5] Made errorManager field private. --- .../osate/aadl2/instantiation/AnnexInstantiationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/AnnexInstantiationController.java b/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/AnnexInstantiationController.java index 4cdb00a249d..2e8c8ff9a12 100644 --- a/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/AnnexInstantiationController.java +++ b/core/org.osate.aadl2.instantiation/src/org/osate/aadl2/instantiation/AnnexInstantiationController.java @@ -48,7 +48,7 @@ public class AnnexInstantiationController extends ForAllElement { private Set allAnnexes = new HashSet(); - AnalysisErrorReporterManager errorManager; + private AnalysisErrorReporterManager errorManager; AnnexInstantiationController(AnalysisErrorReporterManager errorManager) { super();