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

improved GUI

Browse Source
This commit is contained in:
Stephan Richter
2022-02-26 14:41:36 +01:00
parent 60785e89ce
commit 2eee5083aa
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>1.5.40</version> <version>1.5.41</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

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

@@ -237,8 +237,8 @@ public class Train extends BaseClass implements Comparable<Train> {
private Tag carList() { private Tag carList() {
Tag locoProp = new Tag("li").content(t("Locomotives and cars")+":"); Tag locoProp = new Tag("li").content(t("Locomotives and cars")+":");
Table carList = new Table(); Table carList = new Table();
carList.addHead(t("Car"),t("Actions")); carList.addHead(t("Index"),t("Car"),t("Actions"));
int index = 0;
boolean first = true; boolean first = true;
for (Car car : cars) { for (Car car : cars) {
Tag link = car.link(car.name()+(car.needsMaintenance()?"⚠":"")+(car.stockId.isEmpty() ? "" : " ("+car.stockId+")")); Tag link = car.link(car.name()+(car.needsMaintenance()?"⚠":"")+(car.stockId.isEmpty() ? "" : " ("+car.stockId+")"));
@@ -250,7 +250,7 @@ public class Train extends BaseClass implements Comparable<Train> {
car.button(t("decouple"),Map.of(ACTION,ACTION_DECOUPLE,REALM,REALM_CAR)).addTo(buttons); car.button(t("decouple"),Map.of(ACTION,ACTION_DECOUPLE,REALM,REALM_CAR)).addTo(buttons);
} }
button(t("delete"),Map.of(ACTION,ACTION_DROP,CAR_ID,car.id().toString())).addTo(buttons); button(t("delete"),Map.of(ACTION,ACTION_DROP,CAR_ID,car.id().toString())).addTo(buttons);
carList.addRow(link,buttons); carList.addRow(++index,link,buttons);
first = false; first = false;
} }
carList.addTo(locoProp); carList.addTo(locoProp);
@@ -264,7 +264,7 @@ public class Train extends BaseClass implements Comparable<Train> {
for (Car loco : locos) select.addOption(loco.id(), loco+(loco.stockId.isEmpty()?"":" ("+loco.stockId+")")); for (Car loco : locos) select.addOption(loco.id(), loco+(loco.stockId.isEmpty()?"":" ("+loco.stockId+")"));
select.addTo(addLocoForm); select.addTo(addLocoForm);
new Button(t("add"),addLocoForm).addTo(addLocoForm); new Button(t("add"),addLocoForm).addTo(addLocoForm);
carList.addRow(t("add locomotive"),addLocoForm); carList.addRow("",t("add locomotive"),addLocoForm);
} }
List<Car> cars = BaseClass.listElements(Car.class).stream().filter(car -> !(car instanceof Locomotive)).filter(loco -> isNull(loco.train())).collect(Collectors.toList()); List<Car> cars = BaseClass.listElements(Car.class).stream().filter(car -> !(car instanceof Locomotive)).filter(loco -> isNull(loco.train())).collect(Collectors.toList());
@@ -285,9 +285,10 @@ public class Train extends BaseClass implements Comparable<Train> {
} }
select.addTo(addCarForm); select.addTo(addCarForm);
new Button(t("add"),addCarForm).addTo(addCarForm); new Button(t("add"),addCarForm).addTo(addCarForm);
carList.addRow(t("add car"),addCarForm); carList.addRow("",t("add car"),addCarForm);
} }
if (isSet(currentBlock)) { if (isSet(currentBlock)) {
boolean trainsPresent = false;
Tag ul = new Tag("ul"); Tag ul = new Tag("ul");
Train trainInBlock = isSet(currentBlock) ? currentBlock.occupyingTrain() : null; Train trainInBlock = isSet(currentBlock) ? currentBlock.occupyingTrain() : null;
if (isSet(trainInBlock) && trainInBlock != this) trainInBlock.link().addTo(new Tag("li")).addTo(ul); if (isSet(trainInBlock) && trainInBlock != this) trainInBlock.link().addTo(new Tag("li")).addTo(ul);
@@ -296,8 +297,9 @@ public class Train extends BaseClass implements Comparable<Train> {
Tag li = new Tag("li").addTo(ul); Tag li = new Tag("li").addTo(ul);
tr.link().addTo(li); tr.link().addTo(li);
button(t("couple"),Map.of(ACTION,ACTION_CONNECT,REALM_TRAIN,tr.id().toString())).addTo(li); button(t("couple"),Map.of(ACTION,ACTION_CONNECT,REALM_TRAIN,tr.id().toString())).addTo(li);
trainsPresent = true;
} }
carList.addRow(t("other trains in {}",currentBlock),ul); if (trainsPresent) carList.addRow("",t("other trains in {}",currentBlock),ul);
} }