Commit 404da597 authored by Simon Barner's avatar Simon Barner
Browse files

Consistent naming

 - Move all allocation specializations to sub-package "allocation"
 - Derive AllocationTable and AllocationEntry specialization from primary model elements (e.g. ComponentToPartitionAllocationTable/Entry). This leads to shorted and more readable class names than including 2x "Architecture"
refs 2950
parent 2754e752
......@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.fortiss.af3.allocation.ui;singleton:=true
Bundle-Version: 2.12.0.qualifier
Bundle-Activator: org.fortiss.af3.allocation.ui.AF3AllocationUIActivator
Require-Bundle: org.eclipse.ui.ide;visibility:=reexport,
org.fortiss.af3.allocation,
org.fortiss.tooling.base.ui,
org.fortiss.af3.allocation;visibility:=reexport,
org.fortiss.tooling.base.ui;visibility:=reexport,
org.fortiss.af3.project,
org.fortiss.af3.schedule.ui
Bundle-ActivationPolicy: lazy
......
......@@ -4,21 +4,11 @@ Bundle-Name: fortiss AF3 Partition UI
Bundle-SymbolicName: org.fortiss.af3.partition.ui;singleton:=true
Bundle-Version: 2.12.0.qualifier
Bundle-Activator: org.fortiss.af3.partition.ui.AF3PartitionUIActivator
Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0";visibility:=reexport,
org.fortiss.af3.partition;visibility:=reexport,
org.fortiss.tooling.base.ui,
Require-Bundle: org.fortiss.af3.partition;visibility:=reexport,
org.fortiss.af3.allocation.ui,
org.fortiss.af3.component,
org.fortiss.af3.schedule.ui,
org.fortiss.af3.platform.hierarchic
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: fortiss GmbH
Export-Package: org.fortiss.af3.partition.ui
Import-Package: org.fortiss.af3.deployment.generator,
org.fortiss.af3.deployment.model,
org.fortiss.af3.deployment.ui,
org.fortiss.af3.deployment.ui.generator,
org.fortiss.af3.platform.model,
org.fortiss.af3.project.ui.execution,
org.fortiss.af3.project.ui.utils
......@@ -41,21 +41,21 @@
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.partition.ui.editor.LogicalArchitectureToPartitionArchitectureAllocationTableEditorBinding">
binding="org.fortiss.af3.partition.ui.editor.ComponentToPartitionAllocationTableEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable">
modelElementClass="org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.partition.ui.editor.LogicalArchitectureInputPortToPartitionArchitectureInputPortAllocationTableEditorBinding">
binding="org.fortiss.af3.partition.ui.editor.InputPortToPartitionInputPortAllocationTableEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable">
modelElementClass="org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable">
</modelElementClass>
</modelEditorBinding>
<modelEditorBinding
binding="org.fortiss.af3.partition.ui.editor.LogicalArchitectureOutputPortToPartitionArchitectureOutputPortAllocationTableEditorBinding">
binding="org.fortiss.af3.partition.ui.editor.OutputPortToPartitionOutputPortAllocationTableEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable">
modelElementClass="org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable">
</modelElementClass>
</modelEditorBinding>
</extension>
......@@ -92,8 +92,8 @@
</modelElementClass>
</modelElementHandler>
<modelElementHandler handler="org.fortiss.af3.partition.ui.handler.LogicalArchitectureToPartitionArchitectureAllocationTableHandler">
<modelElementClass modelElementClass="org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable"/>
<modelElementHandler handler="org.fortiss.af3.partition.ui.handler.ComponentToPartitionAllocationTableHandler">
<modelElementClass modelElementClass="org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable"/>
</modelElementHandler>
</extension>
......
LogicalArchitectureInputPortToPartitionArchitectureInputPortAllocationTableEditor.java 357c38fec3573a5c179a575c194eab8792368da0 YELLOW
LogicalArchitectureInputPortToPartitionArchitectureInputPortAllocationTableEditorBinding.java 20b8c5cbf21e51591f0217e10ec98d4c3149adad YELLOW
LogicalArchitectureOutputPortToPartitionArchitectureOutputPortAllocationTableEditor.java 9b110ff2cd5d02649ac61e46f65f1fe74b3ab743 YELLOW
LogicalArchitectureOutputPortToPartitionArchitectureOutputPortAllocationTableEditorBinding.java 139d328a71f8117a0854f3a81f6fe42b91d5be5c YELLOW
LogicalArchitectureToPartitionArchitectureAllocationTableEditor.java a38462f9b7fc0421e94c8bbfe391e1f07dbbde2c YELLOW
LogicalArchitectureToPartitionArchitectureAllocationTableEditorBinding.java 59195c54319d51b9c13eed16204807081ef09170 YELLOW
ComponentToPartitionAllocationTableEditor.java da4a8258922118a3b6cf41a6ace589e8273c7ec3 YELLOW
ComponentToPartitionAllocationTableEditorBinding.java 7ec0a23e94b161cac19ca59926d52a3970814cb2 YELLOW
InputPortToPartitionInputPortAllocationTableEditor.java fc0b3718bebe5701e1402b598fa06aa47b72e488 YELLOW
InputPortToPartitionInputPortAllocationTableEditorBinding.java 18d0523447d6480496bc91b60d5c839fca695546 YELLOW
OutputPortToPartitionOutputPortAllocationTableEditor.java 1fe156991715718ab4d488e13c8d6940fac18a96 YELLOW
OutputPortToPartitionOutputPortAllocationTableEditorBinding.java d1da6c036508fb2ba03cb82000a23a0ffb2cc2e0 YELLOW
PartitionEditor.java 815fb9d8a13da071bc78db91b8fde14c5e3655ed YELLOW
PartitionEditorBinding.java f4b71e645ff651361dba803f9abf2bb06f19052d YELLOW
......@@ -20,22 +20,22 @@ import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.component.model.ComponentArchitecture;
import org.fortiss.af3.partition.model.Partition;
import org.fortiss.af3.partition.model.PartitionArchitecture;
import org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable;
import org.fortiss.af3.partition.model.ca2pa.LogicalComponentToPartitionAllocationEntry;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationEntry;
/**
* Editor to assign logical {@link Component}s to {@link Partition}s.
*
* @author barner
*/
public class LogicalArchitectureToPartitionArchitectureAllocationTableEditor extends
AllocationTableEditor<LogicalArchitectureToPartitionArchitectureAllocationTable> {
public class ComponentToPartitionAllocationTableEditor extends
AllocationTableEditor<ComponentToPartitionAllocationTable> {
/** Constructor. */
public LogicalArchitectureToPartitionArchitectureAllocationTableEditor() {
public ComponentToPartitionAllocationTableEditor() {
// Sources: Components (without hidden root component that represents the system)
// Targets: Partitions
super(LogicalComponentToPartitionAllocationEntry.class, ComponentArchitecture.class,
super(ComponentToPartitionAllocationEntry.class, ComponentArchitecture.class,
PartitionArchitecture.class, Component.class, Partition.class, c -> ((Component)c)
.getParentComponent() != null, null);
}
......
......@@ -16,20 +16,20 @@
package org.fortiss.af3.partition.ui.editor;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
* Editor binding for {@link LogicalArchitectureToPartitionArchitectureAllocationTableEditor}.
* Editor binding for {@link ComponentToPartitionAllocationTableEditor}.
*
* @author barner
*/
public class LogicalArchitectureToPartitionArchitectureAllocationTableEditorBinding extends
ModelEditorBindingBase<LogicalArchitectureToPartitionArchitectureAllocationTable> {
public class ComponentToPartitionAllocationTableEditorBinding extends
ModelEditorBindingBase<ComponentToPartitionAllocationTable> {
/** {@inheritDoc} */
@Override
public Class<? extends IEditorPart> getEditorClass() {
return LogicalArchitectureToPartitionArchitectureAllocationTableEditor.class;
return ComponentToPartitionAllocationTableEditor.class;
}
/** {@inheritDoc} */
......
......@@ -20,22 +20,22 @@ import org.fortiss.af3.component.model.ComponentArchitecture;
import org.fortiss.af3.component.model.InputPort;
import org.fortiss.af3.partition.model.PartitionArchitecture;
import org.fortiss.af3.partition.model.PartitionInputPort;
import org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable;
import org.fortiss.af3.partition.model.ca2pa.LogicalInPortToPartitionInPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.partition.model.allocation.InPortToPartitionInPortAllocationEntry;
/**
* Editor to assign logical {@link InputPort}s to {@link PartitionInputPort}s.
*
* @author zverlov
*/
public class LogicalArchitectureInputPortToPartitionArchitectureInputPortAllocationTableEditor
extends AllocationTableEditor<LogicalArchitectureToPartitionArchitectureAllocationTable> {
public class InputPortToPartitionInputPortAllocationTableEditor
extends AllocationTableEditor<ComponentToPartitionAllocationTable> {
/** Constructor. */
public LogicalArchitectureInputPortToPartitionArchitectureInputPortAllocationTableEditor() {
public InputPortToPartitionInputPortAllocationTableEditor() {
// Sources: Input ports (without those of hidden root component representing system inputs)
// Targets: Partition input ports
super(LogicalInPortToPartitionInPortAllocationEntry.class, ComponentArchitecture.class,
super(InPortToPartitionInPortAllocationEntry.class, ComponentArchitecture.class,
PartitionArchitecture.class, InputPort.class, PartitionInputPort.class,
p -> ((InputPort)p).getComponent().getParentComponent() != null, null);
}
......
......@@ -16,21 +16,21 @@
package org.fortiss.af3.partition.ui.editor;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
* Editor binding for
* {@link LogicalArchitectureInputPortToPartitionArchitectureInputPortAllocationTableEditor}.
* {@link InputPortToPartitionInputPortAllocationTableEditor}.
*
* @author zverlov
*/
public class LogicalArchitectureInputPortToPartitionArchitectureInputPortAllocationTableEditorBinding
extends ModelEditorBindingBase<LogicalArchitectureToPartitionArchitectureAllocationTable> {
public class InputPortToPartitionInputPortAllocationTableEditorBinding
extends ModelEditorBindingBase<ComponentToPartitionAllocationTable> {
/** {@inheritDoc} */
@Override
public Class<? extends IEditorPart> getEditorClass() {
return LogicalArchitectureInputPortToPartitionArchitectureInputPortAllocationTableEditor.class;
return InputPortToPartitionInputPortAllocationTableEditor.class;
}
/** {@inheritDoc} */
......
......@@ -20,22 +20,22 @@ import org.fortiss.af3.component.model.ComponentArchitecture;
import org.fortiss.af3.component.model.OutputPort;
import org.fortiss.af3.partition.model.PartitionArchitecture;
import org.fortiss.af3.partition.model.PartitionOutputPort;
import org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable;
import org.fortiss.af3.partition.model.ca2pa.LogicalOutPortToPartitionOutPortAllocationEntry;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.partition.model.allocation.OutPortToPartitionOutPortAllocationEntry;
/**
* Editor to assign logical {@link OutputPort}s to {@link PartitionOutputPort}s.
*
* @author zverlov
*/
public class LogicalArchitectureOutputPortToPartitionArchitectureOutputPortAllocationTableEditor
extends AllocationTableEditor<LogicalArchitectureToPartitionArchitectureAllocationTable> {
public class OutputPortToPartitionOutputPortAllocationTableEditor
extends AllocationTableEditor<ComponentToPartitionAllocationTable> {
/** Constructor. */
public LogicalArchitectureOutputPortToPartitionArchitectureOutputPortAllocationTableEditor() {
public OutputPortToPartitionOutputPortAllocationTableEditor() {
// Sources: Output ports (without those of hidden root component representing system output)
// Targets: Partition output ports
super(LogicalOutPortToPartitionOutPortAllocationEntry.class, ComponentArchitecture.class,
super(OutPortToPartitionOutPortAllocationEntry.class, ComponentArchitecture.class,
PartitionArchitecture.class, OutputPort.class, PartitionOutputPort.class,
p -> ((OutputPort)p).getComponent().getParentComponent() != null, null);
}
......
......@@ -16,21 +16,21 @@
package org.fortiss.af3.partition.ui.editor;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
* Editor binding for
* {@link LogicalArchitectureOutputPortToPartitionArchitectureOutputPortAllocationTableEditor}.
* {@link OutputPortToPartitionOutputPortAllocationTableEditor}.
*
* @author zverlov
*/
public class LogicalArchitectureOutputPortToPartitionArchitectureOutputPortAllocationTableEditorBinding
extends ModelEditorBindingBase<LogicalArchitectureToPartitionArchitectureAllocationTable> {
public class OutputPortToPartitionOutputPortAllocationTableEditorBinding
extends ModelEditorBindingBase<ComponentToPartitionAllocationTable> {
/** {@inheritDoc} */
@Override
public Class<? extends IEditorPart> getEditorClass() {
return LogicalArchitectureOutputPortToPartitionArchitectureOutputPortAllocationTableEditor.class;
return OutputPortToPartitionOutputPortAllocationTableEditor.class;
}
/** {@inheritDoc} */
......
ComponentToPartitionAllocationTableHandler.java efd31796792720c8eeb949f305fd54cc6743ed53 YELLOW
LogicalArchitectureToPartitionArchitectureAllocationTableHandler.java bce28563589ba40610458e6063ee7b4132aa7d7b YELLOW
PartitionArchitectureHandler.java 431570f800c217e85d8e941c384ecf9aff0a1779 YELLOW
PartitionChannelHandler.java f4ff5f0e1583991ab31402ae280160d04ed42ba8 YELLOW
......
......@@ -18,19 +18,19 @@ package org.fortiss.af3.partition.ui.handler;
import static org.fortiss.af3.partition.ui.AF3PartitionUIActivator.getImageDescriptor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHandlerBase;
/**
* {@link IModelElementHandler} for
* {@link LogicalArchitectureToPartitionArchitectureAllocationTable}.
* {@link ComponentToPartitionAllocationTable}.
*
* @author zverlov
*/
public class LogicalArchitectureToPartitionArchitectureAllocationTableHandler
public class ComponentToPartitionAllocationTableHandler
extends
NamedCommentedModelElementHandlerBase<LogicalArchitectureToPartitionArchitectureAllocationTable> {
NamedCommentedModelElementHandlerBase<ComponentToPartitionAllocationTable> {
/** {@inheritDoc} */
@Override
......
PrototypeProvider.java 7ebdb7dd363d1a1941a5755c51190c7179170d06 YELLOW
PrototypeProvider.java 059ff2bd2e9f70454b7a61af2304d2763b33620d YELLOW
......@@ -15,7 +15,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.partition.ui.prototype;
import static org.fortiss.af3.partition.util.PartitionModelElementFactory.createLogicalArchitectureToPartitionArchitectureAllocationTable;
import static org.fortiss.af3.partition.util.PartitionModelElementFactory.createComponentToPartitionAllocationTable;
import static org.fortiss.af3.partition.util.PartitionModelElementFactory.createPartition;
import static org.fortiss.af3.partition.util.PartitionModelElementFactory.createPartitionArchitecture;
import static org.fortiss.af3.partition.util.PartitionModelElementFactory.createPartitionInputPort;
......@@ -45,7 +45,7 @@ public class PrototypeProvider extends PrototypeProviderBase {
registerPrimaryPrototype(
"La \u2192 Pa", // La -> Pa
createLogicalArchitectureToPartitionArchitectureAllocationTable("La \u2192 Pa"),
createComponentToPartitionAllocationTable("La \u2192 Pa"),
org.fortiss.af3.allocation.ui.prototypes.PrototypeProvider.CATEGORY);
}
}
......@@ -16,8 +16,8 @@
package org.fortiss.af3.schedule.ui.properties;
import static java.util.Collections.emptyList;
import static org.fortiss.af3.partition.util.PartitionArchitectureUtils.getLogicalArchitectureToPartitionArchitectureAllocationTable;
import static org.fortiss.af3.platform.hierarchic.utils.HierarchicPlatformUtils.getPartitionArchitectureToPhysicalArchitectureAllocationTable;
import static org.fortiss.af3.partition.util.PartitionArchitectureUtils.getComponentToPartitionAllocationTable;
import static org.fortiss.af3.platform.hierarchic.utils.HierarchicPlatformUtils.getPartitionToHardwareAllocationTable;
import static org.fortiss.af3.schedule.utils.AF3ScheduleModelElementFactory.createSchedulableEntity;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf;
import static org.fortiss.tooling.kernel.utils.KernelModelElementUtils.getParentElement;
......@@ -28,8 +28,8 @@ import org.eclipse.emf.common.util.EList;
import org.fortiss.af3.allocation.model.AllocationTableCollection;
import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.partition.model.Partition;
import org.fortiss.af3.partition.model.ca2pa.LogicalArchitectureToPartitionArchitectureAllocationTable;
import org.fortiss.af3.platform.hierarchic.model.pa2phy.PartitionArchitectureToPhysicalArchitectureAllocationTable;
import org.fortiss.af3.partition.model.allocation.ComponentToPartitionAllocationTable;
import org.fortiss.af3.platform.hierarchic.model.allocation.PartitionToHardwareAllocationTable;
import org.fortiss.af3.platform.hierarchic.model.processor.Core;
import org.fortiss.af3.platform.model.IPlatformCommunicationResource;
import org.fortiss.af3.platform.model.IPlatformProcessingResource;
......@@ -66,15 +66,15 @@ public class ResourceAllocationAllocationPropertySection extends ResourceAllocat
// TODO Communication schedules
} else if(resource instanceof IPlatformProcessingResource) {
if(resource instanceof Core) {
PartitionArchitectureToPhysicalArchitectureAllocationTable pa2phy =
getPartitionArchitectureToPhysicalArchitectureAllocationTable(atc);
if(pa2phy != null) {
EList<Partition> partitions = pa2phy.getPartitions((Core)resource);
PartitionToHardwareAllocationTable pa2hw =
getPartitionToHardwareAllocationTable(atc);
if(pa2hw != null) {
EList<Partition> partitions = pa2hw.getPartitions((Core)resource);
return pickInstanceOf(IModelElement.class, partitions);
}
} else if(resource instanceof Partition) {
LogicalArchitectureToPartitionArchitectureAllocationTable la2pa =
getLogicalArchitectureToPartitionArchitectureAllocationTable(atc);
ComponentToPartitionAllocationTable la2pa =
getComponentToPartitionAllocationTable(atc);
if(la2pa != null) {
EList<Component> components = la2pa.getComponents((Partition)resource);
......
......@@ -7,7 +7,9 @@ Bundle-ClassPath: .
Bundle-Activator: org.fortiss.af3.partition.AF3PartitionActivator
Require-Bundle: org.fortiss.af3.project,
org.fortiss.af3.allocation;visibility:=reexport,
org.fortiss.af3.platform
org.fortiss.af3.platform,
org.fortiss.af3.deployment,
org.fortiss.af3.platform.pikeos
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: fortiss GmbH
......@@ -15,14 +17,9 @@ Bundle-Localization: plugin
Export-Package: org.fortiss.af3.partition,
org.fortiss.af3.partition.compositor,
org.fortiss.af3.partition.model,
org.fortiss.af3.partition.model.ca2pa,
org.fortiss.af3.partition.model.ca2pa.impl,
org.fortiss.af3.partition.model.ca2pa.util,
org.fortiss.af3.partition.model.allocation,
org.fortiss.af3.partition.model.allocation.impl,
org.fortiss.af3.partition.model.allocation.util,
org.fortiss.af3.partition.model.impl,
org.fortiss.af3.partition.model.util,
org.fortiss.af3.partition.util
Import-Package: org.fortiss.af3.component.model,
org.fortiss.af3.deployment.model,
org.fortiss.af3.deployment.utils,
org.fortiss.af3.platform.pikeos.model,
org.fortiss.af3.platform.pikeos.utils
......@@ -18,8 +18,9 @@
<eClassifiers xsi:type="ecore:EClass" name="PartitionPort" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ConnectorBase"/>
<eClassifiers xsi:type="ecore:EClass" name="PartitionInputPort" eSuperTypes="#//PartitionPort platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/EntryConnectorBase"/>
<eClassifiers xsi:type="ecore:EClass" name="PartitionOutputPort" eSuperTypes="#//PartitionPort platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ExitConnectorBase"/>
<eSubpackages name="ca2pa" nsURI="http://www.fortiss.org/af3/partition/ca2pa" nsPrefix="org-fortiss-af3-partition-ca2pa">
<eClassifiers xsi:type="ecore:EClass" name="LogicalArchitectureToPartitionArchitectureAllocationTable"
<eSubpackages name="allocation" nsURI="http://www.fortiss.org/af3/partition/allocation"
nsPrefix="org-fortiss-af3-partition-allocation">
<eClassifiers xsi:type="ecore:EClass" name="ComponentToPartitionAllocationTable"
eSuperTypes="platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//AllocationTable">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO"/>
......@@ -27,14 +28,14 @@
<eOperations name="getPartition" eType="#//Partition">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Returns the {@link Partition} to which the given {@link Component} is allocated."/>
<details key="body" value="return LogicalArchitectureToPartitionArchitectureAllocationTableStaticImpl.getPartition(this, component);"/>
<details key="body" value="return ComponentToPartitionAllocationTableStaticImpl.getPartition(this, component);"/>
</eAnnotations>
<eParameters name="component" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
</eOperations>
<eOperations name="getComponents">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Returns the list of {@link Component}s which are allocated to the given {@link Partition}."/>
<details key="body" value="return LogicalArchitectureToPartitionArchitectureAllocationTableStaticImpl.getComponents(this, partition);"/>
<details key="body" value="return ComponentToPartitionAllocationTableStaticImpl.getComponents(this, partition);"/>
</eAnnotations>
<eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">
<eTypeArguments eClassifier="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
......@@ -44,40 +45,40 @@
<eOperations name="getPartitionChannel" eType="#//PartitionChannel">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Returns the {@link PartitionChannel} to which the given logical {@link Channel} is allocated."/>
<details key="body" value="return LogicalArchitectureToPartitionArchitectureAllocationTableStaticImpl.getPartitionChannel(this, channel);"/>
<details key="body" value="return ComponentToPartitionAllocationTableStaticImpl.getPartitionChannel(this, channel);"/>
</eAnnotations>
<eParameters name="channel" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Channel"/>
</eOperations>
<eOperations name="getPartitionOutputPort" eType="#//PartitionOutputPort">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Returns the {@link PartitionOutputPort} to which the given logical {@link OutputPort} is allocated."/>
<details key="body" value="return LogicalArchitectureToPartitionArchitectureAllocationTableStaticImpl.getPartitionOutputPort(this, outputPort);"/>
<details key="body" value="return ComponentToPartitionAllocationTableStaticImpl.getPartitionOutputPort(this, outputPort);"/>
</eAnnotations>
<eParameters name="outputPort" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//OutputPort"/>
</eOperations>
<eOperations name="getPartitionInputPort" eType="#//PartitionInputPort">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Returns the {@link PartitionInputPort} to which the given logical {@link InputPort} is allocated."/>
<details key="body" value="return LogicalArchitectureToPartitionArchitectureAllocationTableStaticImpl.getPartitionInputPort(this, inputPort);"/>
<details key="body" value="return ComponentToPartitionAllocationTableStaticImpl.getPartitionInputPort(this, inputPort);"/>
</eAnnotations>
<eParameters name="inputPort" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//InputPort"/>
</eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LogicalComponentToPartitionAllocationEntry"
<eClassifiers xsi:type="ecore:EClass" name="ComponentToPartitionAllocationEntry"
eSuperTypes="platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//ManyToOneAllocationEntry platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//IBidirectional">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO"/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LogicalChannelToPartitionChannelAllocationEntry"
<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">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO"/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LogicalInPortToPartitionInPortAllocationEntry"
<eClassifiers xsi:type="ecore:EClass" name="InPortToPartitionInPortAllocationEntry"
eSuperTypes="platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//ManyToOneAllocationEntry platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//IBidirectional"/>
<eClassifiers xsi:type="ecore:EClass" name="LogicalOutPortToPartitionOutPortAllocationEntry"
<eClassifiers xsi:type="ecore:EClass" name="OutPortToPartitionOutPortAllocationEntry"
eSuperTypes="platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//ManyToOneAllocationEntry platform:/resource/org.fortiss.af3.allocation/model/allocation.ecore#//IBidirectional"/>
</eSubpackages>
</ecore:EPackage>
......@@ -18,29 +18,29 @@
<genClasses ecoreClass="partition.ecore#//PartitionPort"/>
<genClasses ecoreClass="partition.ecore#//PartitionInputPort"/>
<genClasses ecoreClass="partition.ecore#//PartitionOutputPort"/>
<nestedGenPackages prefix="Ca2Pa" basePackage="org.fortiss.af3.partition.model"
disposableProviderFactory="true" ecorePackage="partition.ecore#//ca2pa">
<genClasses ecoreClass="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable">
<genOperations ecoreOperation="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getPartition">
<genParameters ecoreParameter="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getPartition/component"/>
<nestedGenPackages prefix="Ca2PaAllocation" basePackage="org.fortiss.af3.partition.model"
disposableProviderFactory="true" ecorePackage="partition.ecore#//allocation">
<genClasses ecoreClass="partition.ecore#//allocation/ComponentToPartitionAllocationTable">
<genOperations ecoreOperation="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getPartition">
<genParameters ecoreParameter="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getPartition/component"/>
</genOperations>
<genOperations ecoreOperation="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getComponents">
<genParameters ecoreParameter="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getComponents/partition"/>
<genOperations ecoreOperation="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getComponents">
<genParameters ecoreParameter="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getComponents/partition"/>
</genOperations>
<genOperations ecoreOperation="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getPartitionChannel">
<genParameters ecoreParameter="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getPartitionChannel/channel"/>
<genOperations ecoreOperation="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getPartitionChannel">
<genParameters ecoreParameter="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getPartitionChannel/channel"/>
</genOperations>
<genOperations ecoreOperation="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getPartitionOutputPort">
<genParameters ecoreParameter="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getPartitionOutputPort/outputPort"/>
<genOperations ecoreOperation="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getPartitionOutputPort">
<genParameters ecoreParameter="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getPartitionOutputPort/outputPort"/>
</genOperations>
<genOperations ecoreOperation="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getPartitionInputPort">
<genParameters ecoreParameter="partition.ecore#//ca2pa/LogicalArchitectureToPartitionArchitectureAllocationTable/getPartitionInputPort/inputPort"/>
<genOperations ecoreOperation="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getPartitionInputPort">
<genParameters ecoreParameter="partition.ecore#//allocation/ComponentToPartitionAllocationTable/getPartitionInputPort/inputPort"/>
</genOperations>
</genClasses>
<genClasses ecoreClass="partition.ecore#//ca2pa/LogicalComponentToPartitionAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//ca2pa/LogicalChannelToPartitionChannelAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//ca2pa/LogicalInPortToPartitionInPortAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//ca2pa/LogicalOutPortToPartitionOutPortAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/ComponentToPartitionAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/ChannelToPartitionChannelAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/InPortToPartitionInPortAllocationEntry"/>
<genClasses ecoreClass="partition.ecore#//allocation/OutPortToPartitionOutPortAllocationEntry"/>
</nestedGenPackages>
</genPackages>
</genmodel:GenModel>
......@@ -12,8 +12,8 @@
<!-- @generated partition -->
<package
uri="http://www.fortiss.org/af3/partition/ca2pa"
class="org.fortiss.af3.partition.model.ca2pa.Ca2PaPackage"
uri="http://www.fortiss.org/af3/partition/allocation"
class="org.fortiss.af3.partition.model.allocation.Ca2PaAllocationPackage"
genModel="model/partition.genmodel"/>
</extension>
......
AllocationTableCollectionCompositor.java d714f71b33e8d4d3e1f99d4cccbed48247c33ad9 YELLOW
AllocationTableCollectionCompositor.java de1aac9f7d3a0138ebce6fe159484493ceaac006 YELLOW
PartitionArchitectureFileProjectCompositor.java 660f85032673fe83abd7b074b5ffff8094392773 YELLOW
PartitionCompositor.java 047805e680a90fc70f99427dfde9616322b0c4ee YELLOW
PartitionConnectionCompositor.java 8fad8b4c5b6adb768f2237efffac2e5f8fdc0dd2 YELLOW
......
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