Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion alisa/org.osate.alisa.common.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion alisa/org.osate.alisa.workbench.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion alisa/org.osate.alisa.workbench/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions alisa/org.osate.assure/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion analyses/org.osate.codegen.checker/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion ba/org.osate.ba/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/org.osate.aadl2.instantiation/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/org.osate.aadl2.instantiation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instantiation</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<String> allAnnexes = new HashSet<String>();

private 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<String> annexes = new HashSet<String>();

if (InstanceUtil.getComponentImplementation(instance, 0, null) != null) {
Expand All @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions core/org.osate.annexsupport/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion core/org.osate.annexsupport/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.osate</groupId>
<artifactId>org.osate.annexsupport</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() {
Expand All @@ -67,4 +80,5 @@ private AnnexInstantiator getInstantiator() {
}
return instantiator;
}

}
14 changes: 7 additions & 7 deletions core/org.osate.build.coverage.report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instance.ui</artifactId>
<version>1.0.10-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand Down Expand Up @@ -302,7 +302,7 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instantiation</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand All @@ -316,7 +316,7 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instance.textual</artifactId>
<version>2.0.9-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand All @@ -330,7 +330,7 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instance.textual.ui</artifactId>
<version>2.0.9-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand All @@ -351,7 +351,7 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.modelsupport</artifactId>
<version>6.0.2-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand Down Expand Up @@ -568,7 +568,7 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.ba</artifactId>
<version>5.1.2-SNAPSHOT</version>
<version>5.1.3-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand All @@ -582,7 +582,7 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.utils</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand Down
14 changes: 7 additions & 7 deletions core/org.osate.help/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instance.textual</artifactId>
<version>2.0.9-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instance.textual.ui</artifactId>
<version>2.0.9-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instance.ui</artifactId>
<version>1.0.10-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.instantiation</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.aadl2.modelsupport</artifactId>
<version>6.0.2-SNAPSHOT</version>
<version>6.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osate</groupId>
Expand Down Expand Up @@ -110,12 +110,12 @@
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.ba.feature</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osate</groupId>
<artifactId>org.osate.utils.feature</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osate</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/org.osate.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
4 changes: 2 additions & 2 deletions core/org.osate.xtext.aadl2.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion core/org.osate.xtext.aadl2/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading