diff options
| author |   Manoop Talasila <talasila@research.att.com> | 2019-07-09 15:16:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-07-09 15:16:05 +0000 |
| commit | 992fffffb3ef620466160c989c874dc8f5227536 (patch) | |
| tree | cb1c0f83db3e8ad33698803a4ae709b956cd00e4 /ecomp-sdk/epsdk-core/src/main | |
| parent | db8a8f92e922e98b77a152af0f03fde57dd1fb44 (diff) | |
| parent | aad3703c8fe9929c71f9a9465a701f56dd1cbd5a (diff) | |
Merge "Fix sonar issue in epsdk-domain"
Diffstat (limited to 'ecomp-sdk/epsdk-core/src/main')
| -rw-r--r-- | ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java index 7fdc5609..b126d822 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java @@ -580,7 +580,11 @@ public class ElementMapService { columns = computeColumns(containerElementsMap.keySet()); } - Container thisContainer = new Container(id, name, rows, columns, 1, 4, 8, 12, 1, 2); + Container thisContainer = new Container.ContainerBuilder().setId(id).setName(name) + .setNumOfRows(rows).setNumOfCols(columns).setInterEleWd(1).setInterEleH(4) + .setInterEleToContainerWd(8).setInterEleToContainerH(12) + .setInterEleToInnerContainerWd(1).setInterEleToInnerContainerH(2) + .createContainer(); thisContainer.setElements(containerElementsMap); return thisContainer; @@ -603,7 +607,11 @@ public class ElementMapService { columns = computeColumns(containerElementsMap.keySet()); } - Container thisContainer = new Container(id, name, rows, columns, 2, 6, 2, 5, 0, 0); + Container thisContainer = new Container.ContainerBuilder().setId(id).setName(name) + .setNumOfRows(rows).setNumOfCols(columns).setInterEleWd(2).setInterEleH(6) + .setInterEleToContainerWd(2).setInterEleToContainerH(5) + .setInterEleToInnerContainerWd(0).setInterEleToInnerContainerH(0) + .createContainer(); thisContainer.setElements(containerElementsMap); thisContainer.setInnerContainer(innerContainersMap); @@ -864,8 +872,13 @@ public class ElementMapService { if (domain.equalsIgnoreCase(domainName)) { String rowColumnKey = ""; - Container eachContainer = new Container(domainName + ":" + elementName, elementName, 1, 1, 3, 6, 2, - 5, 0, 0); + Container eachContainer = + new Container.ContainerBuilder().setId(domainName + ":" + elementName) + .setName(elementName).setNumOfRows(1).setNumOfCols(1) + .setInterEleWd(3).setInterEleH(6).setInterEleToContainerWd(2) + .setInterEleToContainerH(5).setInterEleToInnerContainerWd(0) + .setInterEleToInnerContainerH(0).createContainer(); + int count = 0; while (count <= 9) { if (thisContainersMap.containsKey(String.valueOf(count).concat(String.valueOf(count)))) { |