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

preparing menus for editing cars and trains

Browse Source
This commit is contained in:
Stephan Richter
2020-09-21 19:12:33 +02:00
parent fa58c33938
commit 7acbf567e8
7 changed files with 85 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,10 +11,15 @@ import java.util.Map.Entry;
import org.json.JSONObject;
import de.keawe.tools.translations.Translation;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Application;
public class Car {
private static final String ID = "id";
private static final String NAME = "name";
private static final String LENGTH = "length";
private static final String SHOW = "show";
static HashMap<String,Car> cars = new HashMap<String, Car>();
public int length;
private String name;
@@ -37,9 +42,8 @@ public class Car {
}
public static Car get(String nameOrId) {
HashMap<String, Car> cs = cars;
Car car = cars.get(nameOrId);
if (car == null) {
Car car = cars.get(nameOrId); // try to get by id
if (car == null) { // try to get by name
for (Car c : cars.values()) {
if (c.name.equals(nameOrId)) car = c;
}
@@ -59,6 +63,10 @@ public class Car {
json.put(LENGTH, length);
return json;
}
public Tag link(String tagClass) {
return new Tag(tagClass).clazz("link").attr("onclick","car("+id+",'"+Car.SHOW+"')").content(name());
}
String name(){
return name;
@@ -93,4 +101,8 @@ public class Car {
}
file.close();
}
protected static String t(String txt, Object...fills) {
return Translation.get(Application.class, txt, fills);
}
}

18
src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
View File

@@ -2,6 +2,9 @@ package de.srsoftware.web4rail.moving;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Window;
public class Locomotive extends Car {
private static final String REVERSE = "reverse";
@@ -30,8 +33,23 @@ public class Locomotive extends Car {
super.load(json);
if (json.has(REVERSE)) reverse = json.getBoolean(REVERSE);
}
public void setSpeed(int v) {
// TODO Auto-generated method stub
}
public static Object manager() {
Window win = new Window("loco-manager", t("Locomotive manager"));
new Tag("h4").content(t("known locomotives")).addTo(win);
Tag list = new Tag("ul");
for (Car car : cars.values()) {
if (car instanceof Locomotive) {
Locomotive loco = (Locomotive) car;
loco.link("li").addTo(list);
}
}
list.addTo(win);
return win;
}
}

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

@@ -107,24 +107,6 @@ public class Train {
trains.put(id, this);
}
private JSONObject json() {
JSONObject json = new JSONObject();
json.put(ID, id);
json.put(NAME,name);
if (route != null) json.put(ROUTE, route.id());
if (direction != null) json.put(DIRECTION, direction);
json.put(PUSH_PULL, pushPull);
Vector<String> locoIds = new Vector<String>();
for (Locomotive loco : locos) locoIds.add(loco.id());
json.put(LOCOS, locoIds);
Vector<String> carIds = new Vector<String>();
for (Car car : cars) carIds.add(car.id());
json.put(CARS,carIds);
return json;
}
public static Object action(HashMap<String, String> params) throws IOException {
if (!params.containsKey(Train.ID)) return t("No train id passed!");
long id = Long.parseLong(params.get(Train.ID));
@@ -176,6 +158,22 @@ public class Train {
public Train heading(Direction dir) {
direction = dir;
return this;
}
private JSONObject json() {
JSONObject json = new JSONObject();
json.put(ID, id);
json.put(NAME,name);
if (route != null) json.put(ROUTE, route.id());
if (direction != null) json.put(DIRECTION, direction);
json.put(PUSH_PULL, pushPull);
Vector<String> locoIds = new Vector<String>();
for (Locomotive loco : locos) locoIds.add(loco.id());
json.put(LOCOS, locoIds);
Vector<String> carIds = new Vector<String>();
for (Car car : cars) carIds.add(car.id());
json.put(CARS,carIds);
return json;
}
public int length() {
@@ -185,6 +183,10 @@ public class Train {
return result;
}
public Tag link(String tagClass) {
return new Tag(tagClass).clazz("link").attr("onclick","train("+id+",'"+Train.MODE_SHOW+"')").content(name());
}
public static void loadAll(String filename) throws IOException {
BufferedReader file = new BufferedReader(new FileReader(filename));
String line = file.readLine();
@@ -206,6 +208,17 @@ public class Train {
for (Object id : json.getJSONArray(LOCOS)) add((Locomotive) Car.get((String)id));
for (Object id : json.getJSONArray(CARS)) add(Car.get((String)id));
}
public static Object manager() {
Window win = new Window("train-manager", t("Train manager"));
new Tag("h4").content(t("known trains")).addTo(win);
Tag list = new Tag("ul");
for (Train train : trains.values()) {
train.link("li").addTo(list);
}
list.addTo(win);
return win;
}
public String name() {
String result = (name != null ? name : locos.firstElement().name());
@@ -242,13 +255,14 @@ public class Train {
new Tag("li").content(t("Current location: {}",block)).addTo(list);
new Tag("li").content(t("Direction: heading {}",direction)).addTo(list);
new Tag("li").clazz("link").attr("onclick","train("+id+",'"+MODE_START+"')").content(t("start")).addTo(list).addTo(window);
new Tag("li").clazz("link").attr("onclick","train("+id+",'"+MODE_START+"')").content(t("start")).addTo(list);
if (autopilot == null) {
new Tag("li").clazz("link").attr("onclick","train("+id+",'"+MODE_AUTO+"')").content(t("auto")).addTo(list).addTo(window);
new Tag("li").clazz("link").attr("onclick","train("+id+",'"+MODE_AUTO+"')").content(t("auto")).addTo(list);
} else {
new Tag("li").clazz("link").attr("onclick","train("+id+",'"+MODE_STOP+"')").content(t("stop")).addTo(list).addTo(window);
new Tag("li").clazz("link").attr("onclick","train("+id+",'"+MODE_STOP+"')").content(t("stop")).addTo(list);
}
list.addTo(window);
return window;
}