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

- implemented tags on trains and cars

Browse Source 
- added condition TrainHasTag
This commit is contained in:
Stephan Richter
2020-11-01 18:37:59 +01:00
parent d40ea949be
commit 0decce654d
8 changed files with 115 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/de/srsoftware/web4rail/moving/Car.java
View File

@@ -7,7 +7,9 @@ import java.io.FileWriter;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map.Entry;
import java.util.TreeSet;
import org.json.JSONObject;
import org.slf4j.Logger;
@@ -32,6 +34,8 @@ public class Car implements Constants {
public static final String NAME = "name";
private static final String LENGTH = "length";
private static final String STOCK_ID = "stock-id";
private static final String TAGS = "tags";
protected HashSet<String> tags = new HashSet<String>();
private String id;
private String name;
@@ -94,6 +98,7 @@ public class Car implements Constants {
json.put(NAME, name);
json.put(LENGTH, length);
json.put(STOCK_ID, stockId);
if (!tags.isEmpty()) json.put(TAGS, tags);
return json;
}
@@ -121,6 +126,7 @@ public class Car implements Constants {
if (json.has(ID)) id = json.getString(ID);
if (json.has(LENGTH)) length = json.getInt(LENGTH);
if (json.has(STOCK_ID)) stockId = json.getString(STOCK_ID);
if (json.has(TAGS)) json.getJSONArray(TAGS).forEach(elem -> { tags.add(elem.toString()); });
return this;
}
@@ -139,9 +145,10 @@ public class Car implements Constants {
new Input(REALM,REALM_CAR).hideIn(form);
new Input(ID,id()).hideIn(form);
Fieldset fieldset = new Fieldset("Basic properties");
new Input(NAME,name).addTo(new Label(t("Name"))).addTo(fieldset);
new Input(STOCK_ID,stockId).addTo(new Label(t("Stock ID"))).addTo(fieldset);
new Input(LENGTH,length).attr("type", "number").addTo(new Label(t("Length"))).addTo(fieldset);
new Input(NAME,name).addTo(new Label(t("Name")+NBSP)).addTo(fieldset);
new Input(STOCK_ID,stockId).addTo(new Label(t("Stock ID")+NBSP)).addTo(fieldset);
new Input(LENGTH,length).attr("type", "number").addTo(new Label(t("Length")+NBSP)).addTo(fieldset);
new Input(TAGS,String.join(", ", tags)).addTo(new Label(t("Tags")+NBSP)).addTo(fieldset);
fieldset.addTo(form);
return form;
}
@@ -181,6 +188,10 @@ public class Car implements Constants {
return Translation.get(Application.class, txt, fills);
}
public TreeSet<String> tags() {
return new TreeSet<String>(tags);
}
@Override
public String toString() {
return getClass().getSimpleName()+"("+name()+")";
@@ -194,6 +205,14 @@ public class Car implements Constants {
if (params.containsKey(NAME)) name = params.get(NAME);
if (params.containsKey(STOCK_ID)) stockId = params.get(STOCK_ID);
if (params.containsKey(LENGTH)) length = Integer.parseInt(params.get(LENGTH));
if (params.containsKey(TAGS)) {
String[] parts = params.get(TAGS).replace(",", " ").split(" ");
tags.clear();
for (String tag : parts) {
tag = tag.trim();
if (!tag.isEmpty()) tags.add(tag);
}
}
return this;
}
}

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

@@ -11,6 +11,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.Vector;
import org.json.JSONObject;
@@ -62,6 +64,10 @@ public class Train implements Constants {
private static final String LOCOS = "locomotives";
private Vector<Locomotive> locos = new Vector<Locomotive>();
private static final String TAGS = "tags";
private HashSet<String> tags = new HashSet<String>();
private Block block = null;
@@ -208,6 +214,7 @@ public class Train implements Constants {
Vector<String> carIds = new Vector<String>();
for (Car car : cars) carIds.add(car.id());
json.put(CARS,carIds);
if (!tags.isEmpty()) json.put(TAGS, tags);
return json;
}
@@ -247,6 +254,7 @@ public class Train implements Constants {
if (json.has(NAME)) name = json.getString(NAME);
for (Object id : json.getJSONArray(CARS)) add(Car.get((String)id));
for (Object id : json.getJSONArray(LOCOS)) add((Locomotive) Car.get((String)id));
if (json.has(TAGS)) json.getJSONArray(TAGS).forEach(elem -> { tags.add(elem.toString()); });
return this;
}
@@ -336,6 +344,7 @@ public class Train implements Constants {
new Input(ID,id).hideIn(form);
new Input(NAME,name).addTo(form);
new Checkbox(PUSH_PULL, t("Push-pull train"), pushPull).addTo(form);
new Input(TAGS,String.join(", ", tags)).addTo(new Label(t("Tags")+NBSP)).addTo(form);
new Button(t("Apply")).addTo(form).addTo(fieldset);
new Button(t("Turn"), "train("+id+",'"+ACTION_TURN+"')").addTo(fieldset).addTo(window);
@@ -363,11 +372,21 @@ public class Train implements Constants {
}
if (direction != null) new Tag("li").content(t("Direction: heading {}",direction)).addTo(propList);
Tag tagList = new Tag("ul");
for (String tag : tags()) new Tag("li").content(tag).addTo(tagList);
tagList.addTo(new Tag("li").content(t("Tags"))).addTo(propList);
propList.addTo(fieldset).addTo(window);
return window;
}
public SortedSet<String> tags() {
TreeSet<String> list = new TreeSet<String>(tags);
for (Locomotive loco : locos) list.addAll(loco.tags());
for (Car car:cars) list.addAll(car.tags());
return list;
}
public Object quitAutopilot() {
if (autopilot != null) {
autopilot.stop = true;
@@ -484,6 +503,15 @@ public class Train implements Constants {
LOG.debug("update({})",params);
pushPull = params.containsKey(PUSH_PULL) && params.get(PUSH_PULL).equals("on");
if (params.containsKey(NAME)) name = params.get(NAME);
if (params.containsKey(TAGS)) {
String[] parts = params.get(TAGS).replace(",", " ").split(" ");
tags.clear();
for (String tag : parts) {
tag = tag.trim();
if (!tag.isEmpty()) tags.add(tag);
}
}
return this;
}
}