diff --git a/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/SprottySiViewApplication.java b/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/SprottySiViewApplication.java index 78972a752..caab7274c 100644 --- a/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/SprottySiViewApplication.java +++ b/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/SprottySiViewApplication.java @@ -15,9 +15,7 @@ public class SprottySiViewApplication { @Bean GraphDataProvider graphDataProvider() { -// return new MockGraphData(); // return GraphDataProvider.fromClasspathResource("/sample.json"); - return GraphDataProvider.fromUrlOption("target"); } @@ -26,8 +24,8 @@ public class SprottySiViewApplication { SprottyLayoutConfigurator configurator = new SprottyLayoutConfigurator(); IPropertyHolder holder = configurator.configureByType(SIDiagramGenerator.TYPE_INTEGRATION_GRAPH); - holder.setProperty(LayeredOptions.SPACING_COMPONENT_COMPONENT, 40.0); - holder.setProperty(LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS, 40.0); + holder.setProperty(LayeredOptions.SPACING_COMPONENT_COMPONENT, 60.0); + holder.setProperty(LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS, 60.0); holder = configurator.configureByType("output-port"); holder.setProperty(LayeredOptions.PORT_SIDE, PortSide.EAST); diff --git a/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/json/SpringIntegrationGraphJson.java b/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/json/SpringIntegrationGraphJson.java index 237e0661b..f168b4c30 100644 --- a/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/json/SpringIntegrationGraphJson.java +++ b/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/json/SpringIntegrationGraphJson.java @@ -34,6 +34,7 @@ public class SpringIntegrationGraphJson extends PrettyJson { } public static SpringIntegrationGraphJson readFrom(URL resource) throws IOException { String jsonString = IOUtils.toString(resource); + System.out.println(jsonString); return new Gson().fromJson(jsonString, SpringIntegrationGraphJson.class); } } diff --git a/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/json/SpringIntegrationNodeJson.java b/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/json/SpringIntegrationNodeJson.java index 2d3d965f8..df0ebb9f5 100644 --- a/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/json/SpringIntegrationNodeJson.java +++ b/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/json/SpringIntegrationNodeJson.java @@ -1,12 +1,13 @@ package org.springframework.ide.si.view.json; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; public class SpringIntegrationNodeJson extends PrettyJson { private int nodeId; private String name; - private JsonObject stats; + private JsonElement stats; private String componentType; private JsonObject properties; @@ -22,7 +23,7 @@ public class SpringIntegrationNodeJson extends PrettyJson { public void setName(String name) { this.name = name; } - public JsonObject getStats() { + public JsonElement getStats() { return stats; } public void setStats(JsonObject stats) { diff --git a/headless-services/sprotty-si-view/src/main/resources/sample.json b/headless-services/sprotty-si-view/src/main/resources/sample.json index 0183edd87..71e16cb0c 100644 --- a/headless-services/sprotty-si-view/src/main/resources/sample.json +++ b/headless-services/sprotty-si-view/src/main/resources/sample.json @@ -283,7 +283,7 @@ "links": [ { "from": 5, - "to": 4, + "to": 8, "type": "error" }, {