Skip to content

Commit

Permalink
[567448] System Component support (#78)
Browse files Browse the repository at this point in the history 
Change-Id: I1d5cb92d733ab70b44e301915e436f66e0b29a8b
Signed-off-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>

Co-authored-by: Georgiana-Elena ECOBICI <georgiana-elena.ecobici@thalesgroup.com>
  • Loading branch information
@georgiana-e @georgiana-ecobici
georgiana-e and georgiana-ecobici committed Nov 11, 2020
1 parent fbf7704 commit 7670130
Showing 1 changed file with 43 additions and 31 deletions.
74 changes: 43 additions & 31 deletions ....editor/src/org/polarsys/capella/scenario/editor/helper/EmbeddedEditorInstanceHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.polarsys.capella.core.data.cs.Component;
import org.polarsys.capella.core.data.cs.ExchangeItemAllocation;
import org.polarsys.capella.core.data.cs.Part;
import org.polarsys.capella.core.data.ctx.System;
import org.polarsys.capella.core.data.ctx.SystemAnalysis;
import org.polarsys.capella.core.data.epbs.EPBSArchitecture;
import org.polarsys.capella.core.data.fa.AbstractFunction;
Expand All @@ -51,6 +52,7 @@
import org.polarsys.capella.core.data.fa.FunctionalExchange;
import org.polarsys.capella.core.data.information.AbstractEventOperation;
import org.polarsys.capella.core.data.information.AbstractInstance;
import org.polarsys.capella.core.data.information.Partition;
import org.polarsys.capella.core.data.interaction.InstanceRole;
import org.polarsys.capella.core.data.interaction.Scenario;
import org.polarsys.capella.core.data.interaction.ScenarioKind;
Expand Down Expand Up @@ -144,10 +146,10 @@ public static boolean isFEScenario() {
public static boolean isFSScenario() {
return ScenarioExt.isFunctionalScenario(EmbeddedEditorInstance.getAssociatedScenarioDiagram());
}

public static AbstractFunction getSourceFunctionOfExchange(FunctionalExchange exchange) {
FunctionOutputPort source = exchange.getSourceFunctionOutputPort();
if(source != null && source.eContainer() instanceof AbstractFunction) {
if (source != null && source.eContainer() instanceof AbstractFunction) {
return (AbstractFunction) source.eContainer();
}
return null;
Expand All @@ -157,10 +159,10 @@ public static String getSourceFunctionNameOfExchange(FunctionalExchange exchange
AbstractFunction function = getSourceFunctionOfExchange(exchange);
return function != null ? function.getName() : null;
}

public static AbstractFunction getTargetFunctionOfExchange(FunctionalExchange exchange) {
FunctionInputPort target = exchange.getTargetFunctionInputPort();
if(target != null && target.eContainer() instanceof AbstractFunction) {
if (target != null && target.eContainer() instanceof AbstractFunction) {
return (AbstractFunction) target.eContainer();
}
return null;
Expand All @@ -170,7 +172,7 @@ public static String getTargetFunctionNameOfExchange(FunctionalExchange exchange
AbstractFunction function = getTargetFunctionOfExchange(exchange);
return function != null ? function.getName() : null;
}

public static EObject getScenarioLevel() {
Scenario currentScenario = EmbeddedEditorInstance.getAssociatedScenarioDiagram();
return BlockArchitectureExt.getRootBlockArchitecture(currentScenario);
Expand Down Expand Up @@ -347,16 +349,25 @@ private static Collection<? extends EObject> getAvailableAbstractFunctions() {
*
*/
public static Collection<? extends EObject> getAvailableComponents() {
Scenario scenario = EmbeddedEditorInstance.getAssociatedScenarioDiagram();
List<Part> elements = (new InteractionServices())
Scenario scenario = EmbeddedEditorInstance.getAssociatedScenarioDiagram();
List<Part> elements = (new InteractionServices())
.getISScopeInsertComponents(EmbeddedEditorInstance.getAssociatedScenarioDiagram());

for (InstanceRole role : scenario.getOwnedInstanceRoles()) {
if (role.getRepresentedInstance() instanceof Part) {
elements.add((Part) role.getRepresentedInstance());
}
}

BlockArchitecture architecture = BlockArchitectureExt.getRootBlockArchitecture(scenario);
if (architecture instanceof SystemAnalysis) {
System system = ((SystemAnalysis) architecture).getOwnedSystem();
for (Partition part : system.getRepresentingPartitions()) {
if (part instanceof Part) {
elements.add((Part) part);
}
}
}

for (InstanceRole role : scenario.getOwnedInstanceRoles()) {
if (role.getRepresentedInstance() instanceof Part) {
elements.add((Part) role.getRepresentedInstance());
}
}

return elements;
}

Expand All @@ -367,12 +378,12 @@ public static Collection<? extends EObject> getAvailableComponents() {
*
*/
public static Collection<? extends EObject> getAvailableActors() {
Scenario scenario = EmbeddedEditorInstance.getAssociatedScenarioDiagram();
Scenario scenario = EmbeddedEditorInstance.getAssociatedScenarioDiagram();
BlockArchitecture analysis = BlockArchitectureExt.getRootBlockArchitecture(scenario);
if (analysis instanceof OperationalAnalysis) {
return getOESScopeInsertEntitiesRoles(scenario).stream()
.filter(x -> x instanceof Part && ((Part)x).getAbstractType() instanceof OperationalActor)
.collect(Collectors.toList());
return getOESScopeInsertEntitiesRoles(scenario).stream()
.filter(x -> x instanceof Part && ((Part) x).getAbstractType() instanceof OperationalActor)
.collect(Collectors.toList());
}
return (new InteractionServices()).getISScopeInsertActors(scenario);
}
Expand All @@ -384,18 +395,18 @@ public static Collection<? extends EObject> getAvailableActors() {
*
*/
public static Collection<? extends EObject> getAvailableRoles() {
return getOESScopeInsertEntitiesRoles(EmbeddedEditorInstance.getAssociatedScenarioDiagram())
.stream().filter(x -> x instanceof Role).collect(Collectors.toList());
return getOESScopeInsertEntitiesRoles(EmbeddedEditorInstance.getAssociatedScenarioDiagram()).stream()
.filter(x -> x instanceof Role).collect(Collectors.toList());
}

private static Collection<EObject> getOESScopeInsertEntitiesRoles(Scenario scenario) {
Collection<EObject> roots = new ArrayList<EObject>();
roots.addAll(new ScenarioService().getAllMultiInstanceRoleParts(scenario));
BlockArchitecture analysis = BlockArchitectureExt.getRootBlockArchitecture(scenario);
if (analysis instanceof OperationalAnalysis) {
roots.addAll(OperationalAnalysisExt.getAllRoles((OperationalAnalysis) analysis));
}
return roots;
Collection<EObject> roots = new ArrayList<EObject>();
roots.addAll(new ScenarioService().getAllMultiInstanceRoleParts(scenario));
BlockArchitecture analysis = BlockArchitectureExt.getRootBlockArchitecture(scenario);
if (analysis instanceof OperationalAnalysis) {
roots.addAll(OperationalAnalysisExt.getAllRoles((OperationalAnalysis) analysis));
}
return roots;
}

/**
Expand Down Expand Up @@ -678,18 +689,19 @@ public static void refreshAssociatedDiagram() {
public static List<String> getReferencedScenariosName() {
return getReferencedScenarios().stream().map(x -> ((Scenario) x).getName()).collect(Collectors.toList());
}

/*
* Get referenced scenario with the given name
*/
public static Scenario getScenarioWithGivenName(String name) {
List<EObject> referencedScenarios = getReferencedScenarios().stream().filter(x -> ((Scenario) x).getName().equals(name)).collect(Collectors.toList());
List<EObject> referencedScenarios = getReferencedScenarios().stream()
.filter(x -> ((Scenario) x).getName().equals(name)).collect(Collectors.toList());
if (!referencedScenarios.isEmpty()) {
return (Scenario) referencedScenarios.get(0);
}
return null;
}

/*
* Get all possible scenario references
*/
Expand Down

0 comments on commit 7670130

Please sign in to comment.