Commit c25492f1 authored by Alexander Diewald's avatar Alexander Diewald

Hier. Plat.: Do not allow Clocks to be added aside Nodes.

Issue-Ref: 3980
Issue-Url: https://af3-developer.fortiss.org/issues/3980Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent c0adec4b
HierarchicPlatformArchitectureCompositor.java bbd67a9699b73eb051a815aa513f61621e3836d4 GREEN
HierarchicPlatformArchitectureCompositor.java 1d2debd385e655339de4d60a5e3e84f26bab5a87 YELLOW
HierarchicalCompositionRules.java 9ab422ee2de9216a99a2ebd13345db453132e803 GREEN
......@@ -23,6 +23,7 @@ import org.fortiss.af3.platform.hierarchic.compose.base.IPlatformHierarchicalCom
import org.fortiss.af3.platform.hierarchic.compose.base.PlatformArchitectureCompositorBase;
import org.fortiss.af3.platform.hierarchic.model.cluster.Cluster;
import org.fortiss.af3.platform.hierarchic.model.cluster.IClusterDomain;
import org.fortiss.af3.platform.hierarchic.model.electronics.Clock;
import org.fortiss.af3.platform.hierarchic.model.node.OffChipNetworkInterface;
import org.fortiss.af3.platform.hierarchic.model.node.OffChipNetworkPort;
import org.fortiss.af3.platform.model.IArchitectureDomain;
......@@ -68,6 +69,10 @@ public class HierarchicPlatformArchitectureCompositor extends PlatformArchitectu
return false;
}
if(contained instanceof Clock) {
return false;
}
return super.canCompose(container, contained, context);
}
......
BusCompositor.java 26b60c609de15d545abc945cc7c35d487531800c GREEN
ClockCompositor.java 360aea01ec2ae832ab5c69e95b38b38ade3f5f2f GREEN
ClusterCompositor.java 6a2861b896f790c404753844eaa15222518fd59d GREEN
ClusterCompositor.java de1ea49354a09bc3c098c64674bfc4a15dcae81e YELLOW
CoreCompositor.java 050798a2f694a04c23595ab7b9dee9756e9a3404 GREEN
MemoryCompositor.java 3064bb9b47a0df16eb85304481716d56273a21b9 GREEN
NetworkInterfaceCompositor.java da20db4c57e17921143fd8ea87635d9f341904b5 GREEN
......
......@@ -24,6 +24,7 @@ import org.fortiss.af3.platform.hierarchic.compose.HierarchicalCompositionRules;
import org.fortiss.af3.platform.hierarchic.compose.base.IPlatformHierarchicalCompositionRules;
import org.fortiss.af3.platform.hierarchic.compose.base.elements.PlatformElementCompositorBase;
import org.fortiss.af3.platform.hierarchic.model.cluster.Cluster;
import org.fortiss.af3.platform.hierarchic.model.electronics.Clock;
import org.fortiss.af3.platform.hierarchic.model.electronics.ClockOut;
import org.fortiss.af3.platform.hierarchic.model.electronics.PowerOut;
import org.fortiss.af3.platform.hierarchic.model.node.Node;
......@@ -63,8 +64,8 @@ public final class ClusterCompositor extends PlatformElementCompositorBase<Clust
public boolean canCompose(Cluster container, EObject contained,
IElementCompositionContext context) {
// Exception to enable addition of OffChipNetworkPort to Cluster
return contained instanceof OffChipNetworkPort ||
super.canCompose(container, contained, context);
return !(contained instanceof Clock) && (contained instanceof OffChipNetworkPort ||
super.canCompose(container, contained, context));
}
/** {@inheritDoc} */
......
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