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

slight improvement in car and loco manager

Browse Source
This commit is contained in:
Stephan Richter
2020-11-14 15:04:04 +01:00
parent f8ebe97cce
commit 7fc5a3a0e3
4 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
public class Car extends BaseClass {
public class Car extends BaseClass implements Comparable<Car>{
protected static final Logger LOG = LoggerFactory.getLogger(Car.class);
static HashMap<Integer,Car> cars = new HashMap<Integer, Car>();
@@ -77,29 +77,6 @@ public class Car extends BaseClass {
if (car instanceof Locomotive) return Locomotive.action(params,plan);
return t("Unknown action: {}",params.get(ACTION));
}
public static Object manager() {
Window win = new Window("car-manager", t("Car manager"));
new Tag("h4").content(t("known cars")).addTo(win);
Tag list = new Tag("ul");
for (Car car : cars.values()) {
if (!(car instanceof Locomotive)) {
Tag tag = car.link("li");
if (isSet(car.stockId) && !car.stockId.isEmpty()) tag.content(NBSP+t("(id: {}, length: {})",car.stockId,car.length));
tag.addTo(list);
}
}
list.addTo(win);
Form form = new Form();
new Input(ACTION, ACTION_ADD).hideIn(form);
new Input(REALM,REALM_CAR).hideIn(form);
Fieldset fieldset = new Fieldset(t("add new car"));
new Input(Locomotive.NAME, t("new car")).addTo(new Label(t("Name:")+NBSP)).addTo(fieldset);
new Button(t("Apply")).addTo(fieldset);
fieldset.addTo(form).addTo(win);
return win;
}
protected Tag cockpit() {
return null;
@@ -160,6 +137,29 @@ public class Car extends BaseClass {
return this;
}
public static Object manager() {
Window win = new Window("car-manager", t("Car manager"));
new Tag("h4").content(t("known cars")).addTo(win);
Tag list = new Tag("ul");
for (Car car : new TreeSet<Car>(cars.values())) {
if (!(car instanceof Locomotive)) {
Tag tag = car.link("li");
if (isSet(car.stockId) && !car.stockId.isEmpty()) tag.content(NBSP+t("(id: {}, length: {})",car.stockId,car.length));
tag.addTo(list);
}
}
list.addTo(win);
Form form = new Form();
new Input(ACTION, ACTION_ADD).hideIn(form);
new Input(REALM,REALM_CAR).hideIn(form);
Fieldset fieldset = new Fieldset(t("add new car"));
new Input(Locomotive.NAME, t("new car")).addTo(new Label(t("Name:")+NBSP)).addTo(fieldset);
new Button(t("Apply")).addTo(fieldset);
fieldset.addTo(form).addTo(win);
return win;
}
String name(){
return name;
}
@@ -246,4 +246,9 @@ public class Car extends BaseClass {
}
return this;
}
@Override
public int compareTo(Car o) {
return (stockId+":"+name).compareTo(o.stockId+":"+o.name);
}
}

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

@@ -2,6 +2,7 @@ package de.srsoftware.web4rail.moving;
import java.io.IOException;
import java.util.HashMap;
import java.util.TreeSet;
import java.util.Vector;
import org.json.JSONObject;
@@ -201,7 +202,7 @@ public class Locomotive extends Car implements Constants,Device{
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()) {
for (Car car : new TreeSet<Car>(cars.values())) {
if (car instanceof Locomotive) {
Locomotive loco = (Locomotive) car;
Tag tag = loco.link("li");