- Move DiagramUtil to common.ui (in infra), since it can be used for the system-fault analysis as well.
- Fix FMEA table update
- Update documentation to recent changes
- Make portDirection a derived attribute and allow for overwrites. Use same enumeration as for architecture profile.
Move extension point to infra, since used in component and system-fault analysis
- Regenerate static local analysis profile (needed due to change above)
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/META-INF/MANIFEST.MF b/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/META-INF/MANIFEST.MF
index 20b051b..e8a9c06 100644
--- a/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/META-INF/MANIFEST.MF
+++ b/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/META-INF/MANIFEST.MF
@@ -25,6 +25,7 @@
org.polarsys.esf.fmea.profile.tools;bundle-version="0.7.0";visibility:=reexport,
org.polarsys.esf.fmea.profile.service.types;bundle-version="0.7.0";visibility:=reexport,
org.polarsys.esf.fmea.table;bundle-version="0.7.0";visibility:=reexport,
- org.polarsys.esf.analysis.common.ui;bundle-version="0.7.0";visibility:=reexport
+ org.polarsys.esf.analysis.common.ui;bundle-version="0.7.0";visibility:=reexport,
+ org.polarsys.esf.core.common.ui;bundle-version="0.7.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
diff --git a/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/plugin.xml b/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/plugin.xml
index 8ba6f87..32bb05e 100644
--- a/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/plugin.xml
+++ b/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/plugin.xml
@@ -34,12 +34,21 @@
<with
variable="selection">
<iterate>
+ <or>
<adapt
type="org.eclipse.emf.ecore.EObject">
<instanceof
value="org.eclipse.uml2.uml.Class">
</instanceof>
</adapt>
+ <adapt
+ type="org.eclipse.emf.ecore.EObject">
+ <instanceof
+ value="org.eclipse.uml2.uml.Package">
+ </instanceof>
+ </adapt>
+ </or>
+
</iterate>
</with>
<count
diff --git a/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/src/main/java/org/polarsys/esf/fmea/execution/ui/handler/StartNewFMEAHandler.java b/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/src/main/java/org/polarsys/esf/fmea/execution/ui/handler/StartNewFMEAHandler.java
index 6a08333..876d883 100644
--- a/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/src/main/java/org/polarsys/esf/fmea/execution/ui/handler/StartNewFMEAHandler.java
+++ b/analysis/fmea/execution/org.polarsys.esf.fmea.execution.ui/src/main/java/org/polarsys/esf/fmea/execution/ui/handler/StartNewFMEAHandler.java
@@ -15,10 +15,17 @@
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.UMLPackage;
+import org.polarsys.esf.core.common.ui.provider.ESFContentProvider;
import org.polarsys.esf.core.utils.ModelUtil;
import org.polarsys.esf.fmea.execution.setup.NewFMEASetup;
@@ -45,9 +52,28 @@
public Object execute(final ExecutionEvent pEvent) throws ExecutionException {
ISelection vSelection = HandlerUtil.getCurrentSelection(pEvent);
- final Class vSelectedClass =
+ Class vSelectedClass =
(Class) ModelUtil.getSelectedEObjectOfType(vSelection, UMLPackage.eINSTANCE.getClass_());
+ final Package vSelectedPkg =
+ (Package) ModelUtil.getSelectedEObjectOfType(vSelection, UMLPackage.eINSTANCE.getPackage());
+
+ if (vSelectedPkg != null) {
+ TreeSelectorDialog dialog = new TreeSelectorDialog(Display.getCurrent().getActiveShell());
+ dialog.setLabelProvider((new UMLLabelProvider()));
+ ESFContentProvider cp = new ESFContentProvider(vSelectedPkg, UMLPackage.eINSTANCE.getClass_());
+ dialog.setContentProvider(new EncapsulatedContentProvider(cp));
+ dialog.setTitle("Select class");
+ dialog.setDescription("FMEA analysis can be executed on classes or components. Select below");
+ int code = dialog.open();
+
+ if (code == Dialog.OK) {
+ Object result = dialog.getResult()[0];
+ if (result instanceof Class) {
+ vSelectedClass = (Class) result;
+ }
+ }
+ }
if (vSelectedClass != null) {
NewFMEASetup.setup(vSelectedClass);
}
diff --git a/analysis/localanalysis/diagram/org.polarsys.esf.localanalysis.diagram/META-INF/MANIFEST.MF b/analysis/localanalysis/diagram/org.polarsys.esf.localanalysis.diagram/META-INF/MANIFEST.MF
index 17bf60d..f555e5e 100644
--- a/analysis/localanalysis/diagram/org.polarsys.esf.localanalysis.diagram/META-INF/MANIFEST.MF
+++ b/analysis/localanalysis/diagram/org.polarsys.esf.localanalysis.diagram/META-INF/MANIFEST.MF
@@ -6,17 +6,14 @@
Bundle-Activator: org.polarsys.esf.localanalysis.diagram.ESFLocalAnalysisDiagramActivator$Implementation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.common,
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
org.polarsys.esf.localanalysis.resources.graphical;bundle-version="0.7.0";visibility:=reexport,
org.polarsys.esf.localanalysis.profile.service.types;bundle-version="0.7.0";visibility:=reexport,
org.polarsys.esf.localanalysis.profile;bundle-version="0.7.0";visibility:=reexport,
- org.eclipse.papyrus.infra.architecture;bundle-version="2.0.0",
org.eclipse.papyrus.infra.core;bundle-version="3.0.100",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="3.0.0"
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="3.0.0",
+ org.polarsys.esf.core.diagram.esfarchitectureconcepts;bundle-version="0.7.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: src/main/resources/properties/plugin
-Export-Package: org.polarsys.esf.localanalysis.diagram.set,
- org.polarsys.esf.localanalysis.diagram.util
+Export-Package: org.polarsys.esf.localanalysis.diagram.set
diff --git a/analysis/localanalysis/diagram/org.polarsys.esf.localanalysis.diagram/src/main/java/org/polarsys/esf/localanalysis/diagram/util/ESFLocalAnalysisDiagramUtil.java b/analysis/localanalysis/diagram/org.polarsys.esf.localanalysis.diagram/src/main/java/org/polarsys/esf/localanalysis/diagram/util/ESFLocalAnalysisDiagramUtil.java
deleted file mode 100644
index c03393b..0000000
--- a/analysis/localanalysis/diagram/org.polarsys.esf.localanalysis.diagram/src/main/java/org/polarsys/esf/localanalysis/diagram/util/ESFLocalAnalysisDiagramUtil.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 ALL4TEC & CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * ALL4TEC & CEA LIST - initial API and implementation
- ******************************************************************************/
-package org.polarsys.esf.localanalysis.diagram.util;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.uml2.uml.Class;
-
-/**
- * Utilities for working with ESFLocalAnalysis Diagram.
- *
- * @author $Author: ymunoz $
- * @version $Revision: 168 $
- */
-public final class ESFLocalAnalysisDiagramUtil {
-
- /**
- * Default constructor.
- */
- private ESFLocalAnalysisDiagramUtil() {
- }
-
- /**
- * Get The ViewPrototype of the Table by its name.
- *
- * @param pDiagramName The Diagram name
- * @return The Diagram ViewPrototype
- */
- public static ViewPrototype getViewPrototype(final String pDiagramName, final Class pRootElement) {
- Collection<ViewPrototype> vPrototypes = PolicyChecker.getFor(pRootElement).getAllPrototypes();
- ViewPrototype vDiagram = null;
- String vPotentialDiagramName = null;
- Iterator<ViewPrototype> vIterator = vPrototypes.iterator();
- while (vDiagram == null && vIterator.hasNext()) {
- ViewPrototype vPotentialPrototype = vIterator.next();
- vPotentialDiagramName = vPotentialPrototype.getRepresentationKind().getName();
- if (pDiagramName.equals(vPotentialDiagramName)) {
- vDiagram = vPotentialPrototype;
- }
- }
-
- return vDiagram;
- }
-
- /**
- * Create a table.
- *
- * @param pDiagramName The Diagram Name
- * @param pRootElement The element where should be created the table.
- */
- public static void createDiagram(final String pDiagramName, final Class pRootElement) {
- ViewPrototype vDiagram = getViewPrototype(pDiagramName, pRootElement);
- if (vDiagram != null) {
- vDiagram.instantiateOn(pRootElement, pDiagramName + vDiagram.getViewCountOn(pRootElement));
- }
- }
-}
diff --git a/analysis/localanalysis/doc/org.polarsys.esf.localanalysis.doc/src/main/resources/help/html/usermanual/UserManual.html b/analysis/localanalysis/doc/org.polarsys.esf.localanalysis.doc/src/main/resources/help/html/usermanual/UserManual.html
index 6ac7f60..a2ef44f 100644
--- a/analysis/localanalysis/doc/org.polarsys.esf.localanalysis.doc/src/main/resources/help/html/usermanual/UserManual.html
+++ b/analysis/localanalysis/doc/org.polarsys.esf.localanalysis.doc/src/main/resources/help/html/usermanual/UserManual.html
@@ -118,8 +118,11 @@
<li><b>SFearedEventsLibrary:</b>This table lists all Feared Events and Failure Events Families of the system (see more below). It is created for the first Local Analysis or when it was removed. For each ESF Model, it should have only one SFearedEventsLibrary package.</li>
</ul>
<img src="./images/Fig_2_1_2_ElementsCreatedForStartingLocalAnalysis.png" alt="Elements Created For Starting Local Analysis" height="300px">
- <p><b>Note:</b> Before start a new Local Analysis, verify that all SPort elements of SBlock have defined their direction (see "Help > ESF Documentation > User Manual"). But if you do not do this, it is possible to modify the "Direction" attribute of SPortLAnalysis (stereotype applied on a port). For each port applied by SPortLAnalysis, go to the "Properties View", click on "ESFLocalAnalysis" tab and set the "Direction" attribute: "IN" or "OUT". "INOUT" is a default value.</p>
- <img src="./images/Fig_2_1_3_SetSPortLAnalysisDirection.png" alt="Set SPortLAnalysis Direction" height="350px">
+ <p><b>Note:</b> Before start a new Local Analysis, verify that all SPort elements of SBlock have defined their direction (see "Help > ESF Documentation > User Manual"). This information
+ is automatically computed from the provision or requirement of packages and can be refined by Papyrus customizations such as Papyrus for Robotics. It can be manually overwritten, if required
+ via the "Manual Direction" attribute in the "Properties View" tab.</p>
+
+ <img src="./images/Fig_2_1_3_SetSPortLAnalysisDirection.png" alt="Set SPortLAnalysis Direction">
</div>
<div id="sysEventsLib">
diff --git a/analysis/localanalysis/doc/org.polarsys.esf.localanalysis.doc/src/main/resources/help/html/usermanual/images/Fig_2_1_3_SetSPortLAnalysisDirection.png b/analysis/localanalysis/doc/org.polarsys.esf.localanalysis.doc/src/main/resources/help/html/usermanual/images/Fig_2_1_3_SetSPortLAnalysisDirection.png
index f239eb7..367bf9c 100644
--- a/analysis/localanalysis/doc/org.polarsys.esf.localanalysis.doc/src/main/resources/help/html/usermanual/images/Fig_2_1_3_SetSPortLAnalysisDirection.png
+++ b/analysis/localanalysis/doc/org.polarsys.esf.localanalysis.doc/src/main/resources/help/html/usermanual/images/Fig_2_1_3_SetSPortLAnalysisDirection.png
Binary files differ
diff --git a/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution.ui/src/main/java/org/polarsys/esf/localanalysis/execution/ui/handler/CreateESFLocalAnalysisDiagramHandler.java b/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution.ui/src/main/java/org/polarsys/esf/localanalysis/execution/ui/handler/CreateESFLocalAnalysisDiagramHandler.java
index a3abfa2..8fff78c 100644
--- a/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution.ui/src/main/java/org/polarsys/esf/localanalysis/execution/ui/handler/CreateESFLocalAnalysisDiagramHandler.java
+++ b/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution.ui/src/main/java/org/polarsys/esf/localanalysis/execution/ui/handler/CreateESFLocalAnalysisDiagramHandler.java
@@ -20,10 +20,10 @@
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.util.UMLUtil;
+import org.polarsys.esf.core.common.ui.diagram.ESFDiagramUtil;
import org.polarsys.esf.core.utils.ModelUtil;
import org.polarsys.esf.esflocalanalysis.ISBlockLAnalysis;
import org.polarsys.esf.localanalysis.diagram.set.ESFLocalAnalysisDiagramSet;
-import org.polarsys.esf.localanalysis.diagram.util.ESFLocalAnalysisDiagramUtil;
/**
* Handler class for creating an ESFLocalAnalysis Diagram.
@@ -56,7 +56,7 @@
if ((vSelectedClass != null)
&& (UMLUtil.getStereotypeApplication(vSelectedClass, ISBlockLAnalysis.class) != null)) {
- ESFLocalAnalysisDiagramUtil
+ ESFDiagramUtil
.createDiagram(ESFLocalAnalysisDiagramSet.ESFLOCALANALYSIS_DIAGRAM_NAME, vSelectedClass);
}
return null;
diff --git a/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution/META-INF/MANIFEST.MF b/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution/META-INF/MANIFEST.MF
index fe6fcc7..2c31614 100644
--- a/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution/META-INF/MANIFEST.MF
+++ b/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@
org.eclipse.emf.common.ui,
org.eclipse.papyrus.infra.emf.readonly;bundle-version="3.0.0",
com.google.guava;bundle-version="21.0.0",
- com.google.gson;bundle-version="2.7.0"
+ com.google.gson;bundle-version="2.7.0",
+ org.polarsys.esf.core.common.ui;bundle-version="0.7.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: org.polarsys.esf.localanalysis.execution.setup
diff --git a/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution/src/main/java/org/polarsys/esf/localanalysis/execution/setup/NewLocalAnalysisSetup.java b/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution/src/main/java/org/polarsys/esf/localanalysis/execution/setup/NewLocalAnalysisSetup.java
index cd28626..7e5e45e 100644
--- a/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution/src/main/java/org/polarsys/esf/localanalysis/execution/setup/NewLocalAnalysisSetup.java
+++ b/analysis/localanalysis/execution/org.polarsys.esf.localanalysis.execution/src/main/java/org/polarsys/esf/localanalysis/execution/setup/NewLocalAnalysisSetup.java
@@ -19,13 +19,13 @@
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.util.UMLUtil;
+import org.polarsys.esf.core.common.ui.diagram.ESFDiagramUtil;
import org.polarsys.esf.core.utils.ESFTablesUtil;
import org.polarsys.esf.core.utils.ModelUtil;
import org.polarsys.esf.esflocalanalysis.ISLocalAnalysis;
import org.polarsys.esf.esflocalanalysis.ISSystemEventsLibrary;
import org.polarsys.esf.esflocalanalysis.impl.SLocalAnalysis;
import org.polarsys.esf.localanalysis.diagram.set.ESFLocalAnalysisDiagramSet;
-import org.polarsys.esf.localanalysis.diagram.util.ESFLocalAnalysisDiagramUtil;
import org.polarsys.esf.localanalysis.profile.tools.util.ESFLocalAnalysisUtil;
import org.polarsys.esf.localanalysis.table.set.ESFLocalAnalysisTablesSet;
@@ -62,7 +62,7 @@
ESFLocalAnalysisUtil.createSBlockLAnalysis(block);
// Create ESFLocalAnalysis diagram
- ESFLocalAnalysisDiagramUtil.createDiagram(
+ ESFDiagramUtil.createDiagram(
ESFLocalAnalysisDiagramSet.ESFLOCALANALYSIS_DIAGRAM_NAME,
block);
}
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile.validation/src/main/java/org/polarsys/esf/localanalysis/profile/validation/rules/SPortLAnalysisDirectionModelConstraint.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile.validation/src/main/java/org/polarsys/esf/localanalysis/profile/validation/rules/SPortLAnalysisDirectionModelConstraint.java
index 47b62a4..80cf541 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile.validation/src/main/java/org/polarsys/esf/localanalysis/profile/validation/rules/SPortLAnalysisDirectionModelConstraint.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile.validation/src/main/java/org/polarsys/esf/localanalysis/profile/validation/rules/SPortLAnalysisDirectionModelConstraint.java
@@ -16,8 +16,8 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.validation.AbstractModelConstraint;
import org.eclipse.emf.validation.IValidationContext;
+import org.polarsys.esf.esfarchitectureconcepts.SDirection;
import org.polarsys.esf.esflocalanalysis.ISPortLAnalysis;
-import org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis;
/**
* Class define the constraint of the direction of the {@link ISPortLAnalysis}:
@@ -44,7 +44,7 @@
if (pContext.getTarget() instanceof ISPortLAnalysis) {
ISPortLAnalysis vSPortLAnalysis = (ISPortLAnalysis) pContext.getTarget();
- if (vSPortLAnalysis.getSDirectionLAnalysis().getValue() != SDirectionLAnalysis.UNDEFINED_VALUE) {
+ if (vSPortLAnalysis.getSDirectionLAnalysis().getValue() != SDirection.UNDEFINED_VALUE) {
vStatus = pContext.createSuccessStatus();
} else {
vStatus = pContext.createFailureStatus(pContext.getTarget());
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/META-INF/MANIFEST.MF b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/META-INF/MANIFEST.MF
index 27764a5..8b430c2 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/META-INF/MANIFEST.MF
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@
org.eclipse.emf.ecore.xmi;bundle-version="2.11.1";visibility:=reexport,
org.eclipse.emf.common,
org.eclipse.emf.transaction,
- org.eclipse.papyrus.uml.tools.utils
+ org.eclipse.papyrus.uml.tools.utils,
+ org.polarsys.esf.core.profile.esfarchitectureconcepts.application;bundle-version="0.7.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.polarsys.esf.esflocalanalysis,
org.polarsys.esf.esflocalanalysis.impl,
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/plugin.xml b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/plugin.xml
index 38d6ad8..c6665cb 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/plugin.xml
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/plugin.xml
@@ -18,7 +18,6 @@
-->
<plugin>
- <extension-point id="portdirection" name="Port Direction" schema="schema/portdirection.exsd"/>
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated esflocalanalysis -->
<package
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/schema/portdirection.exsd b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/schema/portdirection.exsd
deleted file mode 100644
index 176ba88..0000000
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/schema/portdirection.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.polarsys.esf.localanalysis.profile" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.polarsys.esf.localanalysis.profile" id="portdirection" name="Port Direction"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <choice>
- <element ref="portDirection" minOccurs="0" maxOccurs="unbounded"/>
- </choice>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="portDirection">
- <complexType>
- <attribute name="class" type="string">
- <annotation>
- <documentation>
- A class that provides access to the code generator. It must implement the ILangCodegen interface.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.polarsys.esf.localanalysis.profile.IGetPortDirection"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/IESFLocalAnalysisPackage.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/IESFLocalAnalysisPackage.java
index 99f6293..cb57114 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/IESFLocalAnalysisPackage.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/IESFLocalAnalysisPackage.java
@@ -14,7 +14,6 @@
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
@@ -321,6 +320,16 @@
int SPORT_LANALYSIS__BASE_PORT = ABSTRACT_SFAILURE_MODE_OWNER_FEATURE_COUNT + 2;
/**
+ * The feature id for the '<em><b>SDirection Manual</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int SPORT_LANALYSIS__SDIRECTION_MANUAL = ABSTRACT_SFAILURE_MODE_OWNER_FEATURE_COUNT + 3;
+
+ /**
* The feature id for the '<em><b>SDirection LAnalysis</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -328,7 +337,7 @@
* @generated
* @ordered
*/
- int SPORT_LANALYSIS__SDIRECTION_LANALYSIS = ABSTRACT_SFAILURE_MODE_OWNER_FEATURE_COUNT + 3;
+ int SPORT_LANALYSIS__SDIRECTION_LANALYSIS = ABSTRACT_SFAILURE_MODE_OWNER_FEATURE_COUNT + 4;
/**
* The number of structural features of the '<em>SPort LAnalysis</em>' class.
@@ -338,7 +347,7 @@
* @generated
* @ordered
*/
- int SPORT_LANALYSIS_FEATURE_COUNT = ABSTRACT_SFAILURE_MODE_OWNER_FEATURE_COUNT + 4;
+ int SPORT_LANALYSIS_FEATURE_COUNT = ABSTRACT_SFAILURE_MODE_OWNER_FEATURE_COUNT + 5;
/**
* The number of operations of the '<em>SPort LAnalysis</em>' class.
@@ -2892,17 +2901,6 @@
int SLOCAL_EVENT_OPERATION_COUNT = ABSTRACT_SFAILURE_EVENT_LANALYSIS_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis <em>SDirection LAnalysis</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis
- * @see org.polarsys.esf.esflocalanalysis.impl.ESFLocalAnalysisPackage#getSDirectionLAnalysis()
- * @generated
- */
- int SDIRECTION_LANALYSIS = 24;
-
- /**
* Returns the meta object for class '{@link org.polarsys.esf.esflocalanalysis.IAbstractSLocalAnalysisElement <em>Abstract SLocal Analysis Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2961,6 +2959,18 @@
EReference getSPortLAnalysis_Base_Port();
/**
+ * Returns the meta object for the attribute '{@link org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getSDirectionManual <em>SDirection Manual</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>SDirection Manual</em>'.
+ * @see org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getSDirectionManual()
+ * @see #getSPortLAnalysis()
+ * @generated
+ */
+ EAttribute getSPortLAnalysis_SDirectionManual();
+
+ /**
* Returns the meta object for the attribute '{@link org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getSDirectionLAnalysis <em>SDirection LAnalysis</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3983,17 +3993,6 @@
EReference getSLocalEvent_Base_Property();
/**
- * Returns the meta object for enum '{@link org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis <em>SDirection LAnalysis</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for enum '<em>SDirection LAnalysis</em>'.
- * @see org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis
- * @generated
- */
- EEnum getSDirectionLAnalysis();
-
- /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4069,6 +4068,15 @@
EReference SPORT_LANALYSIS__BASE_PORT = eINSTANCE.getSPortLAnalysis_Base_Port();
/**
+ * The meta object literal for the '<em><b>SDirection Manual</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute SPORT_LANALYSIS__SDIRECTION_MANUAL = eINSTANCE.getSPortLAnalysis_SDirectionManual();
+
+ /**
* The meta object literal for the '<em><b>SDirection LAnalysis</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4895,17 +4903,6 @@
*/
EReference SLOCAL_EVENT__BASE_PROPERTY = eINSTANCE.getSLocalEvent_Base_Property();
- /**
- * The meta object literal for the '{@link org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis <em>SDirection LAnalysis</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis
- * @see org.polarsys.esf.esflocalanalysis.impl.ESFLocalAnalysisPackage#getSDirectionLAnalysis()
- * @generated
- */
- EEnum SDIRECTION_LANALYSIS = eINSTANCE.getSDirectionLAnalysis();
-
}
} // IESFLocalAnalysisPackage
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/ISPortLAnalysis.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/ISPortLAnalysis.java
index 1dab33d..6741862 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/ISPortLAnalysis.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/ISPortLAnalysis.java
@@ -15,6 +15,7 @@
import org.eclipse.uml2.uml.Port;
import org.polarsys.esf.esfarchitectureconcepts.ISPort;
+import org.polarsys.esf.esfarchitectureconcepts.SDirection;
/**
* <!-- begin-user-doc -->
@@ -28,6 +29,7 @@
* <li>{@link org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getSBlockLAnalysis <em>SBlock LAnalysis</em>}</li>
* <li>{@link org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getSPort <em>SPort</em>}</li>
* <li>{@link org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getSDirectionManual <em>SDirection Manual</em>}</li>
* <li>{@link org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getSDirectionLAnalysis <em>SDirection LAnalysis</em>}</li>
* </ul>
*
@@ -81,7 +83,7 @@
* @return the value of the '<em>SPort</em>' reference.
* @see #setSPort(ISPort)
* @see org.polarsys.esf.esflocalanalysis.IESFLocalAnalysisPackage#getSPortLAnalysis_SPort()
- * @model required="true" ordered="false"
+ * @model ordered="false"
* @generated
*/
ISPort getSPort();
@@ -128,8 +130,40 @@
void setBase_Port(Port value);
/**
+ * Returns the value of the '<em><b>SDirection Manual</b></em>' attribute.
+ * The literals are from the enumeration {@link org.polarsys.esf.esfarchitectureconcepts.SDirection}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>SDirection Manual</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>SDirection Manual</em>' attribute.
+ * @see org.polarsys.esf.esfarchitectureconcepts.SDirection
+ * @see #setSDirectionManual(SDirection)
+ * @see org.polarsys.esf.esflocalanalysis.IESFLocalAnalysisPackage#getSPortLAnalysis_SDirectionManual()
+ * @model ordered="false"
+ * @generated
+ */
+ SDirection getSDirectionManual();
+
+ /**
+ * Sets the value of the '{@link org.polarsys.esf.esflocalanalysis.ISPortLAnalysis#getSDirectionManual <em>SDirection Manual</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>SDirection Manual</em>' attribute.
+ * @see org.polarsys.esf.esfarchitectureconcepts.SDirection
+ * @see #getSDirectionManual()
+ * @generated
+ */
+ void setSDirectionManual(SDirection value);
+
+ /**
* Returns the value of the '<em><b>SDirection LAnalysis</b></em>' attribute.
- * The literals are from the enumeration {@link org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis}.
+ * The literals are from the enumeration {@link org.polarsys.esf.esfarchitectureconcepts.SDirection}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>SDirection LAnalysis</em>' attribute isn't clear,
@@ -138,11 +172,11 @@
* <!-- end-user-doc -->
*
* @return the value of the '<em>SDirection LAnalysis</em>' attribute.
- * @see org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis
+ * @see org.polarsys.esf.esfarchitectureconcepts.SDirection
* @see org.polarsys.esf.esflocalanalysis.IESFLocalAnalysisPackage#getSPortLAnalysis_SDirectionLAnalysis()
* @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
* @generated
*/
- SDirectionLAnalysis getSDirectionLAnalysis();
+ SDirection getSDirectionLAnalysis();
} // ISPortLAnalysis
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/SDirectionLAnalysis.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/SDirectionLAnalysis.java
deleted file mode 100644
index ee66e51..0000000
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/SDirectionLAnalysis.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * Copyright (c) 2016 ALL4TEC & CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * ALL4TEC & CEA LIST - initial API and implementation
- */
-package org.polarsys.esf.esflocalanalysis;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>SDirection LAnalysis</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- *
- * @see org.polarsys.esf.esflocalanalysis.IESFLocalAnalysisPackage#getSDirectionLAnalysis()
- * @model
- * @generated
- */
-public enum SDirectionLAnalysis implements Enumerator {
- /**
- * The '<em><b>IN</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #IN_VALUE
- * @generated
- * @ordered
- */
- IN(0, "IN", "IN"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>OUT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #OUT_VALUE
- * @generated
- * @ordered
- */
- OUT(1, "OUT", "OUT"),
- /**
- * The '<em><b>INOUT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #INOUT_VALUE
- * @generated
- * @ordered
- */
- INOUT(2, "INOUT", "INOUT"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>UNDEFINED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #UNDEFINED_VALUE
- * @generated
- * @ordered
- */
- UNDEFINED(3, "UNDEFINED", "UNDEFINED"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>IN</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>IN</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @see #IN
- * @model
- * @generated
- * @ordered
- */
- public static final int IN_VALUE = 0;
-
- /**
- * The '<em><b>OUT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>OUT</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @see #OUT
- * @model
- * @generated
- * @ordered
- */
- public static final int OUT_VALUE = 1;
-
- /**
- * The '<em><b>INOUT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>INOUT</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @see #INOUT
- * @model
- * @generated
- * @ordered
- */
- public static final int INOUT_VALUE = 2;
-
- /**
- * The '<em><b>UNDEFINED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>UNDEFINED</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @see #UNDEFINED
- * @model
- * @generated
- * @ordered
- */
- public static final int UNDEFINED_VALUE = 3;
-
- /**
- * An array of all the '<em><b>SDirection LAnalysis</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private static final SDirectionLAnalysis[] VALUES_ARRAY = new SDirectionLAnalysis[] {
- IN,
- OUT,
- INOUT,
- UNDEFINED,
- };
-
- /**
- * A public read-only list of all the '<em><b>SDirection LAnalysis</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public static final List<SDirectionLAnalysis> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>SDirection LAnalysis</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param literal
- * the literal.
- * @return the matching enumerator or <code>null</code>.
- * @generated
- */
- public static SDirectionLAnalysis get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- SDirectionLAnalysis result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>SDirection LAnalysis</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param name
- * the name.
- * @return the matching enumerator or <code>null</code>.
- * @generated
- */
- public static SDirectionLAnalysis getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- SDirectionLAnalysis result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>SDirection LAnalysis</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value
- * the integer value.
- * @return the matching enumerator or <code>null</code>.
- * @generated
- */
- public static SDirectionLAnalysis get(int value) {
- switch (value) {
- case IN_VALUE:
- return IN;
- case OUT_VALUE:
- return OUT;
- case INOUT_VALUE:
- return INOUT;
- case UNDEFINED_VALUE:
- return UNDEFINED;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private SDirectionLAnalysis(int value, String name, String literal) {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public int getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String getLiteral() {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String toString() {
- return literal;
- }
-
-} // SDirectionLAnalysis
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisFactory.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisFactory.java
index 845d565..729b647 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisFactory.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisFactory.java
@@ -13,7 +13,6 @@
package org.polarsys.esf.esflocalanalysis.impl;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
@@ -121,38 +120,6 @@
* @generated
*/
@Override
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case IESFLocalAnalysisPackage.SDIRECTION_LANALYSIS:
- return createSDirectionLAnalysisFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case IESFLocalAnalysisPackage.SDIRECTION_LANALYSIS:
- return convertSDirectionLAnalysisToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
public ISPortLAnalysis createSPortLAnalysis() {
SPortLAnalysis sPortLAnalysis = new SPortLAnalysis();
return sPortLAnalysis;
@@ -368,29 +335,6 @@
*
* @generated
*/
- public SDirectionLAnalysis createSDirectionLAnalysisFromString(EDataType eDataType, String initialValue) {
- SDirectionLAnalysis result = SDirectionLAnalysis.get(initialValue);
- if (result == null)
- throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String convertSDirectionLAnalysisToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
@Override
public IESFLocalAnalysisPackage getESFLocalAnalysisPackage() {
return (IESFLocalAnalysisPackage) getEPackage();
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisPackage.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisPackage.java
index 94d7a02..c194174 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisPackage.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisPackage.java
@@ -14,7 +14,6 @@
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
@@ -55,8 +54,6 @@
import org.polarsys.esf.esflocalanalysis.ISSystemEventType;
import org.polarsys.esf.esflocalanalysis.ISSystemEventsLibrary;
import org.polarsys.esf.esflocalanalysis.ISUntimelyFailureMode;
-import org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis;
-
import org.polarsys.esf.esfproperties.IESFPropertiesPackage;
import org.polarsys.esf.esfsafetyconcepts.IESFSafetyConceptsPackage;
@@ -268,14 +265,6 @@
private EClass sLocalEventEClass = null;
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EEnum sDirectionLAnalysisEEnum = null;
-
- /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -413,7 +402,7 @@
* @generated
*/
@Override
- public EAttribute getSPortLAnalysis_SDirectionLAnalysis() {
+ public EAttribute getSPortLAnalysis_SDirectionManual() {
return (EAttribute) sPortLAnalysisEClass.getEStructuralFeatures().get(3);
}
@@ -424,6 +413,17 @@
* @generated
*/
@Override
+ public EAttribute getSPortLAnalysis_SDirectionLAnalysis() {
+ return (EAttribute) sPortLAnalysisEClass.getEStructuralFeatures().get(4);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public EClass getAbstractSFailureModeOwner() {
return abstractSFailureModeOwnerEClass;
}
@@ -1370,17 +1370,6 @@
* @generated
*/
@Override
- public EEnum getSDirectionLAnalysis() {
- return sDirectionLAnalysisEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
public IESFLocalAnalysisFactory getESFLocalAnalysisFactory() {
return (IESFLocalAnalysisFactory) getEFactoryInstance();
}
@@ -1413,6 +1402,7 @@
createEReference(sPortLAnalysisEClass, SPORT_LANALYSIS__SBLOCK_LANALYSIS);
createEReference(sPortLAnalysisEClass, SPORT_LANALYSIS__SPORT);
createEReference(sPortLAnalysisEClass, SPORT_LANALYSIS__BASE_PORT);
+ createEAttribute(sPortLAnalysisEClass, SPORT_LANALYSIS__SDIRECTION_MANUAL);
createEAttribute(sPortLAnalysisEClass, SPORT_LANALYSIS__SDIRECTION_LANALYSIS);
abstractSFailureModeOwnerEClass = createEClass(ABSTRACT_SFAILURE_MODE_OWNER);
@@ -1522,9 +1512,6 @@
sLocalEventEClass = createEClass(SLOCAL_EVENT);
createEReference(sLocalEventEClass, SLOCAL_EVENT__BASE_PROPERTY);
-
- // Create enums
- sDirectionLAnalysisEEnum = createEEnum(SDIRECTION_LANALYSIS);
}
/**
@@ -1597,11 +1584,14 @@
initEClass(sPortLAnalysisEClass, ISPortLAnalysis.class, "SPortLAnalysis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getSPortLAnalysis_SBlockLAnalysis(), this.getSBlockLAnalysis(), this.getSBlockLAnalysis_SPortsLAnalysisList(), "sBlockLAnalysis", null, 1, 1, ISPortLAnalysis.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$
IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
- initEReference(getSPortLAnalysis_SPort(), theESFArchitectureConceptsPackage.getSPort(), null, "sPort", null, 1, 1, ISPortLAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$
+ initEReference(getSPortLAnalysis_SPort(), theESFArchitectureConceptsPackage.getSPort(), null, "sPort", null, 0, 1, ISPortLAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, //$NON-NLS-1$
!IS_DERIVED, !IS_ORDERED);
initEReference(getSPortLAnalysis_Base_Port(), theUMLPackage.getPort(), null, "base_Port", null, 1, 1, ISPortLAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
!IS_ORDERED);
- initEAttribute(getSPortLAnalysis_SDirectionLAnalysis(), this.getSDirectionLAnalysis(), "sDirectionLAnalysis", null, 1, 1, ISPortLAnalysis.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSPortLAnalysis_SDirectionManual(), theESFArchitectureConceptsPackage.getSDirection(), "sDirectionManual", null, 0, 1, ISPortLAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
+ !IS_ORDERED);
+ initEAttribute(getSPortLAnalysis_SDirectionLAnalysis(), theESFArchitectureConceptsPackage.getSDirection(), "sDirectionLAnalysis", null, 1, 1, ISPortLAnalysis.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, //$NON-NLS-1$
+ IS_DERIVED, !IS_ORDERED);
initEClass(abstractSFailureModeOwnerEClass, IAbstractSFailureModeOwner.class, "AbstractSFailureModeOwner", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getAbstractSFailureModeOwner_SFailureModesLAnalysisList(), this.getAbstractSFailureModeLAnalysis(), this.getAbstractSFailureModeLAnalysis_Owner(), "sFailureModesLAnalysisList", null, 0, -1, IAbstractSFailureModeOwner.class, IS_TRANSIENT, //$NON-NLS-1$
@@ -1773,13 +1763,6 @@
initEReference(getSLocalEvent_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ISLocalEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
!IS_ORDERED);
- // Initialize enums and add enum literals
- initEEnum(sDirectionLAnalysisEEnum, SDirectionLAnalysis.class, "SDirectionLAnalysis"); //$NON-NLS-1$
- addEEnumLiteral(sDirectionLAnalysisEEnum, SDirectionLAnalysis.IN);
- addEEnumLiteral(sDirectionLAnalysisEEnum, SDirectionLAnalysis.OUT);
- addEEnumLiteral(sDirectionLAnalysisEEnum, SDirectionLAnalysis.INOUT);
- addEEnumLiteral(sDirectionLAnalysisEEnum, SDirectionLAnalysis.UNDEFINED);
-
// Create resource
createResource(eNS_URI);
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/SPortLAnalysis.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/SPortLAnalysis.java
index 1481499..50904a6 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/SPortLAnalysis.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/SPortLAnalysis.java
@@ -18,11 +18,10 @@
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.uml2.uml.Port;
import org.polarsys.esf.esfarchitectureconcepts.ISPort;
+import org.polarsys.esf.esfarchitectureconcepts.SDirection;
import org.polarsys.esf.esflocalanalysis.IESFLocalAnalysisPackage;
import org.polarsys.esf.esflocalanalysis.ISBlockLAnalysis;
import org.polarsys.esf.esflocalanalysis.ISPortLAnalysis;
-import org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis;
-import org.polarsys.esf.localanalysis.profile.PortDirection;
/**
* <!-- begin-user-doc -->
@@ -35,6 +34,7 @@
* <li>{@link org.polarsys.esf.esflocalanalysis.impl.SPortLAnalysis#getSBlockLAnalysis <em>SBlock LAnalysis</em>}</li>
* <li>{@link org.polarsys.esf.esflocalanalysis.impl.SPortLAnalysis#getSPort <em>SPort</em>}</li>
* <li>{@link org.polarsys.esf.esflocalanalysis.impl.SPortLAnalysis#getBase_Port <em>Base Port</em>}</li>
+ * <li>{@link org.polarsys.esf.esflocalanalysis.impl.SPortLAnalysis#getSDirectionManual <em>SDirection Manual</em>}</li>
* <li>{@link org.polarsys.esf.esflocalanalysis.impl.SPortLAnalysis#getSDirectionLAnalysis <em>SDirection LAnalysis</em>}</li>
* </ul>
*
@@ -67,6 +67,28 @@
protected Port base_Port;
/**
+ * The default value of the '{@link #getSDirectionManual() <em>SDirection Manual</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getSDirectionManual()
+ * @generated
+ * @ordered
+ */
+ protected static final SDirection SDIRECTION_MANUAL_EDEFAULT = SDirection.IN;
+
+ /**
+ * The cached value of the '{@link #getSDirectionManual() <em>SDirection Manual</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getSDirectionManual()
+ * @generated
+ * @ordered
+ */
+ protected SDirection sDirectionManual = SDIRECTION_MANUAL_EDEFAULT;
+
+ /**
* The default value of the '{@link #getSDirectionLAnalysis() <em>SDirection LAnalysis</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -75,7 +97,7 @@
* @generated
* @ordered
*/
- protected static final SDirectionLAnalysis SDIRECTION_LANALYSIS_EDEFAULT = SDirectionLAnalysis.IN;
+ protected static final SDirection SDIRECTION_LANALYSIS_EDEFAULT = SDirection.IN;
/**
* <!-- begin-user-doc -->
@@ -226,15 +248,38 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @generated NOT
+ * @generated
*/
@Override
- public SDirectionLAnalysis getSDirectionLAnalysis() {
- Port port = getBase_Port();
- if (port != null) {
- return PortDirection.getSDirectionLAnalysis(port);
- }
- return SDirectionLAnalysis.UNDEFINED;
+ public SDirection getSDirectionManual() {
+ return sDirectionManual;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setSDirectionManual(SDirection newSDirectionManual) {
+ SDirection oldSDirectionManual = sDirectionManual;
+ sDirectionManual = newSDirectionManual == null ? SDIRECTION_MANUAL_EDEFAULT : newSDirectionManual;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, IESFLocalAnalysisPackage.SPORT_LANALYSIS__SDIRECTION_MANUAL, oldSDirectionManual, sDirectionManual));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public SDirection getSDirectionLAnalysis() {
+ // TODO: implement this method to return the 'SDirection' attribute
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
}
/**
@@ -258,6 +303,8 @@
if (resolve)
return getBase_Port();
return basicGetBase_Port();
+ case IESFLocalAnalysisPackage.SPORT_LANALYSIS__SDIRECTION_MANUAL:
+ return getSDirectionManual();
case IESFLocalAnalysisPackage.SPORT_LANALYSIS__SDIRECTION_LANALYSIS:
return getSDirectionLAnalysis();
}
@@ -282,6 +329,9 @@
case IESFLocalAnalysisPackage.SPORT_LANALYSIS__BASE_PORT:
setBase_Port((Port) newValue);
return;
+ case IESFLocalAnalysisPackage.SPORT_LANALYSIS__SDIRECTION_MANUAL:
+ setSDirectionManual((SDirection) newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -304,6 +354,9 @@
case IESFLocalAnalysisPackage.SPORT_LANALYSIS__BASE_PORT:
setBase_Port((Port) null);
return;
+ case IESFLocalAnalysisPackage.SPORT_LANALYSIS__SDIRECTION_MANUAL:
+ setSDirectionManual(SDIRECTION_MANUAL_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -323,10 +376,30 @@
return sPort != null;
case IESFLocalAnalysisPackage.SPORT_LANALYSIS__BASE_PORT:
return base_Port != null;
+ case IESFLocalAnalysisPackage.SPORT_LANALYSIS__SDIRECTION_MANUAL:
+ return sDirectionManual != SDIRECTION_MANUAL_EDEFAULT;
case IESFLocalAnalysisPackage.SPORT_LANALYSIS__SDIRECTION_LANALYSIS:
return getSDirectionLAnalysis() != SDIRECTION_LANALYSIS_EDEFAULT;
}
return super.eIsSet(featureID);
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy())
+ return super.toString();
+
+ StringBuilder result = new StringBuilder(super.toString());
+ result.append(" (sDirectionManual: "); //$NON-NLS-1$
+ result.append(sDirectionManual);
+ result.append(')');
+ return result.toString();
+ }
+
} // SPortLAnalysis
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/MSPortLAnalysis.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/MSPortLAnalysis.java
index a4b407c..236181b 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/MSPortLAnalysis.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/MSPortLAnalysis.java
@@ -16,8 +16,11 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreEList.UnmodifiableEList;
import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Port;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.util.UMLUtil;
+import org.polarsys.esf.core.profile.esfarchitectureconcepts.PortDirection;
+import org.polarsys.esf.esfarchitectureconcepts.SDirection;
import org.polarsys.esf.esfcore.impl.GenericAbstractSElement;
import org.polarsys.esf.esflocalanalysis.IAbstractSFailureModeLAnalysis;
import org.polarsys.esf.esflocalanalysis.IMSPortLAnalysis;
@@ -91,4 +94,17 @@
return vUSFailureModesLAnalysisList;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public SDirection getSDirectionLAnalysis() {
+ Port port = getBase_Port();
+ SDirection direction = getSDirectionManual();
+ if (direction == SDirection.UNDEFINED && port != null) {
+ direction = PortDirection.getSDirection(port);
+ }
+ return direction;
+ }
}
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/localanalysis/profile/IGetPortDirection.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/localanalysis/profile/IGetPortDirection.java
deleted file mode 100644
index 64027b8..0000000
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/localanalysis/profile/IGetPortDirection.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 ALL4TEC & CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * ALL4TEC & CEA LIST - initial API and implementation
- ******************************************************************************/
-
-package org.polarsys.esf.localanalysis.profile;
-
-import org.eclipse.uml2.uml.Port;
-import org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis;
-
-public interface IGetPortDirection {
- /**
- * Returns the direction of a port
- * Domain-specific implementations should return UNDEFINED, if the port
- * does not apply a stereotype from which the direction can be deferred.
- */
- SDirectionLAnalysis getSDirectionLAnalysis(Port port);
-}
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/localanalysis/profile/PortDirection.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/localanalysis/profile/PortDirection.java
deleted file mode 100644
index 1050c7f..0000000
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/localanalysis/profile/PortDirection.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 ALL4TEC & CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * ALL4TEC & CEA LIST - initial API and implementation
- ******************************************************************************/
-
-package org.polarsys.esf.localanalysis.profile;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.uml2.uml.Port;
-import org.polarsys.esf.esflocalanalysis.SDirectionLAnalysis;
-
-/**
- * Handle calculation of port direction based on extension points
- */
-public class PortDirection {
-
- private static final String CLASS = "class"; //$NON-NLS-1$
-
- public static final String IPORT_DIRECTION_ID = ESFLocalAnalysisProfileActivator.PLUGIN_ID + ".portdirection"; //$NON-NLS-1$
-
- /**
- * Retrieve a direction from a port. The first extension returning a
- * defined value (in, out, inout) is returned
- *
- * @param port a UML port for which the direction should be determined
- * @return the direction of the passed port
- */
- public static SDirectionLAnalysis getSDirectionLAnalysis(Port port) {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] configElements = reg.getConfigurationElementsFor(IPORT_DIRECTION_ID);
-
- for (IConfigurationElement configElement : configElements) {
- try {
- final Object obj = configElement.createExecutableExtension(CLASS);
- if (obj instanceof IGetPortDirection) {
- IGetPortDirection calcDirection = (IGetPortDirection) obj;
- SDirectionLAnalysis direction = calcDirection.getSDirectionLAnalysis(port);
- if (direction != SDirectionLAnalysis.UNDEFINED) {
- return direction;
- }
- }
- } catch (CoreException exception) {
- exception.printStackTrace();
- }
- }
- // No value via extension point, return default calculation
- if (port.getProvideds().size() > 0 && port.getRequireds().size() > 0) {
- return SDirectionLAnalysis.INOUT;
- } else if (port.getProvideds().size() > 0) {
- return SDirectionLAnalysis.IN;
- } else if (port.getRequireds().size() > 0) {
- return SDirectionLAnalysis.OUT;
- }
- return SDirectionLAnalysis.UNDEFINED;
- }
-}
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.ecore b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.ecore
index df4ca95..781fc04 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.ecore
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.ecore
@@ -12,12 +12,14 @@
lowerBound="1" eType="#//SBlockLAnalysis" volatile="true" transient="true"
derived="true" eOpposite="#//SBlockLAnalysis/sPortsLAnalysisList"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="sPort" ordered="false"
- lowerBound="1" eType="ecore:EClass ../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore#//SPort"/>
+ eType="ecore:EClass ../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore#//SPort"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Port" ordered="false"
lowerBound="1" eType="ecore:EClass ../../../../../../org.eclipse.uml2.uml/model/UML.ecore#//Port"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="sDirectionManual" ordered="false"
+ eType="ecore:EEnum ../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore#//SDirection"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="sDirectionLAnalysis" ordered="false"
- lowerBound="1" eType="#//SDirectionLAnalysis" changeable="false" volatile="true"
- transient="true" derived="true"/>
+ lowerBound="1" eType="ecore:EEnum ../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore#//SDirection"
+ changeable="false" volatile="true" transient="true" derived="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AbstractSFailureModeOwner" abstract="true"
eSuperTypes="#//AbstractSLocalAnalysisElement">
@@ -200,12 +202,6 @@
lowerBound="1" eType="#//SFearedEventsLibrary" volatile="true" transient="true"
derived="true" eOpposite="#//SFearedEventsLibrary/sFearedEventsList"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="SDirectionLAnalysis">
- <eLiterals name="IN"/>
- <eLiterals name="OUT" value="1"/>
- <eLiterals name="INOUT" value="2"/>
- <eLiterals name="UNDEFINED" value="3"/>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SDysfunctionalAssociation" eSuperTypes="#//AbstractSLocalAnalysisElement">
<eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
<details key="originalName" value="SDysfunctionalAssociation "/>
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.genmodel b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.genmodel
index 8f2aebe..f729ce9 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.genmodel
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.genmodel
@@ -41,12 +41,6 @@
<foreignModel>../profile/esflocalanalysis.profile.uml</foreignModel>
<genPackages xsi:type="genmodel:GenPackage" prefix="ESFLocalAnalysis" basePackage="org.polarsys.esf"
disposableProviderFactory="true" ecorePackage="esflocalanalysis.ecore#/">
- <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="esflocalanalysis.ecore#//SDirectionLAnalysis">
- <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="esflocalanalysis.ecore#//SDirectionLAnalysis/IN"/>
- <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="esflocalanalysis.ecore#//SDirectionLAnalysis/OUT"/>
- <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="esflocalanalysis.ecore#//SDirectionLAnalysis/INOUT"/>
- <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="esflocalanalysis.ecore#//SDirectionLAnalysis/UNDEFINED"/>
- </genEnums>
<genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="esflocalanalysis.ecore#//AbstractSLocalAnalysisElement"/>
<genClasses xsi:type="genmodel:GenClass" ecoreClass="esflocalanalysis.ecore#//SPortLAnalysis">
<genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
@@ -55,6 +49,7 @@
propertySortChoices="true" ecoreFeature="ecore:EReference esflocalanalysis.ecore#//SPortLAnalysis/sPort"/>
<genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference esflocalanalysis.ecore#//SPortLAnalysis/base_Port"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute esflocalanalysis.ecore#//SPortLAnalysis/sDirectionManual"/>
<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute esflocalanalysis.ecore#//SPortLAnalysis/sDirectionLAnalysis"/>
</genClasses>
<genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="esflocalanalysis.ecore#//AbstractSFailureModeOwner">
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.notation b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.notation
index 1b600e3..7e81249 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.notation
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.notation
@@ -241,25 +241,6 @@
<element xmi:type="uml:Stereotype" href="esflocalanalysis.profile.uml#_PowtADxrEeaxysbBLKHNew"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_PpRqYTxrEeaxysbBLKHNew" x="20" y="271" width="117" height="69"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_cuSj4EdjEeaeKb9H0TbPpw" type="Enumeration_Shape_CN">
- <children xmi:type="notation:DecorationNode" xmi:id="_cuTyAEdjEeaeKb9H0TbPpw" type="Enumeration_NameLabel_CN"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_cuTyAUdjEeaeKb9H0TbPpw" visible="false" type="Enumeration_LiteralCompartment_CN">
- <children xmi:type="notation:Shape" xmi:id="_oB8CYEdjEeaeKb9H0TbPpw" type="EnumerationLiteral_LiteralLabel">
- <element xmi:type="uml:EnumerationLiteral" href="esflocalanalysis.profile.uml#_oBSiIEdjEeaeKb9H0TbPpw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_oB8CYUdjEeaeKb9H0TbPpw"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_u2uI4EdjEeaeKb9H0TbPpw" type="EnumerationLiteral_LiteralLabel">
- <element xmi:type="uml:EnumerationLiteral" href="esflocalanalysis.profile.uml#_u2WVcEdjEeaeKb9H0TbPpw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_u2uI4UdjEeaeKb9H0TbPpw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_cuTyAkdjEeaeKb9H0TbPpw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_cuTyA0djEeaeKb9H0TbPpw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_cuTyBEdjEeaeKb9H0TbPpw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cuTyBUdjEeaeKb9H0TbPpw"/>
- </children>
- <element xmi:type="uml:Enumeration" href="esflocalanalysis.profile.uml#_cs-8UEdjEeaeKb9H0TbPpw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cuSj4UdjEeaeKb9H0TbPpw" x="371" y="432" width="165" height="69"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_C81s4EzmEeaYxONpyCwQOA" type="Stereotype_Shape_CN">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_H_P20EzmEeaYxONpyCwQOA" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_H_P20UzmEeaYxONpyCwQOA" key="fillColor" value="true"/>
@@ -1332,6 +1313,16 @@
<element xmi:type="uml:Property" href="esflocalanalysis.profile.uml#_91-9gEdjEeaeKb9H0TbPpw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_93EioUdjEeaeKb9H0TbPpw"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_4ih0oCU0Eem0xphtddBpYA" type="Property_ClassAttributeLabel">
+ <styles xmi:type="notation:StringListValueStyle" xmi:id="_6-Xk8CU0Eem0xphtddBpYA" name="maskLabel">
+ <stringListValue>multiplicity</stringListValue>
+ <stringListValue>name</stringListValue>
+ <stringListValue>type</stringListValue>
+ <stringListValue>derived</stringListValue>
+ </styles>
+ <element xmi:type="uml:Property" href="esflocalanalysis.profile.uml#_RiO60CUyEem0xphtddBpYA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4ih0oSU0Eem0xphtddBpYA"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_FLZm4hjfEeWhPZtBPxjsVg"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_FLZm4xjfEeWhPZtBPxjsVg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_FLZm5BjfEeWhPZtBPxjsVg"/>
@@ -1344,7 +1335,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLaN9BjfEeWhPZtBPxjsVg"/>
</children>
<element xmi:type="uml:Stereotype" href="esflocalanalysis.profile.uml#_TrDS4BjVEeWhPZtBPxjsVg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLY_0RjfEeWhPZtBPxjsVg" x="427" y="95" width="336" height="86"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLY_0RjfEeWhPZtBPxjsVg" x="427" y="95" width="288" height="86"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_F-78oBjfEeWhPZtBPxjsVg" type="Stereotype_Shape_CN">
<children xmi:type="notation:DecorationNode" xmi:id="_F-8jsBjfEeWhPZtBPxjsVg" type="Stereotype_NameLabel_CN"/>
@@ -1737,19 +1728,19 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_E4vtcxjbEeWhPZtBPxjsVg"/>
</children>
<element xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E4vGYRjbEeWhPZtBPxjsVg" x="81" y="67" width="1825" height="1048"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E4vGYRjbEeWhPZtBPxjsVg" x="60" y="40" width="1825" height="1048"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_5nMTkJd0EeW5fbxg7IPY-w" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_5nMTkZd0EeW5fbxg7IPY-w" showTitle="true"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5nMTk5d0EeW5fbxg7IPY-w" name="BASE_ELEMENT">
+ <children xmi:type="notation:Shape" xmi:id="_Z-hfwCU0Eem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z-hfwSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z-hfwyU0Eem0xphtddBpYA" name="BASE_ELEMENT">
<eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
</styles>
<element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5nMTkpd0EeW5fbxg7IPY-w" x="304" y="67"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z-hfwiU0Eem0xphtddBpYA" x="281" y="67"/>
</children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_DqgYsRjbEeWhPZtBPxjsVg" name="diagram_compatibility_version" stringValue="1.2.0"/>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_DqgYsRjbEeWhPZtBPxjsVg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_DqgYshjbEeWhPZtBPxjsVg"/>
- <styles xmi:type="style:PapyrusViewStyle" xmi:id="_DqgYsxjbEeWhPZtBPxjsVg">
+ <styles xmi:type="style_1:PapyrusDiagramStyle" xmi:id="_5Be-UCUwEem0xphtddBpYA" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">
<owner xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
</styles>
<element xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
@@ -1788,7 +1779,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_LEuf0RjhEeWhPZtBPxjsVg"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_LEsqoxjhEeWhPZtBPxjsVg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LEuf0hjhEeWhPZtBPxjsVg" points="[1068, 336, -643984, -643984]$[1068, 360, -643984, -643984]$[1038, 360, -643984, -643984]$[1038, 384, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LEuf0hjhEeWhPZtBPxjsVg" points="[1047, 309, -643984, -643984]$[1047, 333, -643984, -643984]$[1017, 333, -643984, -643984]$[1017, 357, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LE6tEBjhEeWhPZtBPxjsVg" id="(0.453125,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LE6tERjhEeWhPZtBPxjsVg" id="(0.5536723163841808,0.0)"/>
</edges>
@@ -1807,7 +1798,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_vmWuMDxvEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_M9fYRBjhEeWhPZtBPxjsVg" x="-21" y="117"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_M9fYRBjhEeWhPZtBPxjsVg" x="-28" y="103"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_M9fYRRjhEeWhPZtBPxjsVg" type="Association_SourceRoleLabel">
<styles xmi:type="notation:StringListValueStyle" xmi:id="_0D_5sBjhEeWhPZtBPxjsVg" name="maskLabel">
@@ -1815,7 +1806,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_vmgfMDxvEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_M9fYRhjhEeWhPZtBPxjsVg" x="29" y="183"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_M9fYRhjhEeWhPZtBPxjsVg" x="29" y="71"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_M9fYRxjhEeWhPZtBPxjsVg" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_vmq3QDxvEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1827,7 +1818,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_M9exMRjhEeWhPZtBPxjsVg"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_M9djExjhEeWhPZtBPxjsVg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M9exMhjhEeWhPZtBPxjsVg" points="[773, 624, -643984, -643984]$[773, 741, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M9exMhjhEeWhPZtBPxjsVg" points="[752, 597, -643984, -643984]$[752, 714, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M9pwUBjhEeWhPZtBPxjsVg" id="(0.16909620991253643,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M9pwURjhEeWhPZtBPxjsVg" id="(0.16909620991253643,0.0)"/>
</edges>
@@ -1846,7 +1837,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_wDCqMDxvEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_NYlY1BjhEeWhPZtBPxjsVg" x="-30" y="125"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_NYlY1BjhEeWhPZtBPxjsVg" x="-28" y="98"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_NYlY1RjhEeWhPZtBPxjsVg" type="Association_SourceRoleLabel">
<styles xmi:type="notation:StringListValueStyle" xmi:id="_zq42IBjhEeWhPZtBPxjsVg" name="maskLabel">
@@ -1854,7 +1845,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_wDMbMDxvEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_NYlY1hjhEeWhPZtBPxjsVg" x="28" y="183"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_NYlY1hjhEeWhPZtBPxjsVg" x="29" y="69"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_NYlY1xjhEeWhPZtBPxjsVg" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_wDYocDxvEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1866,7 +1857,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_NYkxwRjhEeWhPZtBPxjsVg"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_NYjjoBjhEeWhPZtBPxjsVg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NYkxwhjhEeWhPZtBPxjsVg" points="[988, 624, -643984, -643984]$[988, 741, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NYkxwhjhEeWhPZtBPxjsVg" points="[967, 597, -643984, -643984]$[967, 714, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NYwX8BjhEeWhPZtBPxjsVg" id="(0.793002915451895,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wCiT4DxvEeaxysbBLKHNew" id="(0.793002915451895,0.0)"/>
</edges>
@@ -1896,7 +1887,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_j2AiEDxuEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_OKpu9xjhEeWhPZtBPxjsVg" x="50" y="1"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OKpu9xjhEeWhPZtBPxjsVg" x="46" y="-28"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_OKpu-BjhEeWhPZtBPxjsVg" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_j2NWYDxuEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1908,9 +1899,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_OKpH4RjhEeWhPZtBPxjsVg"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_OKn5wBjhEeWhPZtBPxjsVg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OKpH4hjhEeWhPZtBPxjsVg" points="[265, 567, -643984, -643984]$[265, 881, -643984, -643984]$[797, 881, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OK3xYBjhEeWhPZtBPxjsVg" id="(0.32950191570881227,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OK3xYRjhEeWhPZtBPxjsVg" id="(0.0,0.4230769230769231)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OKpH4hjhEeWhPZtBPxjsVg" points="[239, 521, -643984, -643984]$[239, 833, -643984, -643984]$[776, 833, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OK3xYBjhEeWhPZtBPxjsVg" id="(0.3103448275862069,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OK3xYRjhEeWhPZtBPxjsVg" id="(0.0,0.3974358974358974)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_Ovx1QBjhEeWhPZtBPxjsVg" type="Association_Edge" source="_D83mQDxuEeaxysbBLKHNew" target="_IL6KgBjfEeWhPZtBPxjsVg" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_Ovx1QxjhEeWhPZtBPxjsVg" visible="false" type="Association_StereotypeLabel">
@@ -1927,7 +1918,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_j3ESADxuEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_OvycUxjhEeWhPZtBPxjsVg" x="-167" y="-17"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OvycUxjhEeWhPZtBPxjsVg" x="-27" y="-73"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_OvycVBjhEeWhPZtBPxjsVg" type="Association_SourceRoleLabel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-02ZQkzkEeaYxONpyCwQOA" source="PapyrusCSSForceValue">
@@ -1938,7 +1929,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_j3RGUDxuEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_OvycVRjhEeWhPZtBPxjsVg" x="26" y="-12"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_OvycVRjhEeWhPZtBPxjsVg" x="92" y="-18"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_OvycVhjhEeWhPZtBPxjsVg" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_j3a3UDxuEeaxysbBLKHNew" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1950,7 +1941,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_Ovx1QRjhEeWhPZtBPxjsVg"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_OvwnIBjhEeWhPZtBPxjsVg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ovx1QhjhEeWhPZtBPxjsVg" points="[440, 551, -643984, -643984]$[710, 551, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ovx1QhjhEeWhPZtBPxjsVg" points="[419, 524, -643984, -643984]$[689, 524, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OwAewBjhEeWhPZtBPxjsVg" id="(1.0,0.9166666666666666)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OwAewRjhEeWhPZtBPxjsVg" id="(0.0,0.0641025641025641)"/>
</edges>
@@ -1961,9 +1952,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_Qm0PYRjhEeWhPZtBPxjsVg"/>
<element xmi:type="uml:Generalization" href="esflocalanalysis.profile.uml#_EvckUBjXEeWhPZtBPxjsVg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qm0PYhjhEeWhPZtBPxjsVg" points="[1083, 512, -643984, -643984]$[1083, 780, -643984, -643984]$[1059, 780, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gdN3AEzlEeaYxONpyCwQOA" id="(0.8724279835390947,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gdN3AUzlEeaYxONpyCwQOA" id="(1.0,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qm0PYhjhEeWhPZtBPxjsVg" points="[1120, 466, -643984, -643984]$[1120, 720, -643984, -643984]$[1088, 720, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gdN3AEzlEeaYxONpyCwQOA" id="(0.7976190476190477,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gdN3AUzlEeaYxONpyCwQOA" id="(1.0,0.32051282051282054)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_Q_hDQBjhEeWhPZtBPxjsVg" type="Generalization_Edge" source="_KfdhgBjfEeWhPZtBPxjsVg" target="_NeI5IBjfEeWhPZtBPxjsVg" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_Q_hqUhjhEeWhPZtBPxjsVg" visible="false" type="Generalization_StereotypeLabel">
@@ -1972,11 +1963,11 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_Q_hqUBjhEeWhPZtBPxjsVg"/>
<element xmi:type="uml:Generalization" href="esflocalanalysis.profile.uml#_Fa240BjXEeWhPZtBPxjsVg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q_hqURjhEeWhPZtBPxjsVg" points="[909, 848, -643984, -643984]$[909, 819, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q_hqURjhEeWhPZtBPxjsVg" points="[888, 821, -643984, -643984]$[888, 792, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xsnFgDxuEeaxysbBLKHNew" id="(0.4933920704845815,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xsnskDxuEeaxysbBLKHNew" id="(0.41690962099125367,1.0)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_5nMTlJd0EeW5fbxg7IPY-w" type="StereotypeCommentLink" source="_E4vGYBjbEeWhPZtBPxjsVg" target="_5nMTkJd0EeW5fbxg7IPY-w">
+ <edges xmi:type="notation:Connector" xmi:id="_5nMTlJd0EeW5fbxg7IPY-w" type="StereotypeCommentLink" source="_E4vGYBjbEeWhPZtBPxjsVg">
<styles xmi:type="notation:FontStyle" xmi:id="_5nMTlZd0EeW5fbxg7IPY-w"/>
<styles xmi:type="notation:EObjectValueStyle" xmi:id="_5nMTmZd0EeW5fbxg7IPY-w" name="BASE_ELEMENT">
<eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
@@ -2012,7 +2003,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_39m0oEzkEeaYxONpyCwQOA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8-dNOjxuEeaxysbBLKHNew" x="-5" y="16"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8-dNOjxuEeaxysbBLKHNew" x="73" y="14"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_8-dNOzxuEeaxysbBLKHNew" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_391eIEzkEeaYxONpyCwQOA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2024,20 +2015,20 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_8-dNMTxuEeaxysbBLKHNew"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_8-BvYDxuEeaxysbBLKHNew"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8-dNMjxuEeaxysbBLKHNew" points="[390, 403, -643984, -643984]$[620, 403, -643984, -643984]$[620, 326, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8-1AoDxuEeaxysbBLKHNew" id="(1.0,0.14583333333333334)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8-1AoTxuEeaxysbBLKHNew" id="(0.46726190476190477,1.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8-dNMjxuEeaxysbBLKHNew" points="[419, 353, -643984, -643984]$[659, 353, -643984, -643984]$[659, 280, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8-1AoDxuEeaxysbBLKHNew" id="(1.0,0.125)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8-1AoTxuEeaxysbBLKHNew" id="(0.49404761904761907,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_PoD78EzeEeaYxONpyCwQOA" type="Generalization_Edge" source="_IPhoIEzeEeaYxONpyCwQOA" target="_NeI5IBjfEeWhPZtBPxjsVg" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_PoEjAEzeEeaYxONpyCwQOA" type="Generalization_StereotypeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PoEjAEzeEeaYxONpyCwQOA" visible="false" type="Generalization_StereotypeLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_-SLxkFpMEeaa35QxHvnH_g" name="IS_UPDATED_POSITION" booleanValue="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_PoEjAUzeEeaYxONpyCwQOA" y="40"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_PoD78UzeEeaYxONpyCwQOA"/>
<element xmi:type="uml:Generalization" href="esflocalanalysis.profile.uml#_PnetIEzeEeaYxONpyCwQOA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PoD78kzeEeaYxONpyCwQOA" points="[671, 777, -643984, -643984]$[710, 777, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PoxGkEzeEeaYxONpyCwQOA" id="(1.0,0.5394736842105263)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PoxGkUzeEeaYxONpyCwQOA" id="(0.0,0.47435897435897434)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PoD78kzeEeaYxONpyCwQOA" points="[699, 740, -643984, -643984]$[722, 740, -643984, -643984]$[745, 740, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PoxGkEzeEeaYxONpyCwQOA" id="(1.0,0.6447368421052632)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PoxGkUzeEeaYxONpyCwQOA" id="(0.0,0.5769230769230769)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_jrKd4EzeEeaYxONpyCwQOA" type="Association_Edge" source="_IPhoIEzeEeaYxONpyCwQOA" target="_D83mQDxuEeaxysbBLKHNew" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_jrLE8EzeEeaYxONpyCwQOA" type="Association_StereotypeLabel">
@@ -2054,7 +2045,7 @@
<stringListValue>name</stringListValue>
<stringListValue>derived</stringListValue>
</styles>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_jrLE9UzeEeaYxONpyCwQOA" x="-40" y="4"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_jrLE9UzeEeaYxONpyCwQOA" x="-46" y="73"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_jrLE9kzeEeaYxONpyCwQOA" type="Association_SourceRoleLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_l0wAkEzeEeaYxONpyCwQOA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2074,9 +2065,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_jrKd4UzeEeaYxONpyCwQOA"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_jqJxQEzeEeaYxONpyCwQOA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jrKd4kzeEeaYxONpyCwQOA" points="[487, 786, -643984, -643984]$[407, 786, -643984, -643984]$[407, 567, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jsALYEzeEeaYxONpyCwQOA" id="(0.0,0.6447368421052632)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jsALYUzeEeaYxONpyCwQOA" id="(0.851528384279476,1.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jrKd4kzeEeaYxONpyCwQOA" points="[466, 733, -643984, -643984]$[379, 733, -643984, -643984]$[379, 521, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jsALYEzeEeaYxONpyCwQOA" id="(0.0,0.5526315789473685)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jsALYUzeEeaYxONpyCwQOA" id="(0.8467432950191571,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_Fd8NIEzlEeaYxONpyCwQOA" type="Association_Edge" source="_D83mQDxuEeaxysbBLKHNew" target="_LxX1UBjfEeWhPZtBPxjsVg" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_Fd8NI0zlEeaYxONpyCwQOA" type="Association_StereotypeLabel">
@@ -2093,7 +2084,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_Vlk_EEzlEeaYxONpyCwQOA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd8NKEzlEeaYxONpyCwQOA" x="-219" y="-15"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd8NKEzlEeaYxONpyCwQOA" x="-120" y="-13"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Fd8NKUzlEeaYxONpyCwQOA" type="Association_SourceRoleLabel">
<styles xmi:type="notation:StringListValueStyle" xmi:id="_P216oEzlEeaYxONpyCwQOA" name="maskLabel">
@@ -2101,7 +2092,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_Vl1dwEzlEeaYxONpyCwQOA" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd8NKkzlEeaYxONpyCwQOA" x="13" y="13"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd8NKkzlEeaYxONpyCwQOA" x="93" y="27"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Fd8NK0zlEeaYxONpyCwQOA" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_VmC5IEzlEeaYxONpyCwQOA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2113,9 +2104,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_Fd8NIUzlEeaYxONpyCwQOA"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_FdEqcEzlEeaYxONpyCwQOA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fd8NIkzlEeaYxONpyCwQOA" points="[440, 452, -643984, -643984]$[921, 452, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Feg04EzlEeaYxONpyCwQOA" id="(1.0,0.40625)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Feg04UzlEeaYxONpyCwQOA" id="(0.0,0.5390625)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fd8NIkzlEeaYxONpyCwQOA" points="[419, 420, -643984, -643984]$[602, 420, -643984, -643984]$[785, 420, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Feg04EzlEeaYxONpyCwQOA" id="(1.0,0.4739583333333333)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Feg04UzlEeaYxONpyCwQOA" id="(0.0,0.640625)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_kuGdYEzlEeaYxONpyCwQOA" type="Association_Edge" source="_D83mQDxuEeaxysbBLKHNew" target="_F-78oBjfEeWhPZtBPxjsVg" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_kuGdY0zlEeaYxONpyCwQOA" type="Association_StereotypeLabel">
@@ -2152,8 +2143,8 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_kuGdYUzlEeaYxONpyCwQOA"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_ktL3YEzlEeaYxONpyCwQOA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kuGdYkzlEeaYxONpyCwQOA" points="[302, 375, -643984, -643984]$[302, 213, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kuv9oEzlEeaYxONpyCwQOA" id="(0.47126436781609193,0.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kuGdYkzlEeaYxONpyCwQOA" points="[280, 329, -643984, -643984]$[280, 167, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kuv9oEzlEeaYxONpyCwQOA" id="(0.4674329501915709,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kuv9oUzlEeaYxONpyCwQOA" id="(0.5260416666666666,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_Y7fEEFpQEeaa35QxHvnH_g" type="Generalization_Edge" source="_ETIx8FpOEeaa35QxHvnH_g" target="_KfdhgBjfEeWhPZtBPxjsVg" routing="Rectilinear">
@@ -2163,7 +2154,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_Y7fEEVpQEeaa35QxHvnH_g"/>
<element xmi:type="uml:Generalization" href="esflocalanalysis.profile.uml#_ZXsSQFl8Eeaa35QxHvnH_g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y7fEElpQEeaa35QxHvnH_g" points="[1105, 887, -643984, -643984]$[1024, 887, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y7fEElpQEeaa35QxHvnH_g" points="[1084, 860, -643984, -643984]$[1003, 860, -643984, -643984]"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_i-yVAFpQEeaa35QxHvnH_g" type="Association_Edge" source="_A-T7YBjfEeWhPZtBPxjsVg" target="_Czx4AFpOEeaa35QxHvnH_g" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_i-y8EFpQEeaa35QxHvnH_g" visible="false" type="Association_StereotypeLabel">
@@ -2203,7 +2194,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_i-yVAVpQEeaa35QxHvnH_g"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_i9_DwFpQEeaa35QxHvnH_g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i-yVAlpQEeaa35QxHvnH_g" points="[395, 1004, -643984, -643984]$[581, 1004, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i-yVAlpQEeaa35QxHvnH_g" points="[374, 977, -643984, -643984]$[560, 977, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i_OZ4FpQEeaa35QxHvnH_g" id="(1.0,0.48717948717948717)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i_OZ4VpQEeaa35QxHvnH_g" id="(0.0,0.48717948717948717)"/>
</edges>
@@ -2245,7 +2236,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_jz9CcVpQEeaa35QxHvnH_g"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_jydNoFpQEeaa35QxHvnH_g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jz9CclpQEeaa35QxHvnH_g" points="[744, 1004, -643984, -643984]$[916, 1004, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jz9CclpQEeaa35QxHvnH_g" points="[723, 977, -643984, -643984]$[895, 977, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_j0ZuYFpQEeaa35QxHvnH_g" id="(1.0,0.48717948717948717)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_j0ZuYVpQEeaa35QxHvnH_g" id="(0.0,0.48717948717948717)"/>
</edges>
@@ -2284,29 +2275,29 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_k02ewVpQEeaa35QxHvnH_g"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_k0B_YFpQEeaa35QxHvnH_g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k02ewlpQEeaa35QxHvnH_g" points="[1266, 926, -643984, -643984]$[1266, 996, -643984, -643984]$[1180, 996, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_k1TKsFpQEeaa35QxHvnH_g" id="(0.4576271186440678,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_k1TKsVpQEeaa35QxHvnH_g" id="(1.0,0.38461538461538464)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k02ewlpQEeaa35QxHvnH_g" points="[1239, 880, -643984, -643984]$[1239, 953, -643984, -643984]$[1159, 953, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_k1TKsFpQEeaa35QxHvnH_g" id="(0.3983050847457627,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_k1TKsVpQEeaa35QxHvnH_g" id="(1.0,0.4230769230769231)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_D3-kAIVQEead3rKSn3kFjg" type="Generalization_Edge" source="_FLY_0BjfEeWhPZtBPxjsVg" target="_jcRGoIVPEead3rKSn3kFjg" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_D3-kA4VQEead3rKSn3kFjg" type="Generalization_StereotypeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_D3-kA4VQEead3rKSn3kFjg" visible="false" type="Generalization_StereotypeLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_FqUEUIVQEead3rKSn3kFjg" name="IS_UPDATED_POSITION" booleanValue="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_D3-kBIVQEead3rKSn3kFjg" y="40"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_D3-kAYVQEead3rKSn3kFjg"/>
<element xmi:type="uml:Generalization" href="esflocalanalysis.profile.uml#_D3BhwIVQEead3rKSn3kFjg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D3-kAoVQEead3rKSn3kFjg" points="[683, 240, -643984, -643984]$[683, 207, -643984, -643984]$[1305, 207, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D4gIcIVQEead3rKSn3kFjg" id="(0.5029761904761905,0.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D3-kAoVQEead3rKSn3kFjg" points="[640, 194, -643984, -643984]$[640, 160, -643984, -643984]$[1284, 160, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D4gIcIVQEead3rKSn3kFjg" id="(0.5104166666666666,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D4gIcYVQEead3rKSn3kFjg" id="(0.0,0.6794871794871795)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_EWRCgIVQEead3rKSn3kFjg" type="Generalization_Edge" source="_F-78oBjfEeWhPZtBPxjsVg" target="_jcRGoIVPEead3rKSn3kFjg" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_EWRCg4VQEead3rKSn3kFjg" type="Generalization_StereotypeLabel">
+ <children xmi:type="notation:DecorationNode" xmi:id="_EWRCg4VQEead3rKSn3kFjg" visible="false" type="Generalization_StereotypeLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_GKlf0IVQEead3rKSn3kFjg" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EWRChIVQEead3rKSn3kFjg" y="40"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_EWRChIVQEead3rKSn3kFjg" x="3" y="27"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_EWRCgYVQEead3rKSn3kFjg"/>
<element xmi:type="uml:Generalization" href="esflocalanalysis.profile.uml#_EUm1oIVQEead3rKSn3kFjg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EWRCgoVQEead3rKSn3kFjg" points="[393, 168, -643984, -643984]$[1305, 168, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EWRCgoVQEead3rKSn3kFjg" points="[372, 141, -643984, -643984]$[1284, 141, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EWzOAIVQEead3rKSn3kFjg" id="(1.0,0.3382352941176471)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EWzOAYVQEead3rKSn3kFjg" id="(0.0,0.19230769230769232)"/>
</edges>
@@ -2345,9 +2336,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_IQPkwYVQEead3rKSn3kFjg"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_IPO4IIVQEead3rKSn3kFjg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IQPkwoVQEead3rKSn3kFjg" points="[1123, 288, -643984, -643984]$[1269, 288, -643984, -643984]$[1269, 231, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IQ0MgIVQEead3rKSn3kFjg" id="(1.0,0.29411764705882354)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IQ0MgYVQEead3rKSn3kFjg" id="(0.05761316872427984,1.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IQPkwoVQEead3rKSn3kFjg" points="[1122, 253, -643984, -643984]$[1299, 253, -643984, -643984]$[1299, 185, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IQ0MgIVQEead3rKSn3kFjg" id="(1.0,0.45588235294117646)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IQ0MgYVQEead3rKSn3kFjg" id="(0.06172839506172839,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_I5R6sIVQEead3rKSn3kFjg" type="Association_Edge" source="_LxX1UBjfEeWhPZtBPxjsVg" target="_jcRGoIVPEead3rKSn3kFjg" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_I5R6s4VQEead3rKSn3kFjg" type="Association_StereotypeLabel">
@@ -2364,7 +2355,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_mrCTQIVQEead3rKSn3kFjg" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_I5R6uIVQEead3rKSn3kFjg" x="-11" y="5"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_I5R6uIVQEead3rKSn3kFjg" x="-22" y="44"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_I5R6uYVQEead3rKSn3kFjg" type="Association_SourceRoleLabel">
<styles xmi:type="notation:StringListValueStyle" xmi:id="_PZuv8IVQEead3rKSn3kFjg" name="maskLabel">
@@ -2372,7 +2363,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_mrTZAIVQEead3rKSn3kFjg" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_I5R6uoVQEead3rKSn3kFjg" x="8" y="-23"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_I5R6uoVQEead3rKSn3kFjg" x="100" y="-33"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_I5R6u4VQEead3rKSn3kFjg" type="Association_SourceMultiplicityLabel">
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_mrlF0IVQEead3rKSn3kFjg" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2384,9 +2375,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_I5R6sYVQEead3rKSn3kFjg"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_I4ZJ4IVQEead3rKSn3kFjg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I5R6soVQEead3rKSn3kFjg" points="[1121, 395, -643984, -643984]$[1400, 395, -643984, -643984]$[1400, 231, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I50tQIVQEead3rKSn3kFjg" id="(1.0,0.0859375)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I51UUIVQEead3rKSn3kFjg" id="(0.5720164609053497,1.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I5R6soVQEead3rKSn3kFjg" points="[1205, 360, -643984, -643984]$[1420, 360, -643984, -643984]$[1420, 185, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I50tQIVQEead3rKSn3kFjg" id="(1.0,0.171875)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I51UUIVQEead3rKSn3kFjg" id="(0.5596707818930041,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_fbocQIuxEeaD-qJicaA0CQ" type="Association_Edge" source="_ZxDfEIuxEeaD-qJicaA0CQ" target="_ZyMHgIuxEeaD-qJicaA0CQ" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_fbocQ4uxEeaD-qJicaA0CQ" visible="false" type="Association_StereotypeLabel">
@@ -2429,9 +2420,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_fbocQYuxEeaD-qJicaA0CQ"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_faVbwIuxEeaD-qJicaA0CQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fbocQouxEeaD-qJicaA0CQ" points="[1689, 816, -643984, -643984]$[1410, 816, -643984, -643984]$[1410, 764, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fcMc8IuxEeaD-qJicaA0CQ" id="(0.0,0.6176470588235294)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fcMc8YuxEeaD-qJicaA0CQ" id="(0.5043668122270742,1.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fbocQouxEeaD-qJicaA0CQ" points="[1668, 780, -643984, -643984]$[1400, 780, -643984, -643984]$[1400, 718, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fcMc8IuxEeaD-qJicaA0CQ" id="(0.0,0.7647058823529411)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fcMc8YuxEeaD-qJicaA0CQ" id="(0.5262008733624454,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_zt3mYIuxEeaD-qJicaA0CQ" type="Association_Edge" source="_ZyMHgIuxEeaD-qJicaA0CQ" target="_Zxm4sIuxEeaD-qJicaA0CQ" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_zt3mY4uxEeaD-qJicaA0CQ" visible="false" type="Association_StereotypeLabel">
@@ -2468,9 +2459,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_zt3mYYuxEeaD-qJicaA0CQ"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_zs1EkIuxEeaD-qJicaA0CQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zt3mYouxEeaD-qJicaA0CQ" points="[1308, 627, -643984, -643984]$[1308, 495, -643984, -643984]$[1494, 495, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zueDUIuxEeaD-qJicaA0CQ" id="(0.4057507987220447,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zueqYIuxEeaD-qJicaA0CQ" id="(0.0,0.803921568627451)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zt3mYouxEeaD-qJicaA0CQ" points="[1340, 581, -643984, -643984]$[1340, 460, -643984, -643984]$[1407, 460, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zueDUIuxEeaD-qJicaA0CQ" id="(0.3951965065502183,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zueqYIuxEeaD-qJicaA0CQ" id="(0.0,0.9117647058823529)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_XQr_0IvMEeaD-qJicaA0CQ" type="Association_Edge" source="_ZxDfEIuxEeaD-qJicaA0CQ" target="_Zxm4sIuxEeaD-qJicaA0CQ" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_XQsm4IvMEeaD-qJicaA0CQ" visible="false" type="Association_StereotypeLabel">
@@ -2487,7 +2478,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_ODZ4MIyNEeaD-qJicaA0CQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XQsm5YvMEeaD-qJicaA0CQ" x="-19" y="-143"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_XQsm5YvMEeaD-qJicaA0CQ" x="-38" y="-80"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_XQsm5ovMEeaD-qJicaA0CQ" type="Association_SourceRoleLabel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZUcHlIyNEeaD-qJicaA0CQ" source="PapyrusCSSForceValue">
@@ -2498,7 +2489,7 @@
<stringListValue>derived</stringListValue>
</styles>
<styles xmi:type="notation:BooleanValueStyle" xmi:id="_ODrlAIyNEeaD-qJicaA0CQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XQsm54vMEeaD-qJicaA0CQ" x="66" y="-29"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_XQsm54vMEeaD-qJicaA0CQ" x="61" y="-90"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_XQsm6IvMEeaD-qJicaA0CQ" type="Association_SourceMultiplicityLabel">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZUcHkIyNEeaD-qJicaA0CQ" source="PapyrusCSSForceValue">
@@ -2513,9 +2504,9 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_XQr_0YvMEeaD-qJicaA0CQ"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_XPxZ0IvMEeaD-qJicaA0CQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XQr_0ovMEeaD-qJicaA0CQ" points="[1720, 609, -643984, -643984]$[1720, 515, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XRZKcIvMEeaD-qJicaA0CQ" id="(0.3854166666666667,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XRZKcYvMEeaD-qJicaA0CQ" id="(0.7282608695652174,1.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XQr_0ovMEeaD-qJicaA0CQ" points="[1820, 728, -643984, -643984]$[1820, 599, -643984, -643984]$[1820, 469, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XRZKcIvMEeaD-qJicaA0CQ" id="(0.7916666666666666,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XRZKcYvMEeaD-qJicaA0CQ" id="(0.8978260869565218,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_s-D-EIyDEeaD-qJicaA0CQ" type="Association_Edge" source="_A-T7YBjfEeWhPZtBPxjsVg" target="_ZxDfEIuxEeaD-qJicaA0CQ" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_s-D-E4yDEeaD-qJicaA0CQ" type="Association_StereotypeLabel">
@@ -2558,7 +2549,7 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_s-D-EYyDEeaD-qJicaA0CQ"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_s9FGoIyDEeaD-qJicaA0CQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s-D-EoyDEeaD-qJicaA0CQ" points="[325, 1044, -643984, -643984]$[325, 1103, -643984, -643984]$[1758, 1103, -643984, -643984]$[1758, 842, -643984, -643984]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s-D-EoyDEeaD-qJicaA0CQ" points="[304, 1017, -643984, -643984]$[304, 1076, -643984, -643984]$[1737, 1076, -643984, -643984]$[1737, 815, -643984, -643984]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s-qbAIyDEeaD-qJicaA0CQ" id="(0.5138888888888888,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s-qbAYyDEeaD-qJicaA0CQ" id="(0.359375,1.0)"/>
</edges>
@@ -2597,9 +2588,19 @@
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_CxKLEYyREeaD-qJicaA0CQ"/>
<element xmi:type="uml:Association" href="esflocalanalysis.profile.uml#_Cv_GYIyREeaD-qJicaA0CQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CxKLEoyREeaD-qJicaA0CQ" points="[251, 1014, -643984, -643984]$[196, 1014, -643984, -643984]$[196, 567, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CxydMIyREeaD-qJicaA0CQ" id="(0.0,0.6153846153846154)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CxydMYyREeaD-qJicaA0CQ" id="(0.06513409961685823,1.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CxKLEoyREeaD-qJicaA0CQ" points="[230, 973, -643984, -643984]$[179, 973, -643984, -643984]$[179, 521, -643984, -643984]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CxydMIyREeaD-qJicaA0CQ" id="(0.0,0.6794871794871795)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CxydMYyREeaD-qJicaA0CQ" id="(0.08045977011494253,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Z-hfxCU0Eem0xphtddBpYA" type="StereotypeCommentLink" source="_E4vGYBjbEeWhPZtBPxjsVg" target="_Z-hfwCU0Eem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z-hfxSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z-iG0iU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z-hfxiU0Eem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z-iG0CU0Eem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z-iG0SU0Eem0xphtddBpYA"/>
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_PmZ5oCCUEeWTgM-gIHMuxg" type="PapyrusUMLClassDiagram" name="Overview PackageDiagram" measurementUnit="Pixel">
@@ -3235,6 +3236,118 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_iq_QUh_0EemJu4Zi6VPfMg" x="492" y="483"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_3D7FcCUwEem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3D7FcSUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3D7FcyUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3D7FciUwEem0xphtddBpYA" x="239" y="42"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3EwL4CUwEem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3EwL4SUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3EwL4yUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3EwL4iUwEem0xphtddBpYA" x="403" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3FEU8CUwEem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3FEU8SUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3FE8ACUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3FEU8iUwEem0xphtddBpYA" x="1275" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3FWBwCUwEem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3FWBwSUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3FWBwyUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3FWBwiUwEem0xphtddBpYA" x="1399" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3FnukCUwEem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3FnukSUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3FoVoCUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3FnukiUwEem0xphtddBpYA" x="1098" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3F73oCUwEem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3F73oSUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3F73oyUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3F73oiUwEem0xphtddBpYA" x="492" y="483"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_3GM9YCUwEem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_3GM9YSUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3GNkcCUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3GM9YiUwEem0xphtddBpYA" x="929" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Z4ZpoCU0Eem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z4ZpoSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z4ZpoyU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z4ZpoiU0Eem0xphtddBpYA" x="239" y="42"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Z4-4cCU0Eem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z4-4cSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z4-4cyU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z4-4ciU0Eem0xphtddBpYA" x="403" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Z5KeoCU0Eem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z5KeoSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5KeoyU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z5KeoiU0Eem0xphtddBpYA" x="1275" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Z5WE0CU0Eem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z5WE0SU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5WE0yU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z5WE0iU0Eem0xphtddBpYA" x="1399" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Z5i5ICU0Eem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z5i5ISU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5i5IyU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z5i5IiU0Eem0xphtddBpYA" x="1098" y="15"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Z5vtcCU0Eem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z5vtcSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5vtcyU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z5vtciU0Eem0xphtddBpYA" x="492" y="483"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Z58hwCU0Eem0xphtddBpYA" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z58hwSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z59I0CU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z58hwiU0Eem0xphtddBpYA" x="929" y="15"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_NHa_YTxwEeaxysbBLKHNew" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_NHa_YjxwEeaxysbBLKHNew"/>
<styles xmi:type="style_1:PapyrusDiagramStyle" xmi:id="_74AjYB85EemmXJy0SqBTqg" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">
@@ -3497,5 +3610,145 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iq_3Yx_0EemJu4Zi6VPfMg"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iq_3ZB_0EemJu4Zi6VPfMg"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_3D7sgCUwEem0xphtddBpYA" type="StereotypeCommentLink" source="_NvvjoDxwEeaxysbBLKHNew" target="_3D7FcCUwEem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3D7sgSUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3D7shSUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3D7sgiUwEem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3D7sgyUwEem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3D7shCUwEem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_3EwL5CUwEem0xphtddBpYA" type="StereotypeCommentLink" source="_2eiRgDxwEeaxysbBLKHNew" target="_3EwL4CUwEem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3EwL5SUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3EwL6SUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3EwL5iUwEem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3EwL5yUwEem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3EwL6CUwEem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_3FE8ASUwEem0xphtddBpYA" type="StereotypeCommentLink" source="_9L1P8DxwEeaxysbBLKHNew" target="_3FEU8CUwEem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3FE8AiUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3FE8BiUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FE8AyUwEem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3FE8BCUwEem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3FE8BSUwEem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_3FWBxCUwEem0xphtddBpYA" type="StereotypeCommentLink" source="_-1PdwDxwEeaxysbBLKHNew" target="_3FWBwCUwEem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3FWBxSUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3FWBySUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FWBxiUwEem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3FWBxyUwEem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3FWByCUwEem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_3FoVoSUwEem0xphtddBpYA" type="StereotypeCommentLink" source="_CUDG8DxxEeaxysbBLKHNew" target="_3FnukCUwEem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3FoVoiUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3FoVpiUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FoVoyUwEem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3FoVpCUwEem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3FoVpSUwEem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_3F73pCUwEem0xphtddBpYA" type="StereotypeCommentLink" source="_74DuED3oEeaxysbBLKHNew" target="_3F73oCUwEem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3F73pSUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3F73qSUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3F73piUwEem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F73pyUwEem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F73qCUwEem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_3GNkcSUwEem0xphtddBpYA" type="StereotypeCommentLink" source="_ApHewH_TEeanudFUFrbcRw" target="_3GM9YCUwEem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_3GNkciUwEem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3GNkdiUwEem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3GNkcyUwEem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3GNkdCUwEem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3GNkdSUwEem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Z4ZppCU0Eem0xphtddBpYA" type="StereotypeCommentLink" source="_NvvjoDxwEeaxysbBLKHNew" target="_Z4ZpoCU0Eem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z4ZppSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z4aQsSU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z4ZppiU0Eem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z4ZppyU0Eem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z4aQsCU0Eem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Z4-4dCU0Eem0xphtddBpYA" type="StereotypeCommentLink" source="_2eiRgDxwEeaxysbBLKHNew" target="_Z4-4cCU0Eem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z4-4dSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z4-4eSU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z4-4diU0Eem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z4-4dyU0Eem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z4-4eCU0Eem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Z5KepCU0Eem0xphtddBpYA" type="StereotypeCommentLink" source="_9L1P8DxwEeaxysbBLKHNew" target="_Z5KeoCU0Eem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z5KepSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5KeqSU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z5KepiU0Eem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5KepyU0Eem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5KeqCU0Eem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Z5WE1CU0Eem0xphtddBpYA" type="StereotypeCommentLink" source="_-1PdwDxwEeaxysbBLKHNew" target="_Z5WE0CU0Eem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z5WE1SU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5WE2SU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z5WE1iU0Eem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5WE1yU0Eem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5WE2CU0Eem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Z5i5JCU0Eem0xphtddBpYA" type="StereotypeCommentLink" source="_CUDG8DxxEeaxysbBLKHNew" target="_Z5i5ICU0Eem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z5i5JSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5i5KSU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z5i5JiU0Eem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5i5JyU0Eem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5i5KCU0Eem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Z5vtdCU0Eem0xphtddBpYA" type="StereotypeCommentLink" source="_74DuED3oEeaxysbBLKHNew" target="_Z5vtcCU0Eem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z5vtdSU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z5vteSU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z5vtdiU0Eem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5vtdyU0Eem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z5vteCU0Eem0xphtddBpYA"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_Z59I0SU0Eem0xphtddBpYA" type="StereotypeCommentLink" source="_ApHewH_TEeanudFUFrbcRw" target="_Z58hwCU0Eem0xphtddBpYA">
+ <styles xmi:type="notation:FontStyle" xmi:id="_Z59I0iU0Eem0xphtddBpYA"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z59I1iU0Eem0xphtddBpYA" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z59I0yU0Eem0xphtddBpYA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z59I1CU0Eem0xphtddBpYA"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z59I1SU0Eem0xphtddBpYA"/>
+ </edges>
</notation:Diagram>
</xmi:XMI>
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.uml b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.uml
index a3894fa..4a7090c 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.uml
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.uml
@@ -29,11 +29,18 @@
<generalization xmi:type="uml:Generalization" xmi:id="_D3BhwIVQEead3rKSn3kFjg" general="_jbGB8IVPEead3rKSn3kFjg"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_4cYbEDxsEeaxysbBLKHNew" name="sPort" association="_4cV-0DxsEeaxysbBLKHNew">
<type xmi:type="uml:Stereotype" href="../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_BwcZ4A3REeWIHrhJxYOO3w"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zULLUCUyEem0xphtddBpYA"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_NJYRwTxxEeaxysbBLKHNew" name="base_Port" association="_NJXqsDxxEeaxysbBLKHNew">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_91-9gEdjEeaeKb9H0TbPpw" name="sDirectionLAnalysis" type="_cs-8UEdjEeaeKb9H0TbPpw" isReadOnly="true" isDerived="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_RiO60CUyEem0xphtddBpYA" name="sDirectionManual" visibility="public">
+ <type xmi:type="uml:Enumeration" href="../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_poRGsCUyEem0xphtddBpYA"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_91-9gEdjEeaeKb9H0TbPpw" name="sDirectionLAnalysis" isReadOnly="true" isDerived="true">
+ <type xmi:type="uml:Enumeration" href="../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
+ </ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_8-C9gzxuEeaxysbBLKHNew" name="sBlockLAnalysis" type="_PowtADxrEeaxysbBLKHNew" isDerived="true" association="_8-BvYDxuEeaxysbBLKHNew"/>
<icon xmi:type="uml:Image" xmi:id="_OjyAMIoCEeap4Yimi6e0jg" format="PNG" location="platform:/plugin/org.polarsys.esf.localanalysis.resources.graphical/src/main/resources/icons/profile/icon_inoutput_sport_la.png">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OjynQIoCEeap4Yimi6e0jg" source="image_papyrus">
@@ -282,12 +289,6 @@
<packagedElement xmi:type="uml:Extension" xmi:id="_8rVlID3oEeaxysbBLKHNew" name="E_SBarrierLAnalysis_Property1" memberEnd="_8rWMMD3oEeaxysbBLKHNew _8rWzQD3oEeaxysbBLKHNew">
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_8rWMMD3oEeaxysbBLKHNew" name="extension_SBarrierLAnalysis" type="_Tzby0BjVEeWhPZtBPxjsVg" aggregation="composite" association="_8rVlID3oEeaxysbBLKHNew"/>
</packagedElement>
- <packagedElement xmi:type="uml:Enumeration" xmi:id="_cs-8UEdjEeaeKb9H0TbPpw" name="SDirectionLAnalysis">
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_oBSiIEdjEeaeKb9H0TbPpw" name="IN"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_u2WVcEdjEeaeKb9H0TbPpw" name="OUT"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_71Ku4B_2EemJu4Zi6VPfMg" name="INOUT"/>
- <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_P88i4EdkEeaeKb9H0TbPpw" name="UNDEFINED"/>
- </packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_INExEEzeEeaYxONpyCwQOA" name="AbstractSLogicalGateLAnalysis" isAbstract="true">
<generalization xmi:type="uml:Generalization" xmi:id="_PnetIEzeEeaYxONpyCwQOA" general="_UFsngBjVEeWhPZtBPxjsVg"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_jqM0kEzeEeaYxONpyCwQOA" name="sBlockLAnalysis" type="_PowtADxrEeaxysbBLKHNew" isDerived="true" association="_jqJxQEzeEeaYxONpyCwQOA"/>
diff --git a/analysis/localanalysis/ui/org.polarsys.esf.localanalysis.ui/src/main/resources/properties_view/ui/SingleSPortLAnalysis.xwt b/analysis/localanalysis/ui/org.polarsys.esf.localanalysis.ui/src/main/resources/properties_view/ui/SingleSPortLAnalysis.xwt
index 598c22a..e3e0dc8 100644
--- a/analysis/localanalysis/ui/org.polarsys.esf.localanalysis.ui/src/main/resources/properties_view/ui/SingleSPortLAnalysis.xwt
+++ b/analysis/localanalysis/ui/org.polarsys.esf.localanalysis.ui/src/main/resources/properties_view/ui/SingleSPortLAnalysis.xwt
@@ -22,7 +22,12 @@
<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
</Composite.layout>
<ppe:EnumCombo input="{Binding}"
- property="ESFLocalAnalysis:SPortLAnalysis:sDirectionLAnalysis" readOnly="true" customLabel="Direction"></ppe:EnumCombo>
+ property="ESFLocalAnalysis:SPortLAnalysis:sDirectionManual"
+ customLabel="Manual direction"></ppe:EnumCombo>
+ <ppe:EnumCombo input="{Binding}"
+ property="ESFLocalAnalysis:SPortLAnalysis:sDirectionLAnalysis"
+ readOnly="true"
+ customLabel="Direction"></ppe:EnumCombo>
</Composite>
<Composite>
<Composite.layout>
@@ -31,4 +36,4 @@
<ppe:MultiReference input="{Binding}"
property="ESFLocalAnalysis:SPortLAnalysis:sFailureModesLAnalysisList" readOnly="true" customLabel="Failure Mode"></ppe:MultiReference>
</Composite>
-</Composite>
\ No newline at end of file
+</Composite>
diff --git a/analysis/safetyreq/execution/org.polarsys.esf.safetyreq.execution.ui/plugin.xml b/analysis/safetyreq/execution/org.polarsys.esf.safetyreq.execution.ui/plugin.xml
index 14969f0..36d9da7 100644
--- a/analysis/safetyreq/execution/org.polarsys.esf.safetyreq.execution.ui/plugin.xml
+++ b/analysis/safetyreq/execution/org.polarsys.esf.safetyreq.execution.ui/plugin.xml
@@ -42,6 +42,24 @@
<handler
class="org.polarsys.esf.safetyreq.execution.ui.handler.CreateESFSafetyRequirementsTableHandler"
commandId="org.polarsys.esf.safetyreq.execution.ui.create.safetyreq.table.command">
+ <activeWhen>
+ <and>
+ <with
+ variable="selection">
+ <iterate>
+ <adapt
+ type="org.eclipse.emf.ecore.EObject">
+ <instanceof
+ value="org.eclipse.uml2.uml.Package">
+ </instanceof>
+ </adapt>
+ </iterate>
+ </with>
+ <count
+ value="1">
+ </count>
+ </and>
+ </activeWhen>
</handler>
<handler
class="org.polarsys.esf.safetyreq.execution.ui.handler.CreateSSafetyRequirementHandler"
diff --git a/analysis/safetyreq/profile/org.polarsys.esf.safetyreq.profile.tools/src/main/java/org/polarsys/esf/safetyreq/profile/tools/util/ESFSafetyRequirementsUtil.java b/analysis/safetyreq/profile/org.polarsys.esf.safetyreq.profile.tools/src/main/java/org/polarsys/esf/safetyreq/profile/tools/util/ESFSafetyRequirementsUtil.java
index e76f1c0..53a8f6b 100644
--- a/analysis/safetyreq/profile/org.polarsys.esf.safetyreq.profile.tools/src/main/java/org/polarsys/esf/safetyreq/profile/tools/util/ESFSafetyRequirementsUtil.java
+++ b/analysis/safetyreq/profile/org.polarsys.esf.safetyreq.profile.tools/src/main/java/org/polarsys/esf/safetyreq/profile/tools/util/ESFSafetyRequirementsUtil.java
@@ -124,7 +124,7 @@
protected void doExecute() {
// Retrieve SysML profile and apply it
Profile vSysMLProfile = (Profile) PackageUtil.loadPackage(
- URI.createURI(SysMLResource.PROFILE_URI),
+ URI.createURI(SysMLResource.PROFILE_PATH),
pModel.eResource().getResourceSet());
if (vSysMLProfile != null) {
diff --git a/analysis/safetyreq/table/org.polarsys.esf.safetyreq.table/src/main/java/org/polarsys/esf/safetyreq/table/manager/axis/ESFSafetyRequirementsAxisManager.java b/analysis/safetyreq/table/org.polarsys.esf.safetyreq.table/src/main/java/org/polarsys/esf/safetyreq/table/manager/axis/ESFSafetyRequirementsAxisManager.java
index c350208..fdac839 100644
--- a/analysis/safetyreq/table/org.polarsys.esf.safetyreq.table/src/main/java/org/polarsys/esf/safetyreq/table/manager/axis/ESFSafetyRequirementsAxisManager.java
+++ b/analysis/safetyreq/table/org.polarsys.esf.safetyreq.table/src/main/java/org/polarsys/esf/safetyreq/table/manager/axis/ESFSafetyRequirementsAxisManager.java
@@ -92,7 +92,7 @@
*/
@Override
protected String getStereotypeApplicationBasePropertyName() {
- return ESFSafetyRequirementsPackage.eINSTANCE.getSSafetyRequirement().getName();
+ return ESFSafetyRequirementsPackage.eINSTANCE.getSSafetyRequirement_Base_Class().getName();
}
}
diff --git a/analysis/safetyreq/table/org.polarsys.esf.safetyreq.table/src/main/java/org/polarsys/esf/safetyreq/table/set/ESFSafetyRequirementsTablesSet.java b/analysis/safetyreq/table/org.polarsys.esf.safetyreq.table/src/main/java/org/polarsys/esf/safetyreq/table/set/ESFSafetyRequirementsTablesSet.java
index 4cacc21..bf951d5 100644
--- a/analysis/safetyreq/table/org.polarsys.esf.safetyreq.table/src/main/java/org/polarsys/esf/safetyreq/table/set/ESFSafetyRequirementsTablesSet.java
+++ b/analysis/safetyreq/table/org.polarsys.esf.safetyreq.table/src/main/java/org/polarsys/esf/safetyreq/table/set/ESFSafetyRequirementsTablesSet.java
@@ -27,7 +27,7 @@
* - ESFSafetyRequirementsTable.nattableconfiguration
*/
public static final String SAFETYREQ_TABLE_ID =
- "ESFSafetyRequirementsTable"; //$NON-NLS-1$
+ "SafetyReqTable"; //$NON-NLS-1$
/**
* ESFSafetyRequirements Table name.
