Create SVG in UI

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

diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/ImageBuilder.java b/src/main/java/org/onap/clamp/clds/util/drawing/ImageBuilder.java
index 4b887e4..72df90f 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/util/drawing/ImageBuilder.java
+++ b/src/main/java/org/onap/clamp/clds/util/drawing/ImageBuilder.java
@@ -49,7 +49,7 @@ public class ImageBuilder {
     private static final int CIRCLE_RADIUS = 17;
 
     ImageBuilder(SVGGraphics2D svgGraphics2D, DocumentBuilder documentBuilder, Point startingPoint, int baseLength,
-            int rectHeight) {
+                 int rectHeight) {
         this.g2d = svgGraphics2D;
         this.documentBuilder = documentBuilder;
         this.currentPoint = new Point(startingPoint);
@@ -57,13 +57,13 @@ public class ImageBuilder {
         this.rectHeight = rectHeight;
     }
 
-    ImageBuilder rectangle(String dataElementId, RectTypes rectType, String text) {
+    ImageBuilder rectangle(String dataElementId, RectTypes rectType, String boxText, String groupingId, String uiData) {
         Point next = new Point(currentPoint.x + baseLength, currentPoint.y);
         Point point = coordinatesForRectangle(currentPoint, next);
 
-        handleBasedOnRectType(rectType, text, point, baseLength, rectHeight);
+        handleBasedOnRectType(rectType, boxText, point, baseLength, rectHeight);
 
-        documentBuilder.pushChangestoDocument(g2d, dataElementId);
+        documentBuilder.pushChangestoDocument(g2d, dataElementId, groupingId, uiData);
         currentPoint = next;
         return this;
     }
@@ -78,8 +78,8 @@ public class ImageBuilder {
     }
 
     ImageBuilder circle(String dataElementId, int lineThickness) {
-        Shape circleStart = new Ellipse2D.Double(currentPoint.x, currentPoint.y - CIRCLE_RADIUS, 2 * CIRCLE_RADIUS,
-                2 * CIRCLE_RADIUS);
+        Shape circleStart = new Ellipse2D.Double(currentPoint.x, ((double) currentPoint.y) - CIRCLE_RADIUS,
+                2.0 * CIRCLE_RADIUS, 2.0 * CIRCLE_RADIUS);
 
         Stroke oldStroke = g2d.getStroke();
         g2d.setStroke(new BasicStroke(lineThickness));