improve layouting

OpenTOSCA · Jan 11, 2024 · 6f5f545 · 6f5f545
1 parent 88b64e3
commit 6f5f545
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/...daptation/src/main/java/org/eclipse/winery/model/adaptation/placement/PlacementUtils.java b/...daptation/src/main/java/org/eclipse/winery/model/adaptation/placement/PlacementUtils.java
@@ -714,34 +714,17 @@ public static ServiceTemplateId completeModelBasedOnReqs(ServiceTemplateId incom
                         String targetPropertyRef = "concat('http://', " + nt.getId() + ".Properties." + suitableIPKey + ", ':', " + nt.getId() + ".Properties." + suitablePortKey + ")";
                         TPropertyMapping selfserviceProperty = new TPropertyMapping("/*/*[local-name()='selfServiceApplicationUrl']", nt, targetPropertyRef);
                         propertyMappings.add(selfserviceProperty);
-
 
-//                        properties.setSelfServiceApplicationUrl(new TSelfServiceApplicationUrl("http://www.eclipse.org/winery/model/selfservice"));
-
                         String targetPropertyRefQProv = nt.getId() + ".Properties.QProvEndpoint";
                         TPropertyMapping qprovProperty = new TPropertyMapping("/*/*[local-name()='qProvUrl']", nt, targetPropertyRefQProv);
                         propertyMappings.add(qprovProperty);
-//                        properties.setQprovUrl(new TQProvUrl("http://www.eclipse.org/winery/model/selfservice"));
 
                         TBoundaryXML boundaryXML = new TBoundaryXML();
                         boundaryXML.setNamespace("http://www.eclipse.org/winery/model/selfservice");
                         boundaryXML.setQProvUrl(new TQProvUrl("http://www.eclipse.org/winery/model/selfservice"));
                         boundaryXML.setSelfserviceApplicationUrl(new TSelfServiceApplicationUrl("http://www.eclipse.org/winery/model/selfservice"));
                         properties.setBoundaryXML(boundaryXML);
 
-
-//                        String xmlString = "<PropertiesNS><selfServiceApplicationUrl xmlns=\"http://www.eclipse.org/winery/model/selfservice\"/><qprovUrl xmlns=\"http://www.eclipse.org/winery/model/selfservice\"/></PropertiesNS>";
-//
-//                        XmlMapper xmlMapper = new XmlMapper();
-//                        PropertiesNS props = xmlMapper.readValue(xmlString, PropertiesNS.class);
-//                        props.setQprovUrl("http://www.eclipse.org/winery/model/selfservice");
-//                        props.setSelfserviceApplicationUrl("http://www.eclipse.org/winery/model/selfservice");
-//
-//                        System.out.println("selfServiceApplicationUrl: " + props.getSelfserviceApplicationUrl());
-//                        System.out.println("qprovUrl: " + props.getQprovUrl());
-//                        properties.setAny(props);
-
-
                         properties.setPropertyMappings(propertyMappings);
 
                         definitions.setProperties(properties);

diff --git a/...se.winery.repository/src/main/java/org/eclipse/winery/repository/splitting/Splitting.java b/...se.winery.repository/src/main/java/org/eclipse/winery/repository/splitting/Splitting.java
@@ -1781,6 +1781,9 @@ public TTopologyTemplate getMatchingTopology(TServiceTemplate serviceTemplate, L
         LOGGER.debug("Start...");
         if (!nodesToCheck.isEmpty()) {
             //Check all lowest level nodes with open requirements if a compatible node is available
+
+            // Counter is used for horizontally distributed positioning of new nodes
+            int newNodesAddedCounter = 0;
             for (TNodeTemplate needHostNode : nodesToCheck) {
                 Optional<String> label = ModelUtilities.getTargetLabel(needHostNode);
                 if (!label.isPresent()) {
@@ -1839,7 +1842,15 @@ public TTopologyTemplate getMatchingTopology(TServiceTemplate serviceTemplate, L
                         }
                     }
                     if (!suitableNodeTemplateAlreadyExists) {
+                        assert needHostNode.getX() != null;
+                        assert needHostNode.getY() != null;
+                        int coordinateX = Integer.parseInt(needHostNode.getX()) - newNodesAddedCounter * 350;
+                        int coordinateY = Integer.parseInt(needHostNode.getY()) + 180;
+                        selectedTemplate.setX(String.valueOf(coordinateX));
+                        selectedTemplate.setY(String.valueOf(coordinateY));
+
                         topologyToComplete.addNodeTemplate(selectedTemplate);
+                        newNodesAddedCounter += 1;
                     }
 
                     TRelationshipTemplate newHostedOnRelationship = new TRelationshipTemplate();