Commit 7f9196bc authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge remote-tracking branch 'origin/master' into 3993

parents 55cca9b7 ee86435c
......@@ -3,7 +3,7 @@ Automatic-Module-Name: com.microsoft.z3
Bundle-ManifestVersion: 2
Bundle-Name: Microsoft Z3 API
Bundle-SymbolicName: com.microsoft.z3;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: lib/com.microsoft.z3.jar,
.
Bundle-Vendor: fortiss GmbH
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: eu.fbk.af3.tools.diagram.ui
Bundle-ManifestVersion: 2
Bundle-Name: Diagram Document Creator UI
Bundle-SymbolicName: eu.fbk.af3.tools.diagram.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: eu.fbk.af3.tools.diagram.ui.DiagramUIActivator
Require-Bundle: eu.fbk.af3.tools.diagram;bundle-version="1.0.0",
org.fortiss.af3.component.ui,
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: eu.fbk.af3.tools.diagram
Bundle-ManifestVersion: 2
Bundle-Name: Diagram Document Creator
Bundle-SymbolicName: eu.fbk.af3.tools.diagram
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: eu.fbk.af3.tools.diagram.Activator
Bundle-Vendor: FBK (Fondazione Bruno Kessler)
Require-Bundle: org.eclipse.core.runtime,
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.allocation.ui
Bundle-ManifestVersion: 2
Bundle-Name: fortiss AF3 Allocation UI
Bundle-SymbolicName: org.fortiss.af3.allocation.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: org.fortiss.af3.allocation.ui.AF3AllocationUIActivator
Require-Bundle: org.eclipse.ui.ide;visibility:=reexport,
org.fortiss.af3.allocation;visibility:=reexport,
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.allocation
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.af3.allocation;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.component.ui
Bundle-ManifestVersion: 2
Bundle-Name: AF3 Component UI
Bundle-SymbolicName: org.fortiss.af3.component.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: org.fortiss.af3.component.ui.AF3ComponentUIActivator
Require-Bundle: org.fortiss.af3.expression.ui;visibility:=reexport,
org.fortiss.af3.component;visibility:=reexport,
......
ComponentSpecificationPropertySection.java fb5b6d82090f7ae063a8876b421529075d072939 GREEN
PortDataPropagation.java 9305d9fd7bb52398bdf227ddf7e1b54adac15808 GREEN
PortInitValueSection.java c25ad3fd1998f35c10a541caad3211f1333ae420 GREEN
PortSpecificationPropertySection.java 051d483d1ff4300fc4920de0f2a76eb12ee29fcc RED
PortInitValueSection.java ba26a87fbf4d0bce69e57d108b9939cfa5ab8fa8 GREEN
PortSpecificationPropertySection.java 225fbc0c6dab88e48da247321f870bebfdbd65f8 GREEN
TypeLabelProvider.java 5b0fcced122681125f7df55469ea19b3685eb8bd GREEN
......@@ -119,13 +119,18 @@ public class PortInitValueSection extends PropertySectionBase {
* is strong causal, the input value can be specified; if the parent component
* is not strong causal, the input value should be disabled.
*/
if(port.getComponent() == null) {
return;
}
IObservableValue<?> initValue = observeValue(this.spec,
AF3ComponentPackageImpl.Literals.PORT_SPECIFICATION__INITIAL_VALUE);
ITermToStringConverter modelToTextConverter = new ITermToStringConverter();
StringToIExpressionTermConverter textToModelConverter =
new StringToIExpressionTermConverter(this.spec);
IValidator textValidator = new StringToIExpressionTermValidator(this.spec);
@SuppressWarnings("rawtypes") IValidator textValidator =
new StringToIExpressionTermValidator(this.spec);
IType type = this.spec.getType();
if(type instanceof TInt) {
......
......@@ -246,7 +246,7 @@ public final class PortSpecificationPropertySection extends PropertySectionBase
public void refresh() {
super.refresh();
if(spec == null) {
if(spec == null || port.getComponent() == null) {
return;
}
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.component
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.af3.component;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
......@@ -3,6 +3,6 @@ BehaviorComponentCompositorBase.java fb4774202dcb216450b206c6bec17ae0786cf79c GR
ComponentArchitectureCompositor.java 166faf6111d527724d966a734b702650706a20ce GREEN
ComponentArchitectureFileProjectCompositor.java 1b972b98efb662fc0e51b9abd0389ccabf314445 GREEN
ComponentCompositor.java 17115be2194e0a0581bf350f0b0013c270381939 GREEN
ComponentConnectionCompositor.java 3f2f5f557061557792f82c5d93441fde14ed9c44 GREEN
ComponentConnectionCompositor.java 7e5869de82be61d684369ad0e573661080e048b6 GREEN
LibraryComponentPackageCompositor.java 0e3dcd3e839e275dd7a23e83388d66ae0cd180df GREEN
LibraryCompositor.java e6a47934d3b561fdde707ca1abeb56b27bb78ea2 GREEN
......@@ -105,17 +105,16 @@ public class ComponentConnectionCompositor
Component sourceComponent = sourcePort.getComponent();
Component targetComponent = targetPort.getComponent();
boolean isNeighbouringLevels = (parentComponent.equals(sourceComponent) ||
parentComponent.equals(targetComponent)) &&
!sourceComponent.equals(targetComponent);
boolean sourceIsParentComponentPort = parentComponent.equals(sourceComponent);
boolean targetIsParentComponentPort = parentComponent.equals(targetComponent);
// Inside the parent component, the ports of the parent component change their kind.
// Input ports become output ports and vice versa.
boolean sourceIsOutput = sourceIsParentComponentPort ? (sourcePort instanceof InputPort)
: (sourcePort instanceof OutputPort);
boolean targetIsInput = targetIsParentComponentPort ? (targetPort instanceof OutputPort)
: (targetPort instanceof InputPort);
// If the connection goes from one level to a higher one, both ports must be of same type
if(isNeighbouringLevels) {
return sourcePort.getClass() == targetPort.getClass();
}
// If on the same level, channels must be modeled from the output to the input port.
return sourcePort instanceof OutputPort && targetPort instanceof InputPort;
return sourceIsOutput && targetIsInput;
}
/**
......
......@@ -3,14 +3,14 @@ Automatic-Module-Name: org.fortiss.af3.cosimulation.ui
Bundle-ManifestVersion: 2
Bundle-Name: AF3 Cosimulation UI
Bundle-SymbolicName: org.fortiss.af3.cosimulation.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: org.fortiss.af3.cosimulation.ui.AF3CosimulationUIActivator
Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0";visibility:=reexport,
org.fortiss.af3.project.ui;bundle-version="1.0.0";visibility:=reexport,
org.fortiss.tooling.base.ui;bundle-version="1.0.0";visibility:=reexport,
org.fortiss.af3.component,
org.fortiss.af3.cosimulation;bundle-version="1.0.0",
org.fortiss.af3.component.ui;bundle-version="2.16.0"
org.fortiss.af3.component.ui;bundle-version="2.17.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: fortiss GmbH
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.cosimulation
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.af3.cosimulation;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.exploration.smt
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.af3.exploration.smt;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
<?xml version="1.0" encoding="UTF-8"?>
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-allocation="http://www.fortiss.org/af3/allocation" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-annotation="http://www.fortiss.org/af3/platform/annotation" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-platform-hierarchic-annotation="http://www.fortiss.org/af3/platform/hierarchic/annotation" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-task="http://www.fortiss.org/af3/task" xmlns:org-fortiss-af3-task-allocation="http://www.fortiss.org/af3/task/allocation" xmlns:org-fortiss-af3-task-annotation="http://www.fortiss.org/af3/task/annotation" xmlns:org-fortiss-af3-task-timing="http://www.fortiss.org/af3/task/timing" xmlns:org-fortiss-af3-timing="http://www.fortiss.org/af3/timing" xmlns:org-fortiss-af3-timing-annotation="http://www.fortiss.org/af3/timing/annotation" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="26" id="26" name="system_test_flat" af3Version="2.16.0.qualifier">
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-allocation="http://www.fortiss.org/af3/allocation" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-annotation="http://www.fortiss.org/af3/platform/annotation" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-platform-hierarchic-annotation="http://www.fortiss.org/af3/platform/hierarchic/annotation" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-task="http://www.fortiss.org/af3/task" xmlns:org-fortiss-af3-task-allocation="http://www.fortiss.org/af3/task/allocation" xmlns:org-fortiss-af3-task-annotation="http://www.fortiss.org/af3/task/annotation" xmlns:org-fortiss-af3-task-timing="http://www.fortiss.org/af3/task/timing" xmlns:org-fortiss-af3-timing="http://www.fortiss.org/af3/timing" xmlns:org-fortiss-af3-timing-annotation="http://www.fortiss.org/af3/timing/annotation" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="26" id="26" name="system_test_flat" af3Version="2.17.0.qualifier">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" xmi:id="1" id="1">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" xmi:id="2" id="2">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-allocation="http://www.fortiss.org/af3/allocation" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-annotation="http://www.fortiss.org/af3/platform/annotation" xmlns:org-fortiss-af3-platform-hierarchic-annotation="http://www.fortiss.org/af3/platform/hierarchic/annotation" xmlns:org-fortiss-af3-platform-hierarchic-node="http://www.fortiss.org/af3/platform/hierarchic/node" xmlns:org-fortiss-af3-platform-hierarchic-processor="http://www.fortiss.org/af3/platform/hierarchic/processor" xmlns:org-fortiss-af3-platform-hierarchic-tile="http://www.fortiss.org/af3/platform/hierarchic/tile" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-task="http://www.fortiss.org/af3/task" xmlns:org-fortiss-af3-task-allocation="http://www.fortiss.org/af3/task/allocation" xmlns:org-fortiss-af3-task-annotation="http://www.fortiss.org/af3/task/annotation" xmlns:org-fortiss-af3-task-timing="http://www.fortiss.org/af3/task/timing" xmlns:org-fortiss-af3-timing="http://www.fortiss.org/af3/timing" xmlns:org-fortiss-af3-timing-annotation="http://www.fortiss.org/af3/timing/annotation" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="26" id="26" name="system_test_hierarchical" af3Version="2.16.0.qualifier">
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-allocation="http://www.fortiss.org/af3/allocation" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-annotation="http://www.fortiss.org/af3/platform/annotation" xmlns:org-fortiss-af3-platform-hierarchic-annotation="http://www.fortiss.org/af3/platform/hierarchic/annotation" xmlns:org-fortiss-af3-platform-hierarchic-node="http://www.fortiss.org/af3/platform/hierarchic/node" xmlns:org-fortiss-af3-platform-hierarchic-processor="http://www.fortiss.org/af3/platform/hierarchic/processor" xmlns:org-fortiss-af3-platform-hierarchic-tile="http://www.fortiss.org/af3/platform/hierarchic/tile" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-task="http://www.fortiss.org/af3/task" xmlns:org-fortiss-af3-task-allocation="http://www.fortiss.org/af3/task/allocation" xmlns:org-fortiss-af3-task-annotation="http://www.fortiss.org/af3/task/annotation" xmlns:org-fortiss-af3-task-timing="http://www.fortiss.org/af3/task/timing" xmlns:org-fortiss-af3-timing="http://www.fortiss.org/af3/timing" xmlns:org-fortiss-af3-timing-annotation="http://www.fortiss.org/af3/timing/annotation" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="26" id="26" name="system_test_hierarchical" af3Version="2.17.0.qualifier">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" xmi:id="1" id="1">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" xmi:id="2" id="2">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.exploration.ui
Bundle-ManifestVersion: 2
Bundle-Name: AF3 Exploration UI
Bundle-SymbolicName: org.fortiss.af3.exploration.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-Activator: org.fortiss.af3.exploration.ui.AF3ExplorationUIActivator
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.exploration
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.af3.exploration;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.expression.ui
Bundle-ManifestVersion: 2
Bundle-Name: AF3 Expression UI
Bundle-SymbolicName: org.fortiss.af3.expression.ui;singleton:=true
Bundle-Version: 2.16.0.qualifier
Bundle-Version: 2.17.0.qualifier
Bundle-Activator: org.fortiss.af3.expression.ui.AF3ExpressionUIActivator
Bundle-ClassPath: .
Require-Bundle: org.fortiss.af3.expression;visibility:=reexport,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment