Skip to content

ST6RI-907 Cannot correctly render nested inherited connections with SHOWINHERITED style (PlantUML) #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seidewitz merged 1 commit into from
Jan 28, 2026
Merged

ST6RI-907 Cannot correctly render nested inherited connections with SHOWINHERITED style (PlantUML) #730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 74 additions & 29 deletions org.omg.sysml.plantuml/src/org/omg/sysml/plantuml/VPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************
* SysML 2 Pilot Implementation, PlantUML Visualization
* Copyright (c) 2020-2024 Mgnite Inc.
* Copyright (c) 2020-2026 Mgnite Inc.
* Copyright (c) 2022 Model Driven Solutions, Inc.
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -327,29 +327,38 @@ public PCTerminal(PC prev) {

// Make an InheritKey for ref, which is either a connector end or FeatureReferenceExpression or FeatureChainExpression.
// These are (indirectly) owned by the innermost feature, which effectively determines the target scope.
private InheritKey makeInheritKeyForReferer(PC pc) {
private RefPC makeRefPCForReferer(PC pc) {
if (pc == null) return null;
Element e = pc.getTarget();
if (!(e instanceof Feature)) return null;
Feature ref = (Feature) e;

Namespace ns = getCurrentNamespace();
Namespace ns = getCurrentNamespace(); // the namespace owning a connector
if (!(ns instanceof Type)) return null;

if (ns instanceof Feature) {
Feature tgt = (Feature) ns;
InheritKey ik = makeInheritKey(tgt);
//Feature tgt = (Feature) ns;
InheritKey ik = makeInheritKey(ref);
if (ik != null) {
// Make the inherit key indirect in order to refer to redefined targets as well as inherited ones.
ik = InheritKey.makeIndirect(ik);
ik = InheritKey.findTop(ik, ref);
if (ik != null) return ik;
InheritKey ik2 = InheritKey.findTop(ik, ref);
if (ik2 != null) {
// This is overspecifying case.
return createRefPC(ik2, pc);
}
// This is underspecifying case and we need to add a PCNamespace to capture ns/tgt
PCNamespace pcn = new PCNamespace(ns, pc);
return createRefPC(ik, pcn);
}
}

// In case that tgt inherits ref, we need to make an InheritKey for tgt.
Type tgt = (Type) ns;
return InheritKey.makeTargetKey(tgt, ref);
{
Type tgt = (Type) ns;
InheritKey ik = InheritKey.makeTargetKey(tgt, ref);
return createRefPC(ik, pc);
}
}


Expand All @@ -359,27 +368,36 @@ private InheritKey makeInheritKeyForReferer(PC pc) {
iff : Feature :>> ioTarget: ReferenceUsage;
}
*/

private static Feature getRootRedefinedFeature(Feature f) {
for (Redefinition rd: f.getOwnedRedefinition()) {
Feature rf = rd.getRedefinedFeature();
Feature rrf = getRootRedefinedFeature(rf);
if (rrf == null) return rf;
return rrf;
}
return null;
}

private static Feature getIOTarget(FlowEnd ife) {
for (FeatureMembership fm: toOwnedFeatureMembershipArray(ife)) {
Feature f = fm.getOwnedMemberFeature();
for (Redefinition rd: f.getOwnedRedefinition()) {
return rd.getRedefinedFeature();
}
return getRootRedefinedFeature(f);
}
return null;
}

private class PCItemFlowEnd extends PC {
private class PCFlowEnd extends PC {
private final Feature ioTarget;
private final PC basePC;

public PCItemFlowEnd(FlowEnd ife, PC basePC, Feature ioTarget) {
public PCFlowEnd(FlowEnd ife, PC basePC, Feature ioTarget) {
super(ife, false);
this.basePC = basePC;
this.ioTarget = ioTarget;
}

private PCItemFlowEnd(PCItemFlowEnd prev, PC basePC) {
private PCFlowEnd(PCFlowEnd prev, PC basePC) {
super(prev);
this.basePC = basePC;
this.ioTarget = prev.ioTarget;
Expand All @@ -406,12 +424,12 @@ protected PC getNext() {
if (basePC == null) return new PCTerminal(this);
PC ret = basePC.getNext();
if (!ret.isTerminal()) {
return new PCItemFlowEnd(this, ret);
return new PCFlowEnd(this, ret);
}
if (ioTarget == null) {
return new PCTerminal(this);
} else {
return new PCItemFlowEnd(this, null);
return new PCFlowEnd(this, null);
}
}
}
Expand Down Expand Up @@ -447,6 +465,37 @@ protected Element getTarget() {
}
}

private class PCNamespace extends PC {
public final Namespace ns;
private final PC pc;

@Override
protected PC getNext() {
return pc;
}

@Override
public PC enter(Namespace ns) {
if (ns.equals(this.ns)) {
return pc;
} else {
return this;
}
}

public PCNamespace(Namespace ns, PC pc) {
super((Element) null, true);
this.ns = ns;
this.pc = pc;
pc.setPrev(this);
}

@Override
protected Element getTarget() {
return null;
}
}

private class RefPC {
private PC pc;
private final InheritKey ik;
Expand Down Expand Up @@ -542,37 +591,33 @@ private String addContextForFeature(Feature f, boolean isRedefinition) {

private String addContextForEnd(Feature f) {
if (f instanceof FlowEnd) {
return addContextForItemFlowEnd((FlowEnd) f);
return addContextForFlowEnd((FlowEnd) f);
}
PC pc = makeEndFeaturePC(f);
InheritKey ik = makeInheritKeyForReferer(pc);
if (createRefPC(ik, pc) == null) return null;
if (makeRefPCForReferer(pc) == null) return null;
return "";
}

private String addContextForItemFlowEnd(FlowEnd ife) {
private String addContextForFlowEnd(FlowEnd ife) {
PC pc = makeEndFeaturePC(ife);
if (pc == null) return null;
Feature ioTarget = getIOTarget(ife);
pc = new PCItemFlowEnd(ife, pc, ioTarget);
InheritKey ik = makeInheritKeyForReferer(pc);
if (createRefPC(ik, pc) == null) return null;
pc = new PCFlowEnd(ife, pc, ioTarget);
if (makeRefPCForReferer(pc) == null) return null;
return "";
}

private String addContextForFeatureChainExpression(FeatureChainExpression fce) {
PC pc = new PCFeatureChainExpression(fce);
InheritKey ik = makeInheritKeyForReferer(pc);
createRefPC(ik, pc);
makeRefPCForReferer(pc);
return "";
}

private String addContextForFeatureReferenceExpression(FeatureReferenceExpression fre) {
Feature f = fre.getReferent();
if (f == null) return "";
PC pc = new PCFeature(fre, f, false);
InheritKey ik = makeInheritKeyForReferer(pc);
createRefPC(ik, pc);
makeRefPCForReferer(pc);
return "";
}

Expand Down Expand Up @@ -666,7 +711,7 @@ public String caseFeatureReferenceExpression(FeatureReferenceExpression fre) {

@Override
public String caseFlowEnd(FlowEnd ife) {
return addContextForItemFlowEnd(ife);
return addContextForFlowEnd(ife);
}

@Override
Expand Down