Commit aa7ca633 authored by Jakob Schöttl's avatar Jakob Schöttl
Browse files

Rename variables

parent db53a37f
...@@ -260,14 +260,14 @@ public abstract class JsonConverter { ...@@ -260,14 +260,14 @@ public abstract class JsonConverter {
public static ScenarioRunManager deserializeScenarioRunManagerFromNode(JsonNode node) throws IOException { public static ScenarioRunManager deserializeScenarioRunManagerFromNode(JsonNode node) throws IOException {
JsonNode rootNode = node; JsonNode rootNode = node;
String name = rootNode.get("name").asText(); String name = rootNode.get("name").asText();
JsonNode vadereNode = rootNode.get(SCENARIO_KEY); JsonNode scenarioNode = rootNode.get(SCENARIO_KEY);
AttributesSimulation as = deserializeAttributesSimulationFromNode(vadereNode.get("attributesSimulation")); AttributesSimulation attributesSimulation = deserializeAttributesSimulationFromNode(scenarioNode.get("attributesSimulation"));
JsonNode attributesModelNode = vadereNode.get("attributesModel"); JsonNode attributesModelNode = scenarioNode.get("attributesModel");
String mainModel = vadereNode.get(MAIN_MODEL_KEY).isNull() ? null : vadereNode.get(MAIN_MODEL_KEY).asText(); String mainModel = scenarioNode.get(MAIN_MODEL_KEY).isNull() ? null : scenarioNode.get(MAIN_MODEL_KEY).asText();
List<Attributes> am = deserializeAttributesListFromNode(attributesModelNode); List<Attributes> attributesModel = deserializeAttributesListFromNode(attributesModelNode);
Topography to = deserializeTopographyFromNode(vadereNode.get("topography")); Topography topography = deserializeTopographyFromNode(scenarioNode.get("topography"));
String description = rootNode.get("description").asText(); String description = rootNode.get("description").asText();
ScenarioStore scenarioStore = new ScenarioStore(name, description, mainModel, am, as, to); ScenarioStore scenarioStore = new ScenarioStore(name, description, mainModel, attributesModel, attributesSimulation, topography);
ScenarioRunManager scenarioRunManager = new ScenarioRunManager(scenarioStore); ScenarioRunManager scenarioRunManager = new ScenarioRunManager(scenarioStore);
scenarioRunManager.setDataProcessingJsonManager(DataProcessingJsonManager.deserializeFromNode(rootNode.get(DataProcessingJsonManager.DATAPROCCESSING_KEY))); scenarioRunManager.setDataProcessingJsonManager(DataProcessingJsonManager.deserializeFromNode(rootNode.get(DataProcessingJsonManager.DATAPROCCESSING_KEY)));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment