Commit 53226fad authored by Simon Barner's avatar Simon Barner
Browse files

- Remove unused ChannelToPartitionChannelAllocationEntry

- More consistent naming of {In,Out}putPortToPartition{In,Out}putPortAllocationEntry
refs 3035
parent 773995ef
ComponentToPartitionAllocationTableEditor.java 278022159ecf4e66a670c7d085d7eb34ae4e0e49 YELLOW
ComponentToPartitionAllocationTableEditorBinding.java d584ee15de7444e0d997f4f5bf7f9f5033ea2cdf YELLOW
InputPortToPartitionInputPortAllocationTableEditor.java ae9cb957875f1c3f269fb5618cb6f09eaa44e54a YELLOW
InputPortToPartitionInputPortAllocationTableEditor.java 49e22583bfff36d0447760df888fdbfc920ab3f3 YELLOW
InputPortToPartitionInputPortAllocationTableEditorBinding.java ae8629823c3e491c9c3b78be6d9f46df266f6206 YELLOW
OutputPortToPartitionOutputPortAllocationTableEditor.java dd240866add77ec4dff0346166714eadc5f6247f YELLOW
OutputPortToPartitionOutputPortAllocationTableEditor.java 81f0e13a3e8b01277cc42523af7726d04d681456 YELLOW
OutputPortToPartitionOutputPortAllocationTableEditorBinding.java 991bf811c23817bd0044f25112bc4fc909b36c6a YELLOW
PartitionEditor.java 815fb9d8a13da071bc78db91b8fde14c5e3655ed YELLOW
PartitionEditorBinding.java f4b71e645ff651361dba803f9abf2bb06f19052d YELLOW
......
......@@ -19,7 +19,7 @@ import org.fortiss.af3.allocation.ui.editor.AllocationTableEditor;
import org.fortiss.af3.component.model.InputPort;
import org.fortiss.af3.partition.model.PartitionInputPort;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.partition.model.allocation.InPortToPartitionInPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.InputPortToPartitionInputPortAllocationEntry;
/**
* Editor to assign logical {@link InputPort}s to {@link PartitionInputPort}s.
......@@ -33,7 +33,7 @@ public class InputPortToPartitionInputPortAllocationTableEditor extends
public InputPortToPartitionInputPortAllocationTableEditor() {
// Sources: Input ports (without those of hidden root component representing system inputs)
// Targets: Partition input ports
super(InPortToPartitionInPortAllocationEntry.class, p -> ((InputPort)p).getComponent()
super(InputPortToPartitionInputPortAllocationEntry.class, p -> ((InputPort)p).getComponent()
.getParentComponent() != null, null, true);
}
}
......@@ -19,7 +19,7 @@ import org.fortiss.af3.allocation.ui.editor.AllocationTableEditor;
import org.fortiss.af3.component.model.OutputPort;
import org.fortiss.af3.partition.model.PartitionOutputPort;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.partition.model.allocation.OutPortToPartitionOutPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.OutputPortToPartitionOutputPortAllocationEntry;
/**
* Editor to assign logical {@link OutputPort}s to {@link PartitionOutputPort}s.
......@@ -33,7 +33,7 @@ public class OutputPortToPartitionOutputPortAllocationTableEditor extends
public OutputPortToPartitionOutputPortAllocationTableEditor() {
// Sources: Output ports (without those of hidden root component representing system output)
// Targets: Partition output ports
super(OutPortToPartitionOutPortAllocationEntry.class, p -> ((OutputPort)p).getComponent()
super(OutputPortToPartitionOutputPortAllocationEntry.class, p -> ((OutputPort)p).getComponent()
.getParentComponent() != null, null, true);
}
}
......@@ -76,15 +76,9 @@
<details key="documentation" value="{@link AllocationEntry} specialization to map a set of {@link Component}s to a {@link Partition}."/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ChannelToPartitionChannelAllocationEntry"
eSuperTypes="platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//ManyToOneAllocationEntry platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//IBidirectional platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//allocation/IAllocationTypeVirtualizationLayer">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: Not sure if this is the right approach. See #3151."/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InPortToPartitionInPortAllocationEntry"
<eClassifiers xsi:type="ecore:EClass" name="InputPortToPartitionInputPortAllocationEntry"
eSuperTypes="platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//ManyToOneAllocationEntry platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//IBidirectional platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//allocation/IAllocationTypeVirtualizationLayer platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//allocation/IAllocationTypeInputUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="OutPortToPartitionOutPortAllocationEntry"
<eClassifiers xsi:type="ecore:EClass" name="OutputPortToPartitionOutputPortAllocationEntry"
eSuperTypes="platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//ManyToOneAllocationEntry platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//IBidirectional platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//allocation/IAllocationTypeVirtualizationLayer platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//allocation/IAllocationTypeOutputUnit"/>
<eClassifiers xsi:type="ecore:EClass" name="TaskToPartitionAllocationTable" eSuperTypes="platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//AllocationTable platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//allocation/IAllocationTypeVirtualizationLayer platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//allocation/IAllocationTypeExecutionUnit">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
......
......@@ -42,9 +42,8 @@
</genOperations>
</genClasses>
<genClasses ecoreClass="partition.ecore#//allocation/ComponentToPartitionAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/ChannelToPartitionChannelAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/InPortToPartitionInPortAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/OutPortToPartitionOutPortAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/InputPortToPartitionInputPortAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/OutputPortToPartitionOutputPortAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/TaskToPartitionAllocationTable">
<genOperations ecoreOperation="partition.ecore#//allocation/TaskToPartitionAllocationTable/getPartition">
<genParameters ecoreParameter="partition.ecore#//allocation/TaskToPartitionAllocationTable/getPartition/task"/>
......
AF3PartitionActivator.java d831f7d938d7ea1a2accd5103da82ed81b32d958 YELLOW
AF3PartitionActivator.java e765e8aa7e8c9c8fa9933df7b6d395ce9f96f171 YELLOW
......@@ -27,8 +27,8 @@ import org.fortiss.af3.partition.model.PartitionInputPort;
import org.fortiss.af3.partition.model.PartitionOutputPort;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationEntry;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.partition.model.allocation.InPortToPartitionInPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.OutPortToPartitionOutPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.InputPortToPartitionInputPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.OutputPortToPartitionOutputPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.PartitionToExecutionUnitAllocationEntry;
import org.fortiss.af3.partition.model.allocation.PartitionToExecutionUnitAllocationTable;
import org.fortiss.af3.partition.model.allocation.TaskToPartitionAllocationEntry;
......@@ -70,9 +70,9 @@ public class AF3PartitionActivator extends Plugin {
as.addAllocationEntryType(ComponentToPartitionAllocationTable.class,
ComponentToPartitionAllocationEntry.class);
as.addAllocationEntryType(ComponentToPartitionAllocationTable.class,
InPortToPartitionInPortAllocationEntry.class);
InputPortToPartitionInputPortAllocationEntry.class);
as.addAllocationEntryType(ComponentToPartitionAllocationTable.class,
OutPortToPartitionOutPortAllocationEntry.class);
OutputPortToPartitionOutputPortAllocationEntry.class);
as.setSourceModelType(ComponentToPartitionAllocationTable.class,
ComponentArchitecture.class);
as.setTargetModelType(ComponentToPartitionAllocationTable.class,
......@@ -80,11 +80,11 @@ public class AF3PartitionActivator extends Plugin {
as.addCoveredModelType(ComponentToPartitionAllocationTable.class, TaskArchitecture.class);
as.addSourceEntityType(ComponentToPartitionAllocationEntry.class, Component.class);
as.addTargetEntityType(ComponentToPartitionAllocationEntry.class, Partition.class);
as.addSourceEntityType(InPortToPartitionInPortAllocationEntry.class, InputPort.class);
as.addTargetEntityType(InPortToPartitionInPortAllocationEntry.class,
as.addSourceEntityType(InputPortToPartitionInputPortAllocationEntry.class, InputPort.class);
as.addTargetEntityType(InputPortToPartitionInputPortAllocationEntry.class,
PartitionInputPort.class);
as.addSourceEntityType(OutPortToPartitionOutPortAllocationEntry.class, OutputPort.class);
as.addTargetEntityType(OutPortToPartitionOutPortAllocationEntry.class,
as.addSourceEntityType(OutputPortToPartitionOutputPortAllocationEntry.class, OutputPort.class);
as.addTargetEntityType(OutputPortToPartitionOutputPortAllocationEntry.class,
PartitionOutputPort.class);
as.addAllocationEntryType(TaskToPartitionAllocationTable.class,
......
ComponentToPartitionAllocationTableStaticImpl.java e940a1241f3029e6a0fae38514a60d605099515a YELLOW
ComponentToPartitionAllocationTableStaticImpl.java e05051a2381824743337823db1561b56150cb883 YELLOW
PartitionToExecutionUnitAllocationTableStaticImpl.java eb4395b7b7e147eda26d87105637db5417fd0b26 YELLOW
TaskToPartitionAllocationTableStaticImpl.java bb3596a15546402dc576550f9e6d2b1ab9f464ff YELLOW
......@@ -29,8 +29,8 @@ import org.fortiss.af3.partition.model.PartitionInputPort;
import org.fortiss.af3.partition.model.PartitionOutputPort;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationEntry;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.partition.model.allocation.InPortToPartitionInPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.OutPortToPartitionOutPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.InputPortToPartitionInputPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.OutputPortToPartitionOutputPortAllocationEntry;
/**
* Implementation of static methods for {@link ComponentToPartitionAllocationTable}'s eOperations.
......@@ -69,7 +69,7 @@ public class ComponentToPartitionAllocationTableStaticImpl {
public static PartitionOutputPort getPartitionOutputPort(
ComponentToPartitionAllocationTable c2p, OutputPort outputPort) {
return (PartitionOutputPort)c2p.getTargetElement(asEList(outputPort),
OutPortToPartitionOutPortAllocationEntry.class);
OutputPortToPartitionOutputPortAllocationEntry.class);
}
/**
......@@ -79,6 +79,6 @@ public class ComponentToPartitionAllocationTableStaticImpl {
public static PartitionInputPort getPartitionInputPort(ComponentToPartitionAllocationTable c2p,
InputPort inputPort) {
return (PartitionInputPort)c2p.getTargetElement(asEList(inputPort),
InPortToPartitionInPortAllocationEntry.class);
InputPortToPartitionInputPortAllocationEntry.class);
}
}
PartitionArchitectureToPikeOSArchitectureTransformation.java 8c28b3a3a9fa12a2083966d5dcb4d87e8a23e639 RED
PartitionArchitectureToPikeOSArchitectureTransformation.java 131ed81bbfe44e6ec6aca6897e5c2cc8fc12d84d RED
PartitionArchitectureUtils.java 7f384981224a39044aa91009f31b6a6f0c677a86 YELLOW
PartitionModelElementFactory.java b893a37ce8f847aecb7f23d3c7dda80b8746666c YELLOW
......@@ -39,8 +39,8 @@ import org.fortiss.af3.partition.model.Partition;
import org.fortiss.af3.partition.model.PartitionArchitecture;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationEntry;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.partition.model.allocation.InPortToPartitionInPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.OutPortToPartitionOutPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.InputPortToPartitionInputPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.OutputPortToPartitionOutputPortAllocationEntry;
import org.fortiss.af3.platform.model.PlatformArchitecture;
import org.fortiss.af3.platform.model.Transceiver;
import org.fortiss.af3.platform.pikeos.model.Board;
......@@ -97,8 +97,8 @@ public class PartitionArchitectureToPikeOSArchitectureTransformation {
ComponentAllocation compAlloc = createComponentAllocation(c, rP);
dep.getComponentAllocations().add(compAlloc);
for(InPortToPartitionInPortAllocationEntry inPortEntry : pickInstanceOf(
InPortToPartitionInPortAllocationEntry.class, allocation.getContainedElements())) {
for(InputPortToPartitionInputPortAllocationEntry inPortEntry : pickInstanceOf(
InputPortToPartitionInputPortAllocationEntry.class, allocation.getContainedElements())) {
if((c.getConnectors().contains(inPortEntry.getSourceElements().get(0))) &&
(p.getConnectors().contains(inPortEntry.getTargetElement()))) {
InputPort inputComponent = (InputPort)inPortEntry.getSourceElements().get(0);
......@@ -109,8 +109,8 @@ public class PartitionArchitectureToPikeOSArchitectureTransformation {
}
}
for(OutPortToPartitionOutPortAllocationEntry outPortEntry : pickInstanceOf(
OutPortToPartitionOutPortAllocationEntry.class,
for(OutputPortToPartitionOutputPortAllocationEntry outPortEntry : pickInstanceOf(
OutputPortToPartitionOutputPortAllocationEntry.class,
allocation.getContainedElements())) {
if((c.getConnectors().contains(outPortEntry.getSourceElements().get(0))) &&
(p.getConnectors().contains(outPortEntry.getTargetElement()))) {
......
Supports Markdown
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