(causeway) branch master updated: CAUSEWAY-3404: minor notes on prev. commit

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new 0a63dff8f2 CAUSEWAY-3404: minor notes on prev. commit
0a63dff8f2 is described below

commit 0a63dff8f2375bd1f1135b62d8bae23deca12bd5
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri Jan 19 08:02:09 2024 +0100

    CAUSEWAY-3404: minor notes on prev. commit
---
 .../asciidoc/builder/objgraph/d3js/ObjectGraphRendererD3js.java      | 2 +-
 .../builder/objgraph/plantuml/ObjectGraphRendererPlantuml.java       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/d3js/ObjectGraphRendererD3js.java
 
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/d3js/ObjectGraphRendererD3js.java
index d285f5deae..6e3438775f 100644
--- 
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/d3js/ObjectGraphRendererD3js.java
+++ 
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/d3js/ObjectGraphRendererD3js.java
@@ -102,7 +102,7 @@ public class ObjectGraphRendererD3js implements 
ObjectGraph.Renderer {
         objGraph.relations().forEach(rel->{
             val source = objectLookup.get(rel.from());
             val target = objectLookup.get(rel.to());
-            d3jsGraph.links.add(new D3jsGraph.Link(source, target, 
rel.multiplicityNotation().apply(rel.description())));
+            d3jsGraph.links.add(new D3jsGraph.Link(source, target, 
rel.descriptionFormatted()));
         });
 
         renderSvg(sb, d3jsGraph);
diff --git 
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/plantuml/ObjectGraphRendererPlantuml.java
 
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/plantuml/ObjectGraphRendererPlantuml.java
index b1c60e0e37..a41cd7bbe4 100644
--- 
a/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/plantuml/ObjectGraphRendererPlantuml.java
+++ 
b/valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/plantuml/ObjectGraphRendererPlantuml.java
@@ -78,10 +78,11 @@ public class ObjectGraphRendererPlantuml implements 
ObjectGraph.Renderer {
         case ONE_TO_ONE:
         case ONE_TO_MANY:
         case MERGED_ASSOCIATIONS:
-            return String.format("%s -> \"%s\" %s", rel.fromId(), 
rel.description(), rel.toId());
+            return String.format("%s -> \"%s\" %s",
+                    rel.fromId(), rel.descriptionFormatted() /*NOTE: format 
has no effect if merged*/, rel.toId());
         case BIDIR_ASSOCIATION:
             return String.format("%s \"%s\" -- \"%s\" %s : %s",
-                    rel.fromId(), rel.nearLabel(), rel.farLabel(), rel.toId(), 
rel.description());
+                    rel.fromId(), rel.nearLabel(), rel.farLabel(), rel.toId(), 
rel.description() /*NOTE: already formated*/);
         case INHERITANCE:
             return String.format("%s --|> %s", rel.fromId(), rel.toId());
         }