diff --git a/features/org.obeonetwork.capella.m2doc.aql.queries.feature/feature.xml b/features/org.obeonetwork.capella.m2doc.aql.queries.feature/feature.xml index 1e59619..f0e6ce0 100644 --- a/features/org.obeonetwork.capella.m2doc.aql.queries.feature/feature.xml +++ b/features/org.obeonetwork.capella.m2doc.aql.queries.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.obeonetwork.capella.m2doc.aql.queries.feature/pom.xml b/features/org.obeonetwork.capella.m2doc.aql.queries.feature/pom.xml index 51a1d3b..d4ae9ac 100644 --- a/features/org.obeonetwork.capella.m2doc.aql.queries.feature/pom.xml +++ b/features/org.obeonetwork.capella.m2doc.aql.queries.feature/pom.xml @@ -17,10 +17,10 @@ org.obeonetwork.capella.extensions parent ../.. - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT org.obeonetwork.capella.extensions org.obeonetwork.capella.m2doc.aql.queries.feature - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT eclipse-feature diff --git a/features/org.obeonetwork.capella.m2doc.commandline.feature/feature.xml b/features/org.obeonetwork.capella.m2doc.commandline.feature/feature.xml index 698cd77..a2ce802 100644 --- a/features/org.obeonetwork.capella.m2doc.commandline.feature/feature.xml +++ b/features/org.obeonetwork.capella.m2doc.commandline.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.obeonetwork.capella.m2doc.commandline.feature/pom.xml b/features/org.obeonetwork.capella.m2doc.commandline.feature/pom.xml index de57c62..011fa25 100644 --- a/features/org.obeonetwork.capella.m2doc.commandline.feature/pom.xml +++ b/features/org.obeonetwork.capella.m2doc.commandline.feature/pom.xml @@ -17,10 +17,10 @@ org.obeonetwork.capella.extensions parent ../.. - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT org.obeonetwork.capella.extensions org.obeonetwork.capella.m2doc.commandline.feature - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT eclipse-feature diff --git a/plugins/org.obeonetwork.capella.m2doc.aql.queries/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.capella.m2doc.aql.queries/META-INF/MANIFEST.MF index a37815f..f8d8d14 100644 --- a/plugins/org.obeonetwork.capella.m2doc.aql.queries/META-INF/MANIFEST.MF +++ b/plugins/org.obeonetwork.capella.m2doc.aql.queries/META-INF/MANIFEST.MF @@ -2,25 +2,25 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.obeonetwork.capella.m2doc.aql.queries;singleton:=true -Bundle-Version: 6.1.0.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Activator: org.obeonetwork.capella.m2doc.aql.queries.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, - org.polarsys.capella.common;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.gen;bundle-version="[6.1.0,6.1.1)", + org.polarsys.capella.common;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.gen;bundle-version="[7.0.0,7.1.0)", org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui, org.eclipse.emf.common.ui;bundle-version="[2.7.0,3.0.0)", org.obeonetwork.m2doc.ide;bundle-version="[3.0.0,4.0.0)", org.eclipse.acceleo.annotations;bundle-version="[5.0.1,8.0.0)", - org.polarsys.capella.core.data.helpers;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.libraries;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.model.helpers;bundle-version="[6.1.0,6.1.1)", + org.polarsys.capella.core.data.helpers;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.libraries;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.model.helpers;bundle-version="[7.0.0,7.1.0)", org.eclipse.acceleo.query, - org.polarsys.capella.core.sirius.analysis;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.re.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.semantic.queries;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.re.gen;bundle-version="[6.1.0,6.1.1)" + org.polarsys.capella.core.sirius.analysis;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.re.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.semantic.queries;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.re.gen;bundle-version="[7.0.0,7.1.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName diff --git a/plugins/org.obeonetwork.capella.m2doc.aql.queries/plugin.xml b/plugins/org.obeonetwork.capella.m2doc.aql.queries/plugin.xml index f9eb56a..97fed98 100644 --- a/plugins/org.obeonetwork.capella.m2doc.aql.queries/plugin.xml +++ b/plugins/org.obeonetwork.capella.m2doc.aql.queries/plugin.xml @@ -318,70 +318,67 @@ class="org.polarsys.capella.core.data.helpers.ctx.services.MissionExt"> + uri="http://www.polarsys.org/capella/core/ctx/7.0.0"> + uri="http://www.polarsys.org/capella/core/core/7.0.0"> + uri="http://www.polarsys.org/capella/core/modeller/7.0.0"> + uri="http://www.polarsys.org/capella/core/information/7.0.0"> + uri="http://www.polarsys.org/capella/common/behavior/7.0.0"> + uri="http://www.polarsys.org/capella/core/fa/7.0.0"> + uri="http://www.polarsys.org/capella/core/oa/7.0.0"> + uri="http://www.polarsys.org/capella/core/information/datavalue/7.0.0"> + uri="http://www.polarsys.org/capella/core/epbs/7.0.0"> + uri="http://www.polarsys.org/capella/common/activity/7.0.0"> + uri="http://www.polarsys.org/capella/common/re/7.0.0"> + uri="http://www.polarsys.org/capella/core/interaction/7.0.0"> + uri="http://www.polarsys.org/capella/core/information/communication/7.0.0"> + uri="http://www.polarsys.org/capella/core/la/7.0.0"> + uri="http://www.polarsys.org/capella/core/information/datatype/7.0.0"> + uri="http://www.polarsys.org/capella/core/pa/7.0.0"> + uri="http://www.polarsys.org/capella/core/cs/7.0.0"> + uri="http://www.polarsys.org/capella/common/core/7.0.0"> + uri="http://www.polarsys.org/capella/core/sharedmodel/7.0.0"> + uri="http://www.polarsys.org/capella/core/common/7.0.0"> - - + uri="http://www.polarsys.org/capella/core/pa/deployment/7.0.0"> @@ -515,9 +512,6 @@ - - diff --git a/plugins/org.obeonetwork.capella.m2doc.aql.queries/pom.xml b/plugins/org.obeonetwork.capella.m2doc.aql.queries/pom.xml index 4d0581c..6f17ca7 100644 --- a/plugins/org.obeonetwork.capella.m2doc.aql.queries/pom.xml +++ b/plugins/org.obeonetwork.capella.m2doc.aql.queries/pom.xml @@ -17,11 +17,11 @@ org.obeonetwork.capella.extensions parent ../.. - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT org.obeonetwork.capella.extensions org.obeonetwork.capella.m2doc.aql.queries - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT eclipse-plugin @@ -31,7 +31,7 @@ - + diff --git a/plugins/org.obeonetwork.capella.m2doc.aql.queries/src/org/obeonetwork/capella/m2doc/aql/queries/SemanticBrowserServices.java b/plugins/org.obeonetwork.capella.m2doc.aql.queries/src/org/obeonetwork/capella/m2doc/aql/queries/SemanticBrowserServices.java index 3336048..91a7126 100644 --- a/plugins/org.obeonetwork.capella.m2doc.aql.queries/src/org/obeonetwork/capella/m2doc/aql/queries/SemanticBrowserServices.java +++ b/plugins/org.obeonetwork.capella.m2doc.aql.queries/src/org/obeonetwork/capella/m2doc/aql/queries/SemanticBrowserServices.java @@ -123,7 +123,6 @@ import org.polarsys.capella.core.data.oa.Role; import org.polarsys.capella.core.data.pa.PhysicalComponent; import org.polarsys.capella.core.data.pa.PhysicalFunction; -import org.polarsys.capella.core.data.requirement.Requirement; import org.polarsys.kitalpha.emde.model.Element; /** @@ -352,23 +351,6 @@ public List getAppliedPropertyValueGroups(CapellaElement val .compute(value)); } - // @formatter:off - @Documentation( - value = "Returns the Sequence of requirements for the given CapellaElement.", - params = { - @Param(name = "value", value = "the CapellaElement") - }, - result = "the Sequence of requirements for the given CapellaElement", - examples = { - @Example(expression = "myCapellaElement.getRequirements()", result = "the Sequence of requirements for the given CapellaElement"), - } - ) - // @formatter:on - public List getRequirements(CapellaElement value) { - return castList(new org.polarsys.capella.core.semantic.queries.basic.queries.CapellaElement_requirement() - .compute(value)); - } - // @formatter:off @Documentation( value = "Returns the Sequence of applied property values for the given CapellaElement.", @@ -2561,24 +2543,6 @@ public List getDeployedPhysicalComponents(PhysicalComponent value) { .compute(value)); } - // @formatter:off - @Documentation( - value = "Returns the Sequence of incoming physical links for the given PhysicalComponent.", - params = { - @Param(name = "value", value = "the PhysicalComponent") - }, - result = "the Sequence of incoming physical links for the given PhysicalComponent", - examples = { - @Example(expression = "myPhysicalComponent.getIncomingPhysicalLinks()", result = "the Sequence of incoming physical links for the given PhysicalComponent"), - } - ) - // @formatter:on - public List getIncomingPhysicalLinks(PhysicalComponent value) { - return castList( - new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalComponent_IncomingPhysicalLinks() - .compute(value)); - } - // @formatter:off @Documentation( value = "Returns the Sequence of allocated physical functions for the given PhysicalComponent.", @@ -2648,24 +2612,6 @@ public List getRealizingComponents(PhysicalComponent value) { .compute(value)); } - // @formatter:off - @Documentation( - value = "Returns the Sequence of outgoing physical links for the given PhysicalComponent.", - params = { - @Param(name = "value", value = "the PhysicalComponent") - }, - result = "the Sequence of outgoing physical links for the given PhysicalComponent", - examples = { - @Example(expression = "myPhysicalComponent.getOutgoingPhysicalLinks()", result = "the Sequence of outgoing physical links for the given PhysicalComponent"), - } - ) - // @formatter:on - public List getOutgoingPhysicalLinks(PhysicalComponent value) { - return castList( - new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalComponent_OutgoingPhysicalLinks() - .compute(value)); - } - // @formatter:off @Documentation( value = "Returns the Sequence of deploying physical components for the given PhysicalComponent.", @@ -3064,23 +3010,6 @@ public List getCategories(PhysicalLink value) { new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalLinkCategories().compute(value)); } - // @formatter:off - @Documentation( - value = "Returns the Sequence of physical links ends for the given PhysicalLink.", - params = { - @Param(name = "value", value = "the PhysicalLink") - }, - result = "the Sequence of physical links ends for the given PhysicalLink", - examples = { - @Example(expression = "myPhysicalLink.getPhysicalLinkEnds()", result = "the Sequence of physical links ends for the given PhysicalLink"), - } - ) - // @formatter:on - public List getPhysicalLinkEnds(PhysicalLink value) { - return castList(new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalLinkSourceAndTarget() - .compute(value)); - } - // @formatter:off @Documentation( value = "Returns the Sequence of realizing configuration items for the given PhysicalLink.", @@ -3307,23 +3236,6 @@ public List getOutgoingDelegations(PhysicalPort value) { .compute(value)); } - // @formatter:off - @Documentation( - value = "Returns the Sequence of physical links for the given PhysicalPort.", - params = { - @Param(name = "value", value = "the PhysicalPort") - }, - result = "the Sequence of physical links for the given PhysicalPort", - examples = { - @Example(expression = "myPhysicalPort.getPhysicalLinks()", result = "the Sequence of physical links for the given PhysicalPort"), - } - ) - // @formatter:on - public List getPhysicalLinks(PhysicalPort value) { - return castList(new org.polarsys.capella.core.semantic.queries.basic.queries.PhysicalPortIncomingPhysicalLinks() - .compute(value)); - } - // @formatter:off @Documentation( value = "Returns the Sequence of realizing configuration items for the given PhysicalPort.", @@ -3833,23 +3745,6 @@ public List getSource(Trace value) { .compute(value)); } - // @formatter:off - @Documentation( - value = "Returns the Sequence of traced elements for the given Requirement.", - params = { - @Param(name = "value", value = "the Requirement") - }, - result = "the Sequence of traced elements for the given Requirement", - examples = { - @Example(expression = "myRequirement.getTracedElements()", result = "the Sequence of traced elements for the given Requirement"), - } - ) - // @formatter:on - public List getTracedElements(Requirement value) { - return castList(new org.polarsys.capella.core.semantic.queries.basic.queries.RequirementTracedElements() - .compute(value)); - } - // @formatter:off @Documentation( value = "Returns the Sequence of functional echanges for the given ExchangeCategory.", diff --git a/plugins/org.obeonetwork.capella.m2doc.commandline/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.capella.m2doc.commandline/META-INF/MANIFEST.MF index 585dcb8..bd87417 100644 --- a/plugins/org.obeonetwork.capella.m2doc.commandline/META-INF/MANIFEST.MF +++ b/plugins/org.obeonetwork.capella.m2doc.commandline/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.obeonetwork.capella.m2doc.commandline;singleton:=true -Bundle-Version: 6.1.0.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, - org.polarsys.capella.core.commandline.core;bundle-version="[6.1.0,6.1.1)", + org.polarsys.capella.core.commandline.core;bundle-version="[7.0.0,7.1.0)", org.obeonetwork.m2doc;bundle-version="[3.1.0,4.0.0)", org.obeonetwork.m2doc.genconf;bundle-version="[3.1.0,4.0.0)", org.obeonetwork.m2doc.ide;bundle-version="[3.0.0,4.0.0)", diff --git a/plugins/org.obeonetwork.capella.m2doc.commandline/pom.xml b/plugins/org.obeonetwork.capella.m2doc.commandline/pom.xml index 75bc377..26d8e97 100644 --- a/plugins/org.obeonetwork.capella.m2doc.commandline/pom.xml +++ b/plugins/org.obeonetwork.capella.m2doc.commandline/pom.xml @@ -17,10 +17,10 @@ org.obeonetwork.capella.extensions parent ../.. - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT org.obeonetwork.capella.extensions org.obeonetwork.capella.m2doc.commandline - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT eclipse-plugin diff --git a/pom.xml b/pom.xml index 01d1c77..24f9abf 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.obeonetwork.capella.extensions parent - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT pom diff --git a/releng/org.obeonetwork.capella.target/capella-extensions-SDK.target b/releng/org.obeonetwork.capella.target/capella-extensions-SDK.target index 46c31d4..58c219b 100644 --- a/releng/org.obeonetwork.capella.target/capella-extensions-SDK.target +++ b/releng/org.obeonetwork.capella.target/capella-extensions-SDK.target @@ -1,7 +1,7 @@ - + @@ -10,15 +10,33 @@ - + + + + + + + + + + + + + + + + + + + - + - - + + @@ -29,69 +47,53 @@ - + + - - - - - - - - - - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -104,7 +106,7 @@ - + @@ -129,12 +131,12 @@ - + - + @@ -142,24 +144,24 @@ - + - + - + - + - + @@ -167,7 +169,7 @@ - + @@ -181,11 +183,11 @@ - + - - + + diff --git a/releng/org.obeonetwork.capella.target/capella-extensions.target b/releng/org.obeonetwork.capella.target/capella-extensions.target index cdf4827..e600ead 100644 --- a/releng/org.obeonetwork.capella.target/capella-extensions.target +++ b/releng/org.obeonetwork.capella.target/capella-extensions.target @@ -1,7 +1,7 @@ - + @@ -10,15 +10,33 @@ - + + + + + + + + + + + + + + + + + + + - + - - + + @@ -29,69 +47,53 @@ - + + - - - - - - - - - - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -104,7 +106,7 @@ - + @@ -129,12 +131,12 @@ - + - + @@ -142,24 +144,24 @@ - + - + - + - + - + @@ -167,7 +169,7 @@ - + @@ -181,11 +183,11 @@ - + - - + + diff --git a/releng/org.obeonetwork.capella.target/capella-extensions.tpd b/releng/org.obeonetwork.capella.target/capella-extensions.tpd index 785bda5..e70cedc 100644 --- a/releng/org.obeonetwork.capella.target/capella-extensions.tpd +++ b/releng/org.obeonetwork.capella.target/capella-extensions.tpd @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2023 Obeo. + * Copyright (c) 2017, 2024 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -12,7 +12,7 @@ target "Capella M2Doc Extension" with requirements -include "https://raw.githubusercontent.com/ObeoNetwork/M2Doc/master/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.1.0/m2doc-capella-6.1.0.tpd" +include "https://raw.githubusercontent.com/ObeoNetwork/M2Doc/master/releng/org.obeonetwork.m2doc.targetplatforms/capella-7.0.0/m2doc-capella-7.0.0.tpd" location "https://s3-eu-west-1.amazonaws.com/obeo-m2doc-releases/master/nightly/repository/" { org.obeonetwork.m2doc.feature.feature.group lazy diff --git a/releng/org.obeonetwork.capella.update.full/category.xml b/releng/org.obeonetwork.capella.update.full/category.xml index 68a653b..b9b4468 100644 --- a/releng/org.obeonetwork.capella.update.full/category.xml +++ b/releng/org.obeonetwork.capella.update.full/category.xml @@ -30,24 +30,25 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + diff --git a/releng/org.obeonetwork.capella.update.full/pom.xml b/releng/org.obeonetwork.capella.update.full/pom.xml index 6718e2a..10861bb 100644 --- a/releng/org.obeonetwork.capella.update.full/pom.xml +++ b/releng/org.obeonetwork.capella.update.full/pom.xml @@ -17,13 +17,13 @@ org.obeonetwork.capella.extensions parent - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT ../../ org.obeonetwork.capella.update.full eclipse-repository - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT diff --git a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/META-INF/MANIFEST.MF b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/META-INF/MANIFEST.MF index d07518c..9b5763f 100644 --- a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/META-INF/MANIFEST.MF +++ b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2Doc integration plugin for Capella Bundle-SymbolicName: org.obeonetwork.capella.m2doc.aql.queries.tests -Bundle-Version: 6.1.0.qualifier +Bundle-Version: 7.0.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.polarsys.capella.common;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.gen;bundle-version="[6.1.0,6.1.1)", + org.polarsys.capella.common;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.gen;bundle-version="[7.0.0,7.1.0)", org.obeonetwork.capella.m2doc.aql.queries, org.junit;bundle-version="4.0.0", org.obeonetwork.m2doc.tests, @@ -16,180 +16,179 @@ Require-Bundle: org.eclipse.ui, org.apache.poi, org.eclipse.acceleo.query, org.obeonetwork.m2doc.ide, - org.polarsys.capella.commandline.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.data.activity.gen.edit;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.data.behavior.gen.edit;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.data.core.gen.edit;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.data.helpers;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.flexibility.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.flexibility.wizards;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.id.handler;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.libraries;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.libraries.gen;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.libraries.gen.edit;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.linkedtext.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.menu.dynamic;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.platform.eclipse.tools.report.console;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.platform.eclipse.tools.report.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.platform.sirius.customization;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.queries;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.re;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.re.gen;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.re.gen.edit;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.re.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.tools.report.appenders.console;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.tools.report.appenders.file;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.tools.report.appenders.reportlogview;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.tools.report.appenders.usage;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.tools.report.appenders.usage.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.tools.report.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.transition;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui.massactions;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui.massactions.core;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui.massactions.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui.menu.dynamic;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui.resources;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui.services;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui.toolkit;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.common.ui.toolkit.browser;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.af.integration;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.af.integration.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.application;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.commandline.core;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.commandline.core.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.compare;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.business.queries;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.common.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.common.ui.quickfix;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.common.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.core.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.core.ui.quickfix;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.core.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.cs.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.cs.ui.quickfix;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.cs.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.ctx.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.ctx.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.epbs.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.epbs.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.fa.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.fa.ui.quickfix;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.fa.ui.wizards;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.fa.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.gen.edit;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.gen.edit.decorators;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.gen.editor;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.helpers;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.information.communication.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.information.communication.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.information.datatype.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.information.datatype.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.information.datavalue.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.information.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.information.ui.quickfix;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.information.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.interaction.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.interaction.ui.quickfix;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.interaction.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.la.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.la.ui.wizards;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.la.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.menu.contributions;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.migration;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.modeller.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.oa.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.oa.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.pa.deployment.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.pa.deployment.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.pa.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.pa.ui.quickfix;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.pa.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.requirement.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.selection.queries;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.data.sharedmodel.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.diagram.helpers;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.explorer.activity.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.explorer.activity.ui.richtext;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.flexibility.wizards;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.libraries;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.libraries.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.linkedtext.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.menu.dynamic;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.model.handler;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.model.helpers;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.model.links.helpers;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.model.obfuscator;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.model.preferences;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.model.semantic;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.model.skeleton;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.eclipse.ui.trace;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.adapter;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.clipboard;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.sirius.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.ui.actions;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.ui.menu;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.ui.navigator;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.ui.perspective;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.ui.project;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.platform.sirius.ui.services;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.preferences;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.preferences.project.configuration;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.projection.common;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.projection.common.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.projection.exchanges;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.projection.interfaces;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.projection.scenario;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.re;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.re.project;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.re.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.re.ui.quickfix;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.re.updateconnections.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.re.updateconnections.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.re.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.semantic.queries;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.services;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.sirius.analysis;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.sirius.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.tiger;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.transition.common.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.transition.diagram;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.transition.diagram.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.transition.system;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.transition.system.topdown;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.transition.system.topdown.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.transition.system.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.fastlinker;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.intro;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.metric;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.properties;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.properties.richtext;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.reportlog;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.resources;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.search;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.semantic.browser;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.semantic.browser.sirius;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.ui.toolkit;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.validation;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.validation.commandline;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.validation.ui;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.core.validation.ui.ide;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.detachment.propertyvalue;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.detachment.version.precondition;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.developer.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.diagrams.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.diffmerge.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.preferences.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.properties.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.re.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.shared.id.handler;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.th.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.tipsandtricks.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.transitions.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.ui.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.validation.doc;bundle-version="[6.1.0,6.1.1)", - org.polarsys.capella.viewpoint.doc;bundle-version="[6.1.0,6.1.1)", + org.polarsys.capella.commandline.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.data.activity.gen.edit;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.data.behavior.gen.edit;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.data.core.gen.edit;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.data.helpers;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.flexibility.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.flexibility.wizards;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.id.handler;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.libraries;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.libraries.gen;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.libraries.gen.edit;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.linkedtext.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.menu.dynamic;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.platform.eclipse.tools.report.console;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.platform.eclipse.tools.report.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.platform.sirius.customization;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.queries;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.re;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.re.gen;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.re.gen.edit;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.re.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.tools.report.appenders.console;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.tools.report.appenders.file;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.tools.report.appenders.reportlogview;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.tools.report.appenders.usage;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.tools.report.appenders.usage.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.tools.report.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.transition;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui.massactions;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui.massactions.core;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui.massactions.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui.menu.dynamic;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui.resources;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui.services;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui.toolkit;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.common.ui.toolkit.browser;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.af.integration;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.af.integration.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.application;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.commandline.core;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.commandline.core.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.compare;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.business.queries;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.common.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.common.ui.quickfix;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.common.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.core.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.core.ui.quickfix;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.core.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.cs.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.cs.ui.quickfix;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.cs.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.ctx.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.ctx.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.epbs.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.epbs.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.fa.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.fa.ui.quickfix;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.fa.ui.wizards;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.fa.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.gen.edit;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.gen.edit.decorators;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.gen.editor;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.helpers;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.information.communication.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.information.communication.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.information.datatype.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.information.datatype.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.information.datavalue.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.information.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.information.ui.quickfix;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.information.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.interaction.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.interaction.ui.quickfix;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.interaction.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.la.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.la.ui.wizards;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.la.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.menu.contributions;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.migration;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.modeller.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.oa.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.oa.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.pa.deployment.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.pa.deployment.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.pa.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.pa.ui.quickfix;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.pa.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.selection.queries;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.data.sharedmodel.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.diagram.helpers;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.explorer.activity.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.explorer.activity.ui.richtext;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.flexibility.wizards;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.libraries;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.libraries.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.linkedtext.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.menu.dynamic;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.model.handler;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.model.helpers;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.model.links.helpers;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.model.obfuscator;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.model.preferences;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.model.semantic;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.model.skeleton;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.eclipse.ui.trace;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.adapter;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.clipboard;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.sirius.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.ui.actions;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.ui.menu;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.ui.navigator;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.ui.perspective;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.ui.project;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.platform.sirius.ui.services;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.preferences;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.preferences.project.configuration;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.projection.common;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.projection.common.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.projection.exchanges;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.projection.interfaces;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.projection.scenario;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.re;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.re.project;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.re.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.re.ui.quickfix;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.re.updateconnections.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.re.updateconnections.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.re.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.semantic.queries;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.services;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.sirius.analysis;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.sirius.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.tiger;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.transition.common.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.transition.diagram;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.transition.diagram.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.transition.system;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.transition.system.topdown;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.transition.system.topdown.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.transition.system.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.fastlinker;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.intro;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.metric;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.properties;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.properties.richtext;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.reportlog;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.resources;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.search;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.semantic.browser;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.semantic.browser.sirius;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.ui.toolkit;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.validation;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.validation.commandline;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.validation.ui;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.core.validation.ui.ide;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.detachment.propertyvalue;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.detachment.version.precondition;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.developer.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.diagrams.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.diffmerge.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.preferences.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.properties.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.re.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.shared.id.handler;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.th.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.tipsandtricks.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.transitions.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.ui.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.validation.doc;bundle-version="[7.0.0,7.1.0)", + org.polarsys.capella.viewpoint.doc;bundle-version="[7.0.0,7.1.0)", org.obeonetwork.m2doc.html, org.obeonetwork.m2doc.html.ide Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/pom.xml b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/pom.xml index 89a3953..a77d405 100644 --- a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/pom.xml +++ b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/pom.xml @@ -17,12 +17,12 @@ org.obeonetwork.capella.extensions parent ../.. - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT org.obeonetwork.capella.extensions org.obeonetwork.capella.m2doc.aql.queries.tests - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT eclipse-test-plugin diff --git a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/In-Flight Entertainment System.afm b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/In-Flight Entertainment System.afm index d8cac65..313ec99 100644 --- a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/In-Flight Entertainment System.afm +++ b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/In-Flight Entertainment System.afm @@ -1,4 +1,4 @@ - + diff --git a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/In-Flight Entertainment System.capella b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/In-Flight Entertainment System.capella index 40a600f..308fd0b 100644 --- a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/In-Flight Entertainment System.capella +++ b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/LA-Complete/In-Flight Entertainment System.capella @@ -1,25 +1,24 @@ - + + description="<p><strong><font size="4">Operational Analysis</font></strong></p> <p>Several stakeholders have relationships with the IFE system, they all have different goals.&nbsp;The focus is put here&nbsp;on the operational needs the IFE system will somehow contribute to. <strong>What is the precise scope or content of the IFE system is not&nbsp;elicited yet at this stage</strong>.</p> <p>Discover the entities and their goals in his the operational capabilities diagram: <a href="hlink://_pmRnML2HEeSzuJ_4_7XgLw/">[OCB] Operational Capabilities</a>.</p> <p>Operational Architecture Diagrams provide a&nbsp;comprehensive view of the activities performed by the entities in order to reach their goals.</p> <ul> <li><a href="hlink://_xgO34LIUEeSVmfu1BIQISw/">[OAB] High-Level Expected Activities</a></li> <li>And its refined version <a href="hlink://_vQXrkLNoEeSVmfu1BIQISw/">[OAB] All Operational Activities and Entities</a></li> </ul> <p>The different phases of a flight&nbsp;are described in&nbsp;<a href="hlink://_-czpoPhUEeyYD7A3qrV3tA">[MSM] Aircraft Flying Phases</a> and their sequence in <a href="hlink://_VBob4LNqEeSVmfu1BIQISw/">[OES] Flight Phases</a>.</p> <p><font size="4"><strong>System Need Analysis</strong></font></p> <p>The focus here is put on the IFE system itself. <strong>The objective is to set the boundaries and provide a clear vision of the need</strong>.</p> <p>The <a href="hlink://_Q3xl4JTyEeSgObsjQ4XNVQ/">[MCB] All Missions and Capabilities</a> diagram&nbsp;shows on the capabilities of the IFE system. Three other diagrams provide interesting entry points to the model:</p> <ul> <li><a href="hlink://_LzrP8LclEd6PZMYM-Vvo5g/">[SC] System Actors</a>&nbsp;lists all the Actors (the aircraft is considered as an actor)</li> <li><a href="hlink://_gaN78KyfEeSJ1PX7slxG4w/">[SDFB] Top Level Functional Overview</a>&nbsp;provides a first functional overview of what the actors actually do and what kind of exchanges they have with the IFE system</li> <li><a href="hlink://_xXSwEKv6EeSTJvLsyJitsw/">[SAB] Top Level System Overview</a>&nbsp;and its&nbsp;slightly refined version <a href="hlink://_TGdI0JZDEeS1n7CBuZtEDQ/">[SAB] High Level System Overview</a>&nbsp;are <strong>very good entry points to further navigate in the model</strong>.</li> </ul> <p>Starting from these high level diagrams,&nbsp;a typical&nbsp;reading path&nbsp;is to dive into the function to visualize their refinement. For example, <a href="hlink://_Z-lO8LC1EeSAOqSI-4duBg/">[SDFB] [CTX] Run Services</a>. And recursively.</p> <p><strong>Using capabilities as a&nbsp;driver to browse the model is recommended</strong>. Some diagrams are specifically marked for that purpose, for instance <a href="hlink://_EsbcMLKzEeSZM9DbsSoyxw/">[SDFB] [CAPABILITY] Provide Video Entertainment Services</a>. From this capability covering VOD services to the passengers,&nbsp;browse the functional chains and scenarios to better understand how the capability is fulfilled.</p> <ul> <li>Functional chains: <a href="hlink://_MOb7kJjJEeSFKIU85IonOQ/">[SFCD] Start Playing VOD Movie</a>, <a href="hlink://_m1AKgJjJEeSFKIU85IonOQ/">[SFCD] Resume VOD Movie</a></li> <li>Scenarios: <a href="hlink://_CekP8JWHEeSAToX6gykiew/">[ES] Start VOD Service</a>, <a href="hlink://_bkAKcLD-EeSk6sURco8jXw/">[ES] Start Playing VOD Movie</a></li> </ul> <p>Check the global mode machine of the system with <a href="hlink://_ZlrrsPhmEeyYD7A3qrV3tA">[MSM] IFE Operating Modes</a>. Among others, this mode machine is intended to specify under which operational conditions the IFE system is running. Another Mode machine is specifically modelled for what will become the Seat TV: <a href="hlink://_ZHdlAPhuEeyYD7A3qrV3tA">[MSM] Seat TV - Movie Player Modes</a></p> <p><font size="4"><strong>Logical Architecture</strong></font></p> <p>The Logical Architecture provides an intermediate design, hiding some of the implementation-dependent complexity.</p> <p>The main architectural drivers&nbsp;are explained in&nbsp;the <a href="hlink://_3blN8KK2Ed6k26nfEmjK4A/">[LCBD] Architecture Drivers</a>&nbsp;diagram.&nbsp;&nbsp;Another global view of the logical components is provided by <a href="hlink://_IGYnAKCeEeStTrLYjHtDEw/">[LAB] IFE System - All Components, CEs</a></p> <p>Among others, the refined functional analysis is detailed in the following dataflow diagrams (<a href="hlink://_1Vd9AK5DEeS_aaAwMjKXtQ/">[LDFB] Top Level Functions</a>&nbsp;being an entry point):</p> <ul> <li><a href="hlink://_DHcNsLbMEeS6m7-8Vqqevw/">[LDFB] [CTX] Provide Aircraft Interface</a>&nbsp;explains the functional interfacing with the aircraft (the idea being to&nbsp;isolate these functions in an easily replaceable component to ease the integration of the IFE system in different aircrafts)</li> <li><a href="hlink://_lekjcK8MEeSUHuFYXP_oBw/">[LDFB] [CTX] Manage Audio and Video Diffusion</a>&nbsp;refines&nbsp;how audio&nbsp;and video request&nbsp;are processed. <ul> <li><a href="hlink://_myvsAJvPEeSmFu1YEE0geA/">[LDFB] [CTX] Process Audio Video Requests</a>&nbsp;distinguishes between VOD and imposed videos requests</li> <li><a href="hlink://_tMgXkJ2JEeSiIpoNkuyYwA/">[LDFB] [CTX] Broadcast Stored Audio Video Streams</a>&nbsp;describes the broadcast initialization of content coming from the digital media library</li> <li><a href="hlink://_Lhea0J2eEeSiIpoNkuyYwA/">[LDFB] [CTX] Display Video and Play Audio</a>&nbsp;describes how the different media streams are actually rendered</li> </ul> </li> </ul> <p>The allocation of functions to components is exhaustively described in <a href="hlink://_DmXfwKPQEeSgDIOKB3Rd0g/">[LAB] [BUILD] Template</a>. Functional&nbsp;chains and scenarios&nbsp;are refined.</p> <ul> <li>Functional chains <ul> <li><a href="hlink://_nKr5wLeNEeSJrshmHo2mKA/">[LAB][CTX] Broadcast Audio Announcement FC</a>&nbsp;(equivalent to <a href="hlink://_7eoQ4LeJEeSJrshmHo2mKA/">[LFCD] Broadcast Audio Announcement</a>)</li> <li><a href="hlink://_Hq4jALMDEeSGuvnnapXBhA/">[LAB][CTX] Start Playing VOD Movie FC</a>&nbsp; (equivalent to <a href="hlink://_IjNiALFqEeSsWZm7HcO6OQ/">[LFCD] Start Playing VOD Movie</a>)</li> </ul> </li> <li>Scenarios <ul> <li><a href="hlink://_FremALbzEeSpk5KlhVegeg/">[ES] Perform Audio Announcement</a></li> <li><a href="hlink://_KwN4gLUBEeSkIeuLucFPKA/">[ES] Start Playing VOD Movie</a></li> </ul> </li> </ul> <p>A (partial) data model is defined&nbsp;to support the &quot;Start Playing VOD Movie&quot; functional chain. Data and exchanged items are detailed in <a href="hlink://_nlZU8LZ-EeS6m7-8Vqqevw/">[CDB] Play Video Movie - Logical</a>.</p> <p><strong><font size="4">Physical Architecture</font></strong></p> <p>The Physical&nbsp;Architecture describes how the system will be built.</p> <p><a href="hlink://_6Rra8KQUEeSgDIOKB3Rd0g/">[PAB] Implementation and Behaviour Components</a>&nbsp;provides an exhaustive view of all physical components. Separate views are available in the breakdown diagrams:</p> <ul> <li><a href="hlink://_W5gMUKC6EeStTrLYjHtDEw/">[PCBD] Implementation Components</a></li> <li><a href="hlink://_o27AcKO1EeSgDIOKB3Rd0g/">[PCBD] Behavioural Components</a></li> </ul> <p>The allocation of functions to components is exhaustively described in <a href="hlink://_scrm8LB-EeSflp4pxI7U0A/">[PAB] [BUILD] Template</a>. Streaming topics are refined and described in the following dataflow and architecture diagrams:</p> <ul> <li><a href="hlink://_mMpGsLBGEeSnJaHm1OLKKw/">[PDFB] [CTX] Broadcast Stored Audio and Video Streams</a></li> <li><a href="hlink://_1EA74LBMEeSnJaHm1OLKKw/">[PDFB] [CTX] Play Video Stream on Seat TV</a></li> <li><a href="hlink://_VA5TELPNEeS7E-n173v5iw/">[PAB] [CTX] Start Playing VOD Movie FC</a></li> </ul> <p>Network topics are only slightly covered in this model.</p> <ul> <li>Usage of REC-RPL mechanisms to replicate network adapters</li> <li style="list-style-type: none;"> <ul> <li><a href="hlink://_xyaY8KYfEeSAVrf1rjnX4A/">REC - Unit Network Adapter</a>&nbsp;describes the REC (i.e.what will be replicated)</li> <li><a href="hlink://_BV6mQKYkEeSAVrf1rjnX4A/">RPL - Instantiations of Unit Network Adapter</a>&nbsp;describes the three RPLs (replicas).</li> <li>The connection between RPLs&nbsp;is detailed in <a href="hlink://_x1ARYKYIEeSAVrf1rjnX4A/">[PAB] Focus on Network Setup, Configuration and Tests</a></li> </ul> </li> <li>The transport of data from one connected equipment to another is described in this diagram: <a href="hlink://_EWMNsLkaEeSBQ7y8sEdlcw/">[PAB] Focus on Network Transport</a></li> </ul> <p>The data model related to the &quot;Start Playing VOD Movie&quot; functional chain is refined in <a href="hlink://_Snq1oLkiEeSBQ7y8sEdlcw/">[CDB] Play Video Movie - Physical</a></p> <p><strong><font size="4">End-Product Breakdown Structure</font></strong></p> <p>The EPBS architecture is minimal in this model. The <a href="hlink://_pEpUcLtQEeS87cs0yOXuuQ/">[EAB] Configuration Items and Realized Artefacts</a>&nbsp;diagram indicates how physical components, ports and links are allocated to configuration items.</p> "> + id="e12de7af-bf77-4c43-9f7c-03404be33a29" name="Operational Analysis" description="<p>Several stakeholders have relationships with the IFE system, they all have different goals.&nbsp;The focus is put here&nbsp;on the operational needs the IFE system will somehow contribute to. <strong>What is the precise scope or content of the IFE system is not&nbsp;elicited yet at this stage</strong>.</p> <p>Discover the entities and their goals in his the operational capabilities diagram: <a href="hlink://_pmRnML2HEeSzuJ_4_7XgLw/"><font color="#0066cc">[OCB] Operational Capabilities</font></a>.</p> <p>Operational Architecture Diagrams provide a&nbsp;comprehensive view of the activities performed by the entities in order to reach their goals.</p> <ul> <li><a href="hlink://_xgO34LIUEeSVmfu1BIQISw/"><font color="#0066cc">[OAB] High-Level Expected Activities</font></a></li> <li>And its refined version <a href="hlink://_vQXrkLNoEeSVmfu1BIQISw/"><font color="#0066cc">[OAB] All Operational Activities and Entities</font></a></li> </ul> <p>The different phases of a flight&nbsp;are described in&nbsp;<a href="hlink://_-czpoPhUEeyYD7A3qrV3tA">[MSM] Aircraft Flying Phases</a> and their sequence in <a href="hlink://_VBob4LNqEeSVmfu1BIQISw/"><font color="#0066cc">[OES] Flight Phases</font></a>.</p> "> - + id="1d30b780-f222-4794-9f78-5b70ce799bf0" name="System Analysis" description="<p>The focus here is put on the IFE system itself. <strong>The objective is to set the boundaries and provide a clear vision of the need</strong>.</p> <p>The <a href="hlink://_Q3xl4JTyEeSgObsjQ4XNVQ/"><font color="#0066cc">[MCB] All Missions and Capabilities</font></a> diagram&nbsp;shows on the capabilities of the IFE system. Three other diagrams provide interesting entry points to the model:</p> <ul> <li><a href="hlink://_LzrP8LclEd6PZMYM-Vvo5g/"><font color="#0066cc">[SC] System Actors</font></a>&nbsp;lists all the Actors (the aircraft is considered as an actor)</li> <li><a href="hlink://_gaN78KyfEeSJ1PX7slxG4w/"><font color="#0066cc">[SDFB] Top Level Functional Overview</font></a>&nbsp;provides a first functional overview of what the actors actually do and what kind of exchanges they have with the IFE system</li> <li><a href="hlink://_xXSwEKv6EeSTJvLsyJitsw/"><font color="#0066cc">[SAB] Top Level System Overview</font></a>&nbsp;and its&nbsp;slightly refined version <a href="hlink://_TGdI0JZDEeS1n7CBuZtEDQ/"><font color="#0066cc">[SAB] High Level System Overview</font></a>&nbsp;are <strong>very good entry points to further navigate in the model</strong>.</li> </ul> <p>Starting from these high level diagrams,&nbsp;a typical&nbsp;reading path&nbsp;is to dive into the function to visualize their refinement. For example, <a href="hlink://_Z-lO8LC1EeSAOqSI-4duBg/"><font color="#0066cc">[SDFB] [CTX] Run Services</font></a>. And recursively.</p> <p><strong>Using capabilities as a&nbsp;driver to browse the model is recommended</strong>. Some diagrams are specifically marked for that purpose, for instance <a href="hlink://_EsbcMLKzEeSZM9DbsSoyxw/"><font color="#0066cc">[SDFB] [CAPABILITY] Provide Video Entertainment Services</font></a>. From this capability covering VOD services to the passengers,&nbsp;browse the functional chains and scenarios to better understand how the capability is fulfilled.</p> <ul> <li>Functional chains: <a href="hlink://_MOb7kJjJEeSFKIU85IonOQ/"><font color="#0066cc">[SFCD] Start Playing VOD Movie</font></a>, <a href="hlink://_m1AKgJjJEeSFKIU85IonOQ/"><font color="#0066cc">[SFCD] Resume VOD Movie</font></a></li> <li>Scenarios: <a href="hlink://_CekP8JWHEeSAToX6gykiew/"><font color="#0066cc">[ES] Start VOD Service</font></a>, <a href="hlink://_bkAKcLD-EeSk6sURco8jXw/"><font color="#0066cc">[ES] Start Playing VOD Movie</font></a></li> </ul> <p>Check the global mode machine of the system with <a href="hlink://_ZlrrsPhmEeyYD7A3qrV3tA">[MSM] IFE Operating Modes</a>. Among others, this mode machine is intended to specify under which operational conditions the IFE system is running. Another Mode machine is specifically modelled for what will become the Seat TV: <a href="hlink://_ZHdlAPhuEeyYD7A3qrV3tA">[MSM] Seat TV - Movie Player Modes</a></p> "> - @@ -5145,8 +5140,6 @@ target="#a4a24937-7365-4018-8951-9aeb80e8d835" source="#8a4862f6-3229-4eae-80db-0f324420cb6d"/> - - - - - - - + + In-Flight%20Entertainment%20System.capella In-Flight%20Entertainment%20System.afm - -
RichText:In-Flight Entertainment System
-
_43VQALIOEeSu9-F8hTsjMA:In-Flight Entertainment System
-
_LzrP8LclEd6PZMYM-Vvo5g:In-Flight Entertainment System
-
_Q3xl4JTyEeSgObsjQ4XNVQ:In-Flight Entertainment System
-
_7KFO0K99EeyWiMAmwYaSaQ:In-Flight Entertainment System
- @@ -140,23 +133,23 @@ - + - + - + - + - + @@ -316,14 +309,14 @@ - + - + @@ -340,7 +333,7 @@ - + @@ -362,7 +355,7 @@ - + @@ -524,7 +517,7 @@ - + @@ -540,7 +533,7 @@ - + @@ -556,7 +549,7 @@ - + @@ -564,7 +557,7 @@ - + @@ -582,11 +575,11 @@ - + - +
@@ -706,7 +699,7 @@ - + @@ -752,7 +745,7 @@
-
+
@@ -64143,6 +64136,7 @@ + strokeColor size @@ -64162,6 +64156,7 @@ + strokeColor size @@ -64181,6 +64176,7 @@ + strokeColor size @@ -64200,6 +64196,7 @@ + strokeColor size @@ -64219,6 +64216,7 @@ + strokeColor size @@ -64238,6 +64236,7 @@ + strokeColor size @@ -64257,6 +64256,7 @@ + strokeColor size @@ -64276,6 +64276,7 @@ + strokeColor size @@ -64295,6 +64296,7 @@ + strokeColor size @@ -64314,6 +64316,7 @@ + strokeColor size @@ -64395,6 +64398,7 @@ + strokeColor size @@ -64433,6 +64437,7 @@ + strokeColor size @@ -64451,6 +64456,7 @@ + strokeColor size @@ -64469,6 +64475,7 @@ + strokeColor size @@ -65569,6 +65576,7 @@ + strokeColor size @@ -65588,6 +65596,7 @@ + strokeColor size @@ -65607,6 +65616,7 @@ + strokeColor size @@ -65626,6 +65636,7 @@ + strokeColor size @@ -65645,6 +65656,7 @@ + strokeColor size @@ -65664,6 +65676,7 @@ + strokeColor size @@ -65683,6 +65696,7 @@ + strokeColor size @@ -65754,6 +65768,7 @@ + strokeColor size @@ -67823,6 +67838,7 @@ + strokeColor size @@ -67842,6 +67858,7 @@ + strokeColor size @@ -67860,6 +67877,7 @@ + strokeColor size @@ -67878,6 +67896,7 @@ + strokeColor size @@ -67896,6 +67915,7 @@ + strokeColor size @@ -67914,6 +67934,7 @@ + strokeColor size @@ -67932,6 +67953,7 @@ + strokeColor size @@ -67950,6 +67972,7 @@ + strokeColor size @@ -68193,7 +68216,7 @@ - + @@ -68248,7 +68271,7 @@ - + @@ -72638,7 +72661,7 @@ - + @@ -72737,7 +72760,7 @@ - + @@ -77588,7 +77611,7 @@ - + @@ -77632,7 +77655,7 @@ - + @@ -77665,7 +77688,7 @@ - + @@ -77709,7 +77732,7 @@ - + @@ -77742,7 +77765,7 @@ - + @@ -77786,7 +77809,7 @@ - + @@ -77830,7 +77853,7 @@ - + @@ -80463,7 +80486,7 @@ - + @@ -80518,7 +80541,7 @@ - + @@ -80573,7 +80596,7 @@ - + @@ -80628,7 +80651,7 @@ - + @@ -80683,7 +80706,7 @@ - + @@ -91365,6 +91388,7 @@ + routingStyle strokeColor @@ -91724,6 +91748,7 @@ + strokeColor size @@ -139442,6 +139467,7 @@ + strokeColor size @@ -139461,6 +139487,7 @@ + strokeColor size @@ -139480,6 +139507,7 @@ + strokeColor size @@ -139499,6 +139527,7 @@ + strokeColor size @@ -139518,6 +139547,7 @@ + strokeColor size @@ -139537,6 +139567,7 @@ + strokeColor size @@ -139556,6 +139587,7 @@ + strokeColor size @@ -139575,6 +139607,7 @@ + strokeColor size @@ -139594,6 +139627,7 @@ + strokeColor size @@ -139613,6 +139647,7 @@ + strokeColor size @@ -139710,6 +139745,7 @@ + strokeColor size @@ -139729,6 +139765,7 @@ + strokeColor size @@ -139748,6 +139785,7 @@ + strokeColor size @@ -139767,6 +139805,7 @@ + strokeColor size @@ -139786,6 +139825,7 @@ + strokeColor size @@ -139805,6 +139845,7 @@ + strokeColor size @@ -139923,6 +139964,7 @@ + strokeColor size @@ -142953,6 +142995,7 @@ + strokeColor size @@ -142972,6 +143015,7 @@ + strokeColor size @@ -142991,6 +143035,7 @@ + strokeColor size @@ -143029,6 +143074,7 @@ + strokeColor size @@ -143067,6 +143113,7 @@ + strokeColor size @@ -143086,6 +143133,7 @@ + strokeColor size @@ -145146,6 +145194,7 @@ + strokeColor @@ -145165,6 +145214,7 @@ + strokeColor @@ -145184,6 +145234,7 @@ + strokeColor @@ -145203,6 +145254,7 @@ + strokeColor @@ -146353,6 +146405,7 @@ + strokeColor size @@ -146371,6 +146424,7 @@ + strokeColor @@ -146553,6 +146607,7 @@ + strokeColor size @@ -146571,6 +146626,7 @@ + strokeColor @@ -152347,6 +152403,7 @@ + routingStyle strokeColor @@ -152485,6 +152542,7 @@ + routingStyle strokeColor @@ -152521,6 +152579,8 @@ + + 6002 @@ -152543,6 +152603,7 @@ + routingStyle strokeColor @@ -152562,6 +152623,7 @@ + routingStyle strokeColor @@ -152581,6 +152643,8 @@ + + 6002 @@ -152602,6 +152666,8 @@ + + 6002 @@ -152773,6 +152839,7 @@ + routingStyle strokeColor @@ -152792,6 +152859,7 @@ + routingStyle strokeColor @@ -152994,7 +153062,7 @@ - + @@ -153613,7 +153681,7 @@ - + @@ -153632,7 +153700,7 @@ - + @@ -153651,7 +153719,7 @@ - + @@ -153662,7 +153730,7 @@ - + @@ -153673,14 +153741,14 @@ - + - + @@ -153884,7 +153952,7 @@ - + @@ -153899,7 +153967,7 @@ - + @@ -154569,7 +154637,7 @@ - + @@ -154588,7 +154656,7 @@ - + @@ -154607,7 +154675,7 @@ - + @@ -154618,7 +154686,7 @@ - + @@ -154629,7 +154697,7 @@ - + @@ -155080,6 +155148,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155096,6 +155167,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155112,6 +155186,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155128,6 +155205,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155136,6 +155216,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -158689,6 +158772,7 @@ + strokeColor size @@ -158702,6 +158786,7 @@ + routingStyle strokeColor @@ -158716,6 +158801,7 @@ + strokeColor size @@ -158729,6 +158815,7 @@ + routingStyle strokeColor @@ -158743,6 +158830,7 @@ + strokeColor size @@ -158847,6 +158935,7 @@ + strokeColor size @@ -158860,6 +158949,7 @@ + strokeColor size @@ -158873,6 +158963,7 @@ + strokeColor size @@ -159049,6 +159140,7 @@ + strokeColor size @@ -159929,7 +160021,7 @@ - + @@ -159973,7 +160065,7 @@ - + @@ -160006,7 +160098,7 @@ - + @@ -160039,7 +160131,7 @@ - + @@ -160083,7 +160175,7 @@ - + @@ -160116,7 +160208,7 @@ - + @@ -160149,7 +160241,7 @@ - + @@ -160182,7 +160274,7 @@ - + @@ -160975,6 +161067,7 @@ + size strokeColor @@ -160994,6 +161087,7 @@ + size routingStyle @@ -161014,6 +161108,7 @@ + size strokeColor @@ -161033,6 +161128,7 @@ + size routingStyle @@ -161053,6 +161149,7 @@ + size strokeColor @@ -161072,6 +161169,7 @@ + size strokeColor @@ -161091,6 +161189,7 @@ + size strokeColor @@ -161110,6 +161209,7 @@ + size strokeColor diff --git a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/In-Flight Entertainment System.afm b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/In-Flight Entertainment System.afm index d8cac65..313ec99 100644 --- a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/In-Flight Entertainment System.afm +++ b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/In-Flight Entertainment System.afm @@ -1,4 +1,4 @@ - + diff --git a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/In-Flight Entertainment System.capella b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/In-Flight Entertainment System.capella index 40a600f..308fd0b 100644 --- a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/In-Flight Entertainment System.capella +++ b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/IFE/SA-Complete/In-Flight Entertainment System.capella @@ -1,25 +1,24 @@ - + + description="<p><strong><font size="4">Operational Analysis</font></strong></p> <p>Several stakeholders have relationships with the IFE system, they all have different goals.&nbsp;The focus is put here&nbsp;on the operational needs the IFE system will somehow contribute to. <strong>What is the precise scope or content of the IFE system is not&nbsp;elicited yet at this stage</strong>.</p> <p>Discover the entities and their goals in his the operational capabilities diagram: <a href="hlink://_pmRnML2HEeSzuJ_4_7XgLw/">[OCB] Operational Capabilities</a>.</p> <p>Operational Architecture Diagrams provide a&nbsp;comprehensive view of the activities performed by the entities in order to reach their goals.</p> <ul> <li><a href="hlink://_xgO34LIUEeSVmfu1BIQISw/">[OAB] High-Level Expected Activities</a></li> <li>And its refined version <a href="hlink://_vQXrkLNoEeSVmfu1BIQISw/">[OAB] All Operational Activities and Entities</a></li> </ul> <p>The different phases of a flight&nbsp;are described in&nbsp;<a href="hlink://_-czpoPhUEeyYD7A3qrV3tA">[MSM] Aircraft Flying Phases</a> and their sequence in <a href="hlink://_VBob4LNqEeSVmfu1BIQISw/">[OES] Flight Phases</a>.</p> <p><font size="4"><strong>System Need Analysis</strong></font></p> <p>The focus here is put on the IFE system itself. <strong>The objective is to set the boundaries and provide a clear vision of the need</strong>.</p> <p>The <a href="hlink://_Q3xl4JTyEeSgObsjQ4XNVQ/">[MCB] All Missions and Capabilities</a> diagram&nbsp;shows on the capabilities of the IFE system. Three other diagrams provide interesting entry points to the model:</p> <ul> <li><a href="hlink://_LzrP8LclEd6PZMYM-Vvo5g/">[SC] System Actors</a>&nbsp;lists all the Actors (the aircraft is considered as an actor)</li> <li><a href="hlink://_gaN78KyfEeSJ1PX7slxG4w/">[SDFB] Top Level Functional Overview</a>&nbsp;provides a first functional overview of what the actors actually do and what kind of exchanges they have with the IFE system</li> <li><a href="hlink://_xXSwEKv6EeSTJvLsyJitsw/">[SAB] Top Level System Overview</a>&nbsp;and its&nbsp;slightly refined version <a href="hlink://_TGdI0JZDEeS1n7CBuZtEDQ/">[SAB] High Level System Overview</a>&nbsp;are <strong>very good entry points to further navigate in the model</strong>.</li> </ul> <p>Starting from these high level diagrams,&nbsp;a typical&nbsp;reading path&nbsp;is to dive into the function to visualize their refinement. For example, <a href="hlink://_Z-lO8LC1EeSAOqSI-4duBg/">[SDFB] [CTX] Run Services</a>. And recursively.</p> <p><strong>Using capabilities as a&nbsp;driver to browse the model is recommended</strong>. Some diagrams are specifically marked for that purpose, for instance <a href="hlink://_EsbcMLKzEeSZM9DbsSoyxw/">[SDFB] [CAPABILITY] Provide Video Entertainment Services</a>. From this capability covering VOD services to the passengers,&nbsp;browse the functional chains and scenarios to better understand how the capability is fulfilled.</p> <ul> <li>Functional chains: <a href="hlink://_MOb7kJjJEeSFKIU85IonOQ/">[SFCD] Start Playing VOD Movie</a>, <a href="hlink://_m1AKgJjJEeSFKIU85IonOQ/">[SFCD] Resume VOD Movie</a></li> <li>Scenarios: <a href="hlink://_CekP8JWHEeSAToX6gykiew/">[ES] Start VOD Service</a>, <a href="hlink://_bkAKcLD-EeSk6sURco8jXw/">[ES] Start Playing VOD Movie</a></li> </ul> <p>Check the global mode machine of the system with <a href="hlink://_ZlrrsPhmEeyYD7A3qrV3tA">[MSM] IFE Operating Modes</a>. Among others, this mode machine is intended to specify under which operational conditions the IFE system is running. Another Mode machine is specifically modelled for what will become the Seat TV: <a href="hlink://_ZHdlAPhuEeyYD7A3qrV3tA">[MSM] Seat TV - Movie Player Modes</a></p> <p><font size="4"><strong>Logical Architecture</strong></font></p> <p>The Logical Architecture provides an intermediate design, hiding some of the implementation-dependent complexity.</p> <p>The main architectural drivers&nbsp;are explained in&nbsp;the <a href="hlink://_3blN8KK2Ed6k26nfEmjK4A/">[LCBD] Architecture Drivers</a>&nbsp;diagram.&nbsp;&nbsp;Another global view of the logical components is provided by <a href="hlink://_IGYnAKCeEeStTrLYjHtDEw/">[LAB] IFE System - All Components, CEs</a></p> <p>Among others, the refined functional analysis is detailed in the following dataflow diagrams (<a href="hlink://_1Vd9AK5DEeS_aaAwMjKXtQ/">[LDFB] Top Level Functions</a>&nbsp;being an entry point):</p> <ul> <li><a href="hlink://_DHcNsLbMEeS6m7-8Vqqevw/">[LDFB] [CTX] Provide Aircraft Interface</a>&nbsp;explains the functional interfacing with the aircraft (the idea being to&nbsp;isolate these functions in an easily replaceable component to ease the integration of the IFE system in different aircrafts)</li> <li><a href="hlink://_lekjcK8MEeSUHuFYXP_oBw/">[LDFB] [CTX] Manage Audio and Video Diffusion</a>&nbsp;refines&nbsp;how audio&nbsp;and video request&nbsp;are processed. <ul> <li><a href="hlink://_myvsAJvPEeSmFu1YEE0geA/">[LDFB] [CTX] Process Audio Video Requests</a>&nbsp;distinguishes between VOD and imposed videos requests</li> <li><a href="hlink://_tMgXkJ2JEeSiIpoNkuyYwA/">[LDFB] [CTX] Broadcast Stored Audio Video Streams</a>&nbsp;describes the broadcast initialization of content coming from the digital media library</li> <li><a href="hlink://_Lhea0J2eEeSiIpoNkuyYwA/">[LDFB] [CTX] Display Video and Play Audio</a>&nbsp;describes how the different media streams are actually rendered</li> </ul> </li> </ul> <p>The allocation of functions to components is exhaustively described in <a href="hlink://_DmXfwKPQEeSgDIOKB3Rd0g/">[LAB] [BUILD] Template</a>. Functional&nbsp;chains and scenarios&nbsp;are refined.</p> <ul> <li>Functional chains <ul> <li><a href="hlink://_nKr5wLeNEeSJrshmHo2mKA/">[LAB][CTX] Broadcast Audio Announcement FC</a>&nbsp;(equivalent to <a href="hlink://_7eoQ4LeJEeSJrshmHo2mKA/">[LFCD] Broadcast Audio Announcement</a>)</li> <li><a href="hlink://_Hq4jALMDEeSGuvnnapXBhA/">[LAB][CTX] Start Playing VOD Movie FC</a>&nbsp; (equivalent to <a href="hlink://_IjNiALFqEeSsWZm7HcO6OQ/">[LFCD] Start Playing VOD Movie</a>)</li> </ul> </li> <li>Scenarios <ul> <li><a href="hlink://_FremALbzEeSpk5KlhVegeg/">[ES] Perform Audio Announcement</a></li> <li><a href="hlink://_KwN4gLUBEeSkIeuLucFPKA/">[ES] Start Playing VOD Movie</a></li> </ul> </li> </ul> <p>A (partial) data model is defined&nbsp;to support the &quot;Start Playing VOD Movie&quot; functional chain. Data and exchanged items are detailed in <a href="hlink://_nlZU8LZ-EeS6m7-8Vqqevw/">[CDB] Play Video Movie - Logical</a>.</p> <p><strong><font size="4">Physical Architecture</font></strong></p> <p>The Physical&nbsp;Architecture describes how the system will be built.</p> <p><a href="hlink://_6Rra8KQUEeSgDIOKB3Rd0g/">[PAB] Implementation and Behaviour Components</a>&nbsp;provides an exhaustive view of all physical components. Separate views are available in the breakdown diagrams:</p> <ul> <li><a href="hlink://_W5gMUKC6EeStTrLYjHtDEw/">[PCBD] Implementation Components</a></li> <li><a href="hlink://_o27AcKO1EeSgDIOKB3Rd0g/">[PCBD] Behavioural Components</a></li> </ul> <p>The allocation of functions to components is exhaustively described in <a href="hlink://_scrm8LB-EeSflp4pxI7U0A/">[PAB] [BUILD] Template</a>. Streaming topics are refined and described in the following dataflow and architecture diagrams:</p> <ul> <li><a href="hlink://_mMpGsLBGEeSnJaHm1OLKKw/">[PDFB] [CTX] Broadcast Stored Audio and Video Streams</a></li> <li><a href="hlink://_1EA74LBMEeSnJaHm1OLKKw/">[PDFB] [CTX] Play Video Stream on Seat TV</a></li> <li><a href="hlink://_VA5TELPNEeS7E-n173v5iw/">[PAB] [CTX] Start Playing VOD Movie FC</a></li> </ul> <p>Network topics are only slightly covered in this model.</p> <ul> <li>Usage of REC-RPL mechanisms to replicate network adapters</li> <li style="list-style-type: none;"> <ul> <li><a href="hlink://_xyaY8KYfEeSAVrf1rjnX4A/">REC - Unit Network Adapter</a>&nbsp;describes the REC (i.e.what will be replicated)</li> <li><a href="hlink://_BV6mQKYkEeSAVrf1rjnX4A/">RPL - Instantiations of Unit Network Adapter</a>&nbsp;describes the three RPLs (replicas).</li> <li>The connection between RPLs&nbsp;is detailed in <a href="hlink://_x1ARYKYIEeSAVrf1rjnX4A/">[PAB] Focus on Network Setup, Configuration and Tests</a></li> </ul> </li> <li>The transport of data from one connected equipment to another is described in this diagram: <a href="hlink://_EWMNsLkaEeSBQ7y8sEdlcw/">[PAB] Focus on Network Transport</a></li> </ul> <p>The data model related to the &quot;Start Playing VOD Movie&quot; functional chain is refined in <a href="hlink://_Snq1oLkiEeSBQ7y8sEdlcw/">[CDB] Play Video Movie - Physical</a></p> <p><strong><font size="4">End-Product Breakdown Structure</font></strong></p> <p>The EPBS architecture is minimal in this model. The <a href="hlink://_pEpUcLtQEeS87cs0yOXuuQ/">[EAB] Configuration Items and Realized Artefacts</a>&nbsp;diagram indicates how physical components, ports and links are allocated to configuration items.</p> "> + id="e12de7af-bf77-4c43-9f7c-03404be33a29" name="Operational Analysis" description="<p>Several stakeholders have relationships with the IFE system, they all have different goals.&nbsp;The focus is put here&nbsp;on the operational needs the IFE system will somehow contribute to. <strong>What is the precise scope or content of the IFE system is not&nbsp;elicited yet at this stage</strong>.</p> <p>Discover the entities and their goals in his the operational capabilities diagram: <a href="hlink://_pmRnML2HEeSzuJ_4_7XgLw/"><font color="#0066cc">[OCB] Operational Capabilities</font></a>.</p> <p>Operational Architecture Diagrams provide a&nbsp;comprehensive view of the activities performed by the entities in order to reach their goals.</p> <ul> <li><a href="hlink://_xgO34LIUEeSVmfu1BIQISw/"><font color="#0066cc">[OAB] High-Level Expected Activities</font></a></li> <li>And its refined version <a href="hlink://_vQXrkLNoEeSVmfu1BIQISw/"><font color="#0066cc">[OAB] All Operational Activities and Entities</font></a></li> </ul> <p>The different phases of a flight&nbsp;are described in&nbsp;<a href="hlink://_-czpoPhUEeyYD7A3qrV3tA">[MSM] Aircraft Flying Phases</a> and their sequence in <a href="hlink://_VBob4LNqEeSVmfu1BIQISw/"><font color="#0066cc">[OES] Flight Phases</font></a>.</p> "> - + id="1d30b780-f222-4794-9f78-5b70ce799bf0" name="System Analysis" description="<p>The focus here is put on the IFE system itself. <strong>The objective is to set the boundaries and provide a clear vision of the need</strong>.</p> <p>The <a href="hlink://_Q3xl4JTyEeSgObsjQ4XNVQ/"><font color="#0066cc">[MCB] All Missions and Capabilities</font></a> diagram&nbsp;shows on the capabilities of the IFE system. Three other diagrams provide interesting entry points to the model:</p> <ul> <li><a href="hlink://_LzrP8LclEd6PZMYM-Vvo5g/"><font color="#0066cc">[SC] System Actors</font></a>&nbsp;lists all the Actors (the aircraft is considered as an actor)</li> <li><a href="hlink://_gaN78KyfEeSJ1PX7slxG4w/"><font color="#0066cc">[SDFB] Top Level Functional Overview</font></a>&nbsp;provides a first functional overview of what the actors actually do and what kind of exchanges they have with the IFE system</li> <li><a href="hlink://_xXSwEKv6EeSTJvLsyJitsw/"><font color="#0066cc">[SAB] Top Level System Overview</font></a>&nbsp;and its&nbsp;slightly refined version <a href="hlink://_TGdI0JZDEeS1n7CBuZtEDQ/"><font color="#0066cc">[SAB] High Level System Overview</font></a>&nbsp;are <strong>very good entry points to further navigate in the model</strong>.</li> </ul> <p>Starting from these high level diagrams,&nbsp;a typical&nbsp;reading path&nbsp;is to dive into the function to visualize their refinement. For example, <a href="hlink://_Z-lO8LC1EeSAOqSI-4duBg/"><font color="#0066cc">[SDFB] [CTX] Run Services</font></a>. And recursively.</p> <p><strong>Using capabilities as a&nbsp;driver to browse the model is recommended</strong>. Some diagrams are specifically marked for that purpose, for instance <a href="hlink://_EsbcMLKzEeSZM9DbsSoyxw/"><font color="#0066cc">[SDFB] [CAPABILITY] Provide Video Entertainment Services</font></a>. From this capability covering VOD services to the passengers,&nbsp;browse the functional chains and scenarios to better understand how the capability is fulfilled.</p> <ul> <li>Functional chains: <a href="hlink://_MOb7kJjJEeSFKIU85IonOQ/"><font color="#0066cc">[SFCD] Start Playing VOD Movie</font></a>, <a href="hlink://_m1AKgJjJEeSFKIU85IonOQ/"><font color="#0066cc">[SFCD] Resume VOD Movie</font></a></li> <li>Scenarios: <a href="hlink://_CekP8JWHEeSAToX6gykiew/"><font color="#0066cc">[ES] Start VOD Service</font></a>, <a href="hlink://_bkAKcLD-EeSk6sURco8jXw/"><font color="#0066cc">[ES] Start Playing VOD Movie</font></a></li> </ul> <p>Check the global mode machine of the system with <a href="hlink://_ZlrrsPhmEeyYD7A3qrV3tA">[MSM] IFE Operating Modes</a>. Among others, this mode machine is intended to specify under which operational conditions the IFE system is running. Another Mode machine is specifically modelled for what will become the Seat TV: <a href="hlink://_ZHdlAPhuEeyYD7A3qrV3tA">[MSM] Seat TV - Movie Player Modes</a></p> "> - @@ -5145,8 +5140,6 @@ target="#a4a24937-7365-4018-8951-9aeb80e8d835" source="#8a4862f6-3229-4eae-80db-0f324420cb6d"/> - - - - - - - + + In-Flight%20Entertainment%20System.capella In-Flight%20Entertainment%20System.afm - -
RichText:In-Flight Entertainment System
-
_43VQALIOEeSu9-F8hTsjMA:In-Flight Entertainment System
-
_LzrP8LclEd6PZMYM-Vvo5g:In-Flight Entertainment System
-
_Q3xl4JTyEeSgObsjQ4XNVQ:In-Flight Entertainment System
-
_7KFO0K99EeyWiMAmwYaSaQ:In-Flight Entertainment System
- @@ -140,23 +133,23 @@ - + - + - + - + - + @@ -316,14 +309,14 @@ - + - + @@ -340,7 +333,7 @@ - + @@ -362,7 +355,7 @@ - + @@ -524,7 +517,7 @@ - + @@ -540,7 +533,7 @@ - + @@ -556,7 +549,7 @@ - + @@ -564,7 +557,7 @@ - + @@ -582,11 +575,11 @@ - + - +
@@ -706,7 +699,7 @@ - + @@ -752,7 +745,7 @@
-
+
@@ -64143,6 +64136,7 @@ + strokeColor size @@ -64162,6 +64156,7 @@ + strokeColor size @@ -64181,6 +64176,7 @@ + strokeColor size @@ -64200,6 +64196,7 @@ + strokeColor size @@ -64219,6 +64216,7 @@ + strokeColor size @@ -64238,6 +64236,7 @@ + strokeColor size @@ -64257,6 +64256,7 @@ + strokeColor size @@ -64276,6 +64276,7 @@ + strokeColor size @@ -64295,6 +64296,7 @@ + strokeColor size @@ -64314,6 +64316,7 @@ + strokeColor size @@ -64395,6 +64398,7 @@ + strokeColor size @@ -64433,6 +64437,7 @@ + strokeColor size @@ -64451,6 +64456,7 @@ + strokeColor size @@ -64469,6 +64475,7 @@ + strokeColor size @@ -65569,6 +65576,7 @@ + strokeColor size @@ -65588,6 +65596,7 @@ + strokeColor size @@ -65607,6 +65616,7 @@ + strokeColor size @@ -65626,6 +65636,7 @@ + strokeColor size @@ -65645,6 +65656,7 @@ + strokeColor size @@ -65664,6 +65676,7 @@ + strokeColor size @@ -65683,6 +65696,7 @@ + strokeColor size @@ -65754,6 +65768,7 @@ + strokeColor size @@ -67823,6 +67838,7 @@ + strokeColor size @@ -67842,6 +67858,7 @@ + strokeColor size @@ -67860,6 +67877,7 @@ + strokeColor size @@ -67878,6 +67896,7 @@ + strokeColor size @@ -67896,6 +67915,7 @@ + strokeColor size @@ -67914,6 +67934,7 @@ + strokeColor size @@ -67932,6 +67953,7 @@ + strokeColor size @@ -67950,6 +67972,7 @@ + strokeColor size @@ -68193,7 +68216,7 @@ - + @@ -68248,7 +68271,7 @@ - + @@ -72638,7 +72661,7 @@ - + @@ -72737,7 +72760,7 @@ - + @@ -77588,7 +77611,7 @@ - + @@ -77632,7 +77655,7 @@ - + @@ -77665,7 +77688,7 @@ - + @@ -77709,7 +77732,7 @@ - + @@ -77742,7 +77765,7 @@ - + @@ -77786,7 +77809,7 @@ - + @@ -77830,7 +77853,7 @@ - + @@ -80463,7 +80486,7 @@ - + @@ -80518,7 +80541,7 @@ - + @@ -80573,7 +80596,7 @@ - + @@ -80628,7 +80651,7 @@ - + @@ -80683,7 +80706,7 @@ - + @@ -91365,6 +91388,7 @@ + routingStyle strokeColor @@ -91724,6 +91748,7 @@ + strokeColor size @@ -139442,6 +139467,7 @@ + strokeColor size @@ -139461,6 +139487,7 @@ + strokeColor size @@ -139480,6 +139507,7 @@ + strokeColor size @@ -139499,6 +139527,7 @@ + strokeColor size @@ -139518,6 +139547,7 @@ + strokeColor size @@ -139537,6 +139567,7 @@ + strokeColor size @@ -139556,6 +139587,7 @@ + strokeColor size @@ -139575,6 +139607,7 @@ + strokeColor size @@ -139594,6 +139627,7 @@ + strokeColor size @@ -139613,6 +139647,7 @@ + strokeColor size @@ -139710,6 +139745,7 @@ + strokeColor size @@ -139729,6 +139765,7 @@ + strokeColor size @@ -139748,6 +139785,7 @@ + strokeColor size @@ -139767,6 +139805,7 @@ + strokeColor size @@ -139786,6 +139825,7 @@ + strokeColor size @@ -139805,6 +139845,7 @@ + strokeColor size @@ -139923,6 +139964,7 @@ + strokeColor size @@ -142953,6 +142995,7 @@ + strokeColor size @@ -142972,6 +143015,7 @@ + strokeColor size @@ -142991,6 +143035,7 @@ + strokeColor size @@ -143029,6 +143074,7 @@ + strokeColor size @@ -143067,6 +143113,7 @@ + strokeColor size @@ -143086,6 +143133,7 @@ + strokeColor size @@ -145146,6 +145194,7 @@ + strokeColor @@ -145165,6 +145214,7 @@ + strokeColor @@ -145184,6 +145234,7 @@ + strokeColor @@ -145203,6 +145254,7 @@ + strokeColor @@ -146353,6 +146405,7 @@ + strokeColor size @@ -146371,6 +146424,7 @@ + strokeColor @@ -146553,6 +146607,7 @@ + strokeColor size @@ -146571,6 +146626,7 @@ + strokeColor @@ -152347,6 +152403,7 @@ + routingStyle strokeColor @@ -152485,6 +152542,7 @@ + routingStyle strokeColor @@ -152521,6 +152579,8 @@ + + 6002 @@ -152543,6 +152603,7 @@ + routingStyle strokeColor @@ -152562,6 +152623,7 @@ + routingStyle strokeColor @@ -152581,6 +152643,8 @@ + + 6002 @@ -152602,6 +152666,8 @@ + + 6002 @@ -152773,6 +152839,7 @@ + routingStyle strokeColor @@ -152792,6 +152859,7 @@ + routingStyle strokeColor @@ -152994,7 +153062,7 @@ - + @@ -153613,7 +153681,7 @@ - + @@ -153632,7 +153700,7 @@ - + @@ -153651,7 +153719,7 @@ - + @@ -153662,7 +153730,7 @@ - + @@ -153673,14 +153741,14 @@ - + - + @@ -153884,7 +153952,7 @@ - + @@ -153899,7 +153967,7 @@ - + @@ -154569,7 +154637,7 @@ - + @@ -154588,7 +154656,7 @@ - + @@ -154607,7 +154675,7 @@ - + @@ -154618,7 +154686,7 @@ - + @@ -154629,7 +154697,7 @@ - + @@ -155080,6 +155148,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155096,6 +155167,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155112,6 +155186,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155128,6 +155205,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155136,6 +155216,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -158689,6 +158772,7 @@ + strokeColor size @@ -158702,6 +158786,7 @@ + routingStyle strokeColor @@ -158716,6 +158801,7 @@ + strokeColor size @@ -158729,6 +158815,7 @@ + routingStyle strokeColor @@ -158743,6 +158830,7 @@ + strokeColor size @@ -158847,6 +158935,7 @@ + strokeColor size @@ -158860,6 +158949,7 @@ + strokeColor size @@ -158873,6 +158963,7 @@ + strokeColor size @@ -159049,6 +159140,7 @@ + strokeColor size @@ -159929,7 +160021,7 @@ - + @@ -159973,7 +160065,7 @@ - + @@ -160006,7 +160098,7 @@ - + @@ -160039,7 +160131,7 @@ - + @@ -160083,7 +160175,7 @@ - + @@ -160116,7 +160208,7 @@ - + @@ -160149,7 +160241,7 @@ - + @@ -160182,7 +160274,7 @@ - + @@ -160975,6 +161067,7 @@ + size strokeColor @@ -160994,6 +161087,7 @@ + size routingStyle @@ -161014,6 +161108,7 @@ + size strokeColor @@ -161033,6 +161128,7 @@ + size routingStyle @@ -161053,6 +161149,7 @@ + size strokeColor @@ -161072,6 +161169,7 @@ + size strokeColor @@ -161091,6 +161189,7 @@ + size strokeColor @@ -161110,6 +161209,7 @@ + size strokeColor diff --git a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/tests/bug_31/In-Flight Entertainment System.afm b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/tests/bug_31/In-Flight Entertainment System.afm index d8cac65..313ec99 100644 --- a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/tests/bug_31/In-Flight Entertainment System.afm +++ b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/tests/bug_31/In-Flight Entertainment System.afm @@ -1,4 +1,4 @@ - + diff --git a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/tests/bug_31/In-Flight Entertainment System.capella b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/tests/bug_31/In-Flight Entertainment System.capella index b5be302..196f49c 100644 --- a/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/tests/bug_31/In-Flight Entertainment System.capella +++ b/tests/org.obeonetwork.capella.m2doc.aql.queries.tests/resources/tests/bug_31/In-Flight Entertainment System.capella @@ -1,25 +1,24 @@ - + + id="e12de7af-bf77-4c43-9f7c-03404be33a29" name="Operational Analysis" description="<p>Several stakeholders have relationships with the IFE system, they all have different goals.&nbsp;The focus is put here&nbsp;on the operational needs the IFE system will somehow contribute to. <strong>What is the precise scope or content of the IFE system is not&nbsp;elicited yet at this stage</strong>.</p> <p>Discover the entities and their goals in his the operational capabilities diagram: <a href="hlink://_pmRnML2HEeSzuJ_4_7XgLw/"><font color="#0066cc">[OCB] Operational Capabilities</font></a>.</p> <p>Operational Architecture Diagrams provide a&nbsp;comprehensive view of the activities performed by the entities in order to reach their goals.</p> <ul> <li><a href="hlink://_xgO34LIUEeSVmfu1BIQISw/"><font color="#0066cc">[OAB] High-Level Expected Activities</font></a></li> <li>And its refined version <a href="hlink://_vQXrkLNoEeSVmfu1BIQISw/"><font color="#0066cc">[OAB] All Operational Activities and Entities</font></a></li> </ul> <p>The different phases of a flight&nbsp;are described in&nbsp;<a href="hlink://_-czpoPhUEeyYD7A3qrV3tA">[MSM] Aircraft Flying Phases</a> and their sequence in <a href="hlink://_VBob4LNqEeSVmfu1BIQISw/"><font color="#0066cc">[OES] Flight Phases</font></a>.</p> "> - + id="1d30b780-f222-4794-9f78-5b70ce799bf0" name="System Analysis" description="<p>The focus here is put on the IFE system itself. <strong>The objective is to set the boundaries and provide a clear vision of the need</strong>.</p> <p>The <a href="hlink://_Q3xl4JTyEeSgObsjQ4XNVQ/"><font color="#0066cc">[MCB] All Missions and Capabilities</font></a> diagram&nbsp;shows on the capabilities of the IFE system. Three other diagrams provide interesting entry points to the model:</p> <ul> <li><a href="hlink://_LzrP8LclEd6PZMYM-Vvo5g/"><font color="#0066cc">[SC] System Actors</font></a>&nbsp;lists all the Actors (the aircraft is considered as an actor)</li> <li><a href="hlink://_gaN78KyfEeSJ1PX7slxG4w/"><font color="#0066cc">[SDFB] Top Level Functional Overview</font></a>&nbsp;provides a first functional overview of what the actors actually do and what kind of exchanges they have with the IFE system</li> <li><a href="hlink://_xXSwEKv6EeSTJvLsyJitsw/"><font color="#0066cc">[SAB] Top Level System Overview</font></a>&nbsp;and its&nbsp;slightly refined version <a href="hlink://_TGdI0JZDEeS1n7CBuZtEDQ/"><font color="#0066cc">[SAB] High Level System Overview</font></a>&nbsp;are <strong>very good entry points to further navigate in the model</strong>.</li> </ul> <p>Starting from these high level diagrams,&nbsp;a typical&nbsp;reading path&nbsp;is to dive into the function to visualize their refinement. For example, <a href="hlink://_Z-lO8LC1EeSAOqSI-4duBg/"><font color="#0066cc">[SDFB] [CTX] Run Services</font></a>. And recursively.</p> <p><strong>Using capabilities as a&nbsp;driver to browse the model is recommended</strong>. Some diagrams are specifically marked for that purpose, for instance <a href="hlink://_EsbcMLKzEeSZM9DbsSoyxw/"><font color="#0066cc">[SDFB] [CAPABILITY] Provide Video Entertainment Services</font></a>. From this capability covering VOD services to the passengers,&nbsp;browse the functional chains and scenarios to better understand how the capability is fulfilled.</p> <ul> <li>Functional chains: <a href="hlink://_MOb7kJjJEeSFKIU85IonOQ/"><font color="#0066cc">[SFCD] Start Playing VOD Movie</font></a>, <a href="hlink://_m1AKgJjJEeSFKIU85IonOQ/"><font color="#0066cc">[SFCD] Resume VOD Movie</font></a></li> <li>Scenarios: <a href="hlink://_CekP8JWHEeSAToX6gykiew/"><font color="#0066cc">[ES] Start VOD Service</font></a>, <a href="hlink://_bkAKcLD-EeSk6sURco8jXw/"><font color="#0066cc">[ES] Start Playing VOD Movie</font></a></li> </ul> <p>Check the global mode machine of the system with <a href="hlink://_ZlrrsPhmEeyYD7A3qrV3tA">[MSM] IFE Operating Modes</a>. Among others, this mode machine is intended to specify under which operational conditions the IFE system is running. Another Mode machine is specifically modelled for what will become the Seat TV: <a href="hlink://_ZHdlAPhuEeyYD7A3qrV3tA">[MSM] Seat TV - Movie Player Modes</a></p> "> - @@ -5145,8 +5140,6 @@ target="#a4a24937-7365-4018-8951-9aeb80e8d835" source="#8a4862f6-3229-4eae-80db-0f324420cb6d"/> - - - - - - - + + In-Flight%20Entertainment%20System.capella In-Flight%20Entertainment%20System.afm - -
RichText:In-Flight Entertainment System
-
_43VQALIOEeSu9-F8hTsjMA:In-Flight Entertainment System
-
_LzrP8LclEd6PZMYM-Vvo5g:In-Flight Entertainment System
-
_Q3xl4JTyEeSgObsjQ4XNVQ:In-Flight Entertainment System
-
_7KFO0K99EeyWiMAmwYaSaQ:In-Flight Entertainment System
- @@ -140,23 +133,23 @@ - + - + - + - + - + @@ -316,14 +309,14 @@ - + - + @@ -340,7 +333,7 @@ - + @@ -362,7 +355,7 @@ - + @@ -524,7 +517,7 @@ - + @@ -540,7 +533,7 @@ - + @@ -556,7 +549,7 @@ - + @@ -564,7 +557,7 @@ - + @@ -582,11 +575,11 @@ - + - +
@@ -706,7 +699,7 @@ - + @@ -752,7 +745,7 @@
-
+
@@ -64143,6 +64136,7 @@ + strokeColor size @@ -64162,6 +64156,7 @@ + strokeColor size @@ -64181,6 +64176,7 @@ + strokeColor size @@ -64200,6 +64196,7 @@ + strokeColor size @@ -64219,6 +64216,7 @@ + strokeColor size @@ -64238,6 +64236,7 @@ + strokeColor size @@ -64257,6 +64256,7 @@ + strokeColor size @@ -64276,6 +64276,7 @@ + strokeColor size @@ -64295,6 +64296,7 @@ + strokeColor size @@ -64314,6 +64316,7 @@ + strokeColor size @@ -64395,6 +64398,7 @@ + strokeColor size @@ -64433,6 +64437,7 @@ + strokeColor size @@ -64451,6 +64456,7 @@ + strokeColor size @@ -64469,6 +64475,7 @@ + strokeColor size @@ -65569,6 +65576,7 @@ + strokeColor size @@ -65588,6 +65596,7 @@ + strokeColor size @@ -65607,6 +65616,7 @@ + strokeColor size @@ -65626,6 +65636,7 @@ + strokeColor size @@ -65645,6 +65656,7 @@ + strokeColor size @@ -65664,6 +65676,7 @@ + strokeColor size @@ -65683,6 +65696,7 @@ + strokeColor size @@ -65754,6 +65768,7 @@ + strokeColor size @@ -67823,6 +67838,7 @@ + strokeColor size @@ -67842,6 +67858,7 @@ + strokeColor size @@ -67860,6 +67877,7 @@ + strokeColor size @@ -67878,6 +67896,7 @@ + strokeColor size @@ -67896,6 +67915,7 @@ + strokeColor size @@ -67914,6 +67934,7 @@ + strokeColor size @@ -67932,6 +67953,7 @@ + strokeColor size @@ -67950,6 +67972,7 @@ + strokeColor size @@ -68193,7 +68216,7 @@ - + @@ -68248,7 +68271,7 @@ - + @@ -72638,7 +72661,7 @@ - + @@ -72737,7 +72760,7 @@ - + @@ -77588,7 +77611,7 @@ - + @@ -77632,7 +77655,7 @@ - + @@ -77665,7 +77688,7 @@ - + @@ -77709,7 +77732,7 @@ - + @@ -77742,7 +77765,7 @@ - + @@ -77786,7 +77809,7 @@ - + @@ -77830,7 +77853,7 @@ - + @@ -80463,7 +80486,7 @@ - + @@ -80518,7 +80541,7 @@ - + @@ -80573,7 +80596,7 @@ - + @@ -80628,7 +80651,7 @@ - + @@ -80683,7 +80706,7 @@ - + @@ -91365,6 +91388,7 @@ + routingStyle strokeColor @@ -91724,6 +91748,7 @@ + strokeColor size @@ -139442,6 +139467,7 @@ + strokeColor size @@ -139461,6 +139487,7 @@ + strokeColor size @@ -139480,6 +139507,7 @@ + strokeColor size @@ -139499,6 +139527,7 @@ + strokeColor size @@ -139518,6 +139547,7 @@ + strokeColor size @@ -139537,6 +139567,7 @@ + strokeColor size @@ -139556,6 +139587,7 @@ + strokeColor size @@ -139575,6 +139607,7 @@ + strokeColor size @@ -139594,6 +139627,7 @@ + strokeColor size @@ -139613,6 +139647,7 @@ + strokeColor size @@ -139710,6 +139745,7 @@ + strokeColor size @@ -139729,6 +139765,7 @@ + strokeColor size @@ -139748,6 +139785,7 @@ + strokeColor size @@ -139767,6 +139805,7 @@ + strokeColor size @@ -139786,6 +139825,7 @@ + strokeColor size @@ -139805,6 +139845,7 @@ + strokeColor size @@ -139923,6 +139964,7 @@ + strokeColor size @@ -142953,6 +142995,7 @@ + strokeColor size @@ -142972,6 +143015,7 @@ + strokeColor size @@ -142991,6 +143035,7 @@ + strokeColor size @@ -143029,6 +143074,7 @@ + strokeColor size @@ -143067,6 +143113,7 @@ + strokeColor size @@ -143086,6 +143133,7 @@ + strokeColor size @@ -145146,6 +145194,7 @@ + strokeColor @@ -145165,6 +145214,7 @@ + strokeColor @@ -145184,6 +145234,7 @@ + strokeColor @@ -145203,6 +145254,7 @@ + strokeColor @@ -146353,6 +146405,7 @@ + strokeColor size @@ -146371,6 +146424,7 @@ + strokeColor @@ -146553,6 +146607,7 @@ + strokeColor size @@ -146571,6 +146626,7 @@ + strokeColor @@ -152347,6 +152403,7 @@ + routingStyle strokeColor @@ -152485,6 +152542,7 @@ + routingStyle strokeColor @@ -152521,6 +152579,8 @@ + + 6002 @@ -152543,6 +152603,7 @@ + routingStyle strokeColor @@ -152562,6 +152623,7 @@ + routingStyle strokeColor @@ -152581,6 +152643,8 @@ + + 6002 @@ -152602,6 +152666,8 @@ + + 6002 @@ -152773,6 +152839,7 @@ + routingStyle strokeColor @@ -152792,6 +152859,7 @@ + routingStyle strokeColor @@ -152994,7 +153062,7 @@ - + @@ -153613,7 +153681,7 @@ - + @@ -153632,7 +153700,7 @@ - + @@ -153651,7 +153719,7 @@ - + @@ -153662,7 +153730,7 @@ - + @@ -153673,14 +153741,14 @@ - + - + @@ -153884,7 +153952,7 @@ - + @@ -153899,7 +153967,7 @@ - + @@ -154569,7 +154637,7 @@ - + @@ -154588,7 +154656,7 @@ - + @@ -154607,7 +154675,7 @@ - + @@ -154618,7 +154686,7 @@ - + @@ -154629,7 +154697,7 @@ - + @@ -155080,6 +155148,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155096,6 +155167,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155112,6 +155186,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155128,6 +155205,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -155136,6 +155216,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -158689,6 +158772,7 @@ + strokeColor size @@ -158702,6 +158786,7 @@ + routingStyle strokeColor @@ -158716,6 +158801,7 @@ + strokeColor size @@ -158729,6 +158815,7 @@ + routingStyle strokeColor @@ -158743,6 +158830,7 @@ + strokeColor size @@ -158847,6 +158935,7 @@ + strokeColor size @@ -158860,6 +158949,7 @@ + strokeColor size @@ -158873,6 +158963,7 @@ + strokeColor size @@ -159049,6 +159140,7 @@ + strokeColor size @@ -159929,7 +160021,7 @@ - + @@ -159973,7 +160065,7 @@ - + @@ -160006,7 +160098,7 @@ - + @@ -160039,7 +160131,7 @@ - + @@ -160083,7 +160175,7 @@ - + @@ -160116,7 +160208,7 @@ - + @@ -160149,7 +160241,7 @@ - + @@ -160182,7 +160274,7 @@ - + @@ -160975,6 +161067,7 @@ + size strokeColor @@ -160994,6 +161087,7 @@ + size routingStyle @@ -161014,6 +161108,7 @@ + size strokeColor @@ -161033,6 +161128,7 @@ + size routingStyle @@ -161053,6 +161149,7 @@ + size strokeColor @@ -161072,6 +161169,7 @@ + size strokeColor @@ -161091,6 +161189,7 @@ + size strokeColor @@ -161110,6 +161209,7 @@ + size strokeColor