Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
aa7ca633
Commit
aa7ca633
authored
Sep 23, 2016
by
Jakob Schöttl
Browse files
Rename variables
parent
db53a37f
Changes
1
Show whitespace changes
Inline
Side-by-side
VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java
View file @
aa7ca633
...
...
@@ -260,14 +260,14 @@ public abstract class JsonConverter {
public
static
ScenarioRunManager
deserializeScenarioRunManagerFromNode
(
JsonNode
node
)
throws
IOException
{
JsonNode
rootNode
=
node
;
String
name
=
rootNode
.
get
(
"name"
).
asText
();
JsonNode
vadere
Node
=
rootNode
.
get
(
SCENARIO_KEY
);
AttributesSimulation
a
s
=
deserializeAttributesSimulationFromNode
(
vadere
Node
.
get
(
"attributesSimulation"
));
JsonNode
attributesModelNode
=
vadere
Node
.
get
(
"attributesModel"
);
String
mainModel
=
vadere
Node
.
get
(
MAIN_MODEL_KEY
).
isNull
()
?
null
:
vadere
Node
.
get
(
MAIN_MODEL_KEY
).
asText
();
List
<
Attributes
>
a
m
=
deserializeAttributesListFromNode
(
attributesModelNode
);
Topography
to
=
deserializeTopographyFromNode
(
vadere
Node
.
get
(
"topography"
));
JsonNode
scenario
Node
=
rootNode
.
get
(
SCENARIO_KEY
);
AttributesSimulation
a
ttributesSimulation
=
deserializeAttributesSimulationFromNode
(
scenario
Node
.
get
(
"attributesSimulation"
));
JsonNode
attributesModelNode
=
scenario
Node
.
get
(
"attributesModel"
);
String
mainModel
=
scenario
Node
.
get
(
MAIN_MODEL_KEY
).
isNull
()
?
null
:
scenario
Node
.
get
(
MAIN_MODEL_KEY
).
asText
();
List
<
Attributes
>
a
ttributesModel
=
deserializeAttributesListFromNode
(
attributesModelNode
);
Topography
to
pography
=
deserializeTopographyFromNode
(
scenario
Node
.
get
(
"topography"
));
String
description
=
rootNode
.
get
(
"description"
).
asText
();
ScenarioStore
scenarioStore
=
new
ScenarioStore
(
name
,
description
,
mainModel
,
a
m
,
as
,
to
);
ScenarioStore
scenarioStore
=
new
ScenarioStore
(
name
,
description
,
mainModel
,
a
ttributesModel
,
attributesSimulation
,
topography
);
ScenarioRunManager
scenarioRunManager
=
new
ScenarioRunManager
(
scenarioStore
);
scenarioRunManager
.
setDataProcessingJsonManager
(
DataProcessingJsonManager
.
deserializeFromNode
(
rootNode
.
get
(
DataProcessingJsonManager
.
DATAPROCCESSING_KEY
)));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment