From c91b5e20157eb38a1f4c0fa536d1fce2309f74f8 Mon Sep 17 00:00:00 2001
From: Benjamin Davies <bentendavies@gmail.com>
Date: Sun, 27 Aug 2023 12:28:32 +1200
Subject: [PATCH] Fix diagram layout not working

---
 .../plantuml/cheneer/ChenEerDiagram.java       | 18 ++----------------
 .../command/CommandAssociateRelationship.java  |  3 ++-
 .../command/CommandCreateAttribute.java        |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/net/sourceforge/plantuml/cheneer/ChenEerDiagram.java b/src/net/sourceforge/plantuml/cheneer/ChenEerDiagram.java
index aa1e843cc..94f447d6f 100644
--- a/src/net/sourceforge/plantuml/cheneer/ChenEerDiagram.java
+++ b/src/net/sourceforge/plantuml/cheneer/ChenEerDiagram.java
@@ -34,34 +34,20 @@
  */
 package net.sourceforge.plantuml.cheneer;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
-import net.atmp.CucaDiagram;
 import net.sourceforge.plantuml.abel.Entity;
-import net.sourceforge.plantuml.core.DiagramDescription;
+import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram;
 import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.skin.UmlDiagramType;
 
-public class ChenEerDiagram extends CucaDiagram {
+public class ChenEerDiagram extends AbstractEntityDiagram {
 
 	public ChenEerDiagram(UmlSource source, Map<String, String> skinParam) {
 		super(source, UmlDiagramType.CHEN_EER, skinParam);
 	}
 
-	@Override
-	public DiagramDescription getDescription() {
-		return new DiagramDescription("(Chen EER)");
-	}
-
-	@Override
-	protected final List<String> getDotStrings() {
-		return Arrays.asList("nodesep=.20;", "ranksep=0.4;", "edge [fontsize=11,labelfontsize=11];",
-				"node [fontsize=11];");
-	}
-
 	private final Stack<Entity> ownerStack = new Stack<Entity>();
 
 	public void pushOwner(Entity group) {
diff --git a/src/net/sourceforge/plantuml/cheneer/command/CommandAssociateRelationship.java b/src/net/sourceforge/plantuml/cheneer/command/CommandAssociateRelationship.java
index 9272b0d0b..4a030d358 100644
--- a/src/net/sourceforge/plantuml/cheneer/command/CommandAssociateRelationship.java
+++ b/src/net/sourceforge/plantuml/cheneer/command/CommandAssociateRelationship.java
@@ -90,7 +90,8 @@ public class CommandAssociateRelationship extends SingleLineCommand2<ChenEerDiag
     final Link link = new Link(diagram.getEntityFactory(), diagram.getCurrentStyleBuilder(), relationship, entity,
         linkType,
         // TODO: Cardinality
-        LinkArg.build(Display.NULL, 1));
+        LinkArg.build(Display.NULL, 3));
+    link.setPortMembers(diagram.getPortId(relationship.getName()), diagram.getPortId(entity.getName()));
     diagram.addLink(link);
 
     return CommandExecutionResult.ok();
diff --git a/src/net/sourceforge/plantuml/cheneer/command/CommandCreateAttribute.java b/src/net/sourceforge/plantuml/cheneer/command/CommandCreateAttribute.java
index 9981fcf1e..206760d11 100644
--- a/src/net/sourceforge/plantuml/cheneer/command/CommandCreateAttribute.java
+++ b/src/net/sourceforge/plantuml/cheneer/command/CommandCreateAttribute.java
@@ -116,7 +116,7 @@ public class CommandCreateAttribute extends SingleLineCommand2<ChenEerDiagram> {
 
     final LinkType linkType = new LinkType(LinkDecor.NONE, LinkDecor.NONE);
     final Link link = new Link(diagram.getEntityFactory(), diagram.getCurrentStyleBuilder(), entity, owner, linkType,
-        LinkArg.build(Display.NULL, 1));
+        LinkArg.build(Display.NULL, 2));
     diagram.addLink(link);
 
     if (composite) {