diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-04 08:22:43 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-04 08:24:16 -0400 |
| commit | 4031c6ae9074f898e768cbf5ccb5158a59a7072a (patch) | |
| tree | 1aa2ff6ce771d6f605f8d4e89db18240623545f2 /ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support | |
| parent | 3a2b5c60384feb490e878020bdb9c01f514d7856 (diff) | |
Repair redirect; correct javadoc site path
[PORTAL-53] Correct path for deployment of javadoc web site
[PORTAL-78] Prevent SDJ from redirecting multiples times during single signon
[St164634] Tone down the logging when communicating with the Partnering Applications
Add missing license headers; drop FusionLicenseImpl.
Issue: PORTAL-53 PORTAL-78
Change-Id: I3f8200d8e41754ade05e3f7b38d0db6bdd5e59e8
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support')
| -rw-r--r-- | ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Domain.java | 12 | ||||
| -rw-r--r-- | ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Domain.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Domain.java index 2ef50419..afd4f589 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Domain.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Domain.java @@ -201,22 +201,12 @@ public class Domain { if (containerRowCol != null && containerRowCol.containsKey(String.valueOf(i) + String.valueOf(j))) { Container c = containerRowCol.get(String.valueOf(i) + String.valueOf(j)); Position p = new Position(); - if (this.getName().equals("VNI")) { - p.x = j * (interContWd - 2) + xsum + domainToLayoutWd; - } else - p.x = j * interContWd + xsum + domainToLayoutWd; + p.x = j * interContWd + xsum + domainToLayoutWd; double ysum = 0; for (int k = 0; k < i; k++) { if (containerRowCol.containsKey(String.valueOf(k) + String.valueOf(j))) ysum += containerRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize() .getHeight(); - - else if (j > 0 && containerRowCol.containsKey(String.valueOf(k) + String.valueOf(j - 1)) - && !containerRowCol.get(String.valueOf(i) + String.valueOf(j)).getName() - .equals("AIC - Alpharetta")) { - ysum += containerRowCol.get(String.valueOf(k) + String.valueOf(j - 1)).computeSize() - .getHeight(); - } } p.y = domainToLayoutH + ysum + this.computeSize().getHeight() + domainToContH + i * interContH; c.setP(p); diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java index 09c8372d..c729eef4 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java @@ -631,8 +631,6 @@ public class Layout { else newX = domainstoUpd.get(i).getP().getX() + 38; - if (d.getName().equals("Datacenter with AIC")) - newX += 5; d.setDomainToLayoutWd(newX); d.computeConatinerPositions(); |