StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

simplified code

Browse Source
This commit is contained in:
Stephan Richter
2020-12-01 21:07:39 +01:00
parent 2e5bcf592a
commit b7effda44f
4 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -15,6 +15,7 @@ import java.util.Map.Entry;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.Vector;
import java.util.stream.Collectors;
import org.json.JSONObject;
import org.slf4j.Logger;
@@ -338,18 +339,10 @@ public class Train extends BaseClass implements Comparable<Train> {
if (isSet(name))json.put(NAME, name);
if (isSet(route)) json.put(ROUTE, route.id());
if (isSet(direction)) json.put(DIRECTION, direction);
Vector<String> locoIds = new Vector<String>();
for (Locomotive loco : locos) locoIds.add(loco.id().toString());
json.put(LOCOS, locoIds);
Vector<String> carIds = new Vector<String>();
for (Car car : cars) carIds.add(car.id().toString());
json.put(CARS,carIds);
Vector<String> tileIds = new Vector<String>();
for (Tile tile : trace) tileIds.add(tile.id().toString());
json.put(TRACE, tileIds);
json.put(LOCOS, locos.stream().map(l -> l.id().toString()).collect(Collectors.toList()));
json.put(CARS,cars.stream().map(c -> c.id().toString()).collect(Collectors.toList()));
json.put(TRACE, trace.stream().map(t -> t.id().toString()).collect(Collectors.toList()));
if (!tags.isEmpty()) json.put(TAGS, tags);
return json;