Create SVG in UI

[clamp.git] / src / main / java / org / onap / clamp / clds / util / drawing / Painter.java

diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
index af62d84..ff7d2c2 100755 (executable)
--- a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
+++ b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
@@ -79,17 +79,20 @@ public class Painter {
     private void doTheActualDrawing(String collector, Set<MicroServicePolicy> microServices,
                                     Set<OperationalPolicy> policies,
                                     ImageBuilder ib) {
-        ib.circle("start-circle", SLIM_LINE).arrow().rectangle(collector, RectTypes.COLECTOR, collector);
+        ib.circle("start-circle", SLIM_LINE).arrow().rectangle(collector, RectTypes.COLECTOR, collector, null, null);
 
         for (MicroServicePolicy ms : microServices) {
             ib.arrow().rectangle(ms.getName(),
-                    RectTypes.MICROSERVICE, ms.getPolicyModel().getPolicyAcronym());
+                    RectTypes.MICROSERVICE, ms.getPolicyModel().getPolicyAcronym(),
+                    ms.getLoopElementModel() != null ? ms.getLoopElementModel().getName() : null,
+                    ms.getLoopElementModel() != null ? ms.getLoopElementModel().getName() : null);
         }
         for (OperationalPolicy policy : policies) {
-            ib.arrow().rectangle(policy.getName(), RectTypes.POLICY, policy.getPolicyModel().getPolicyAcronym())
-                    .arrow();
+            ib.arrow().rectangle(policy.getName(), RectTypes.POLICY, policy.getPolicyModel().getPolicyAcronym(),
+                    policy.getLoopElementModel() != null ? policy.getLoopElementModel().getName() : null,
+                    policy.getLoopElementModel() != null ? policy.getLoopElementModel().getName() : null);
         }
-        ib.circle("stop-circle", THICK_LINE);
+        ib.arrow().circle("stop-circle", THICK_LINE);
     }
 
     private void adjustGraphics2DProperties() {