octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-06-06 18:30:52 +00:00
Code Issues Releases Wiki Activity

fix: small regression on https://github.com/plantuml/plantuml/issues/1467

Browse Source
This commit is contained in:
Arnaud Roques 2023-07-24 18:54:24 +02:00
parent f28738eb9b
commit 1b58f96369
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/sourceforge/plantuml/abel/Link.java
View File

@ -59,7 +59,6 @@ import net.sourceforge.plantuml.style.ISkinSimple;
import net.sourceforge.plantuml.style.StyleBuilder;
import net.sourceforge.plantuml.svek.Bibliotekon;
import net.sourceforge.plantuml.url.Url;
import net.sourceforge.plantuml.utils.Direction;
import net.sourceforge.plantuml.utils.LineLocation;
public class Link extends WithLinkType implements Hideable, Removeable {

25
src/net/sourceforge/plantuml/svek/SvekNode.java
View File

@ -382,23 +382,18 @@ public class SvekNode implements Positionable, Hideable {
}
public boolean isShielded() {
if (this.shield != null) {
return !this.shield.isZero();
}
// Avoid calculating "shield" size through this.shield() before finishing creation of all SvekLines (#1467)
// Avoid calculating "shield" size through this.shield() before finishing
// creation of all SvekLines (https://github.com/plantuml/plantuml/issues/1467)
// Instead, only check if we will have a shield (size is irrelevant here)
// This node will have a shield if it is target of a qualified association (will have a qualifier label
// This node will have a shield if it is target of a qualified association (will
// have a qualifier label
// placed besides this type's bounding box.)
for (Link link: this.leaf.getDiagram().getLinks()) {
if (link.getEntity1() == this.leaf || link.getEntity2() == this.leaf) {
if ((this.leaf == link.getEntity1() && link.hasKal1())
|| (this.leaf == link.getEntity2() && link.hasKal2())) {
return true;
}
}
}
return false;
for (Link link : this.leaf.getDiagram().getLinks())
if ((this.leaf == link.getEntity1() && link.hasKal1())
|| (this.leaf == link.getEntity2() && link.hasKal2()))
return true;
return shield().isZero() == false;
}
public void resetMoveSvek() {