Browse Source

re-connected loco actions

lookup-tables
Stephan Richter 5 years ago
parent
commit
dc4d4aebd4
  1. 2
      pom.xml
  2. 9
      src/main/java/de/srsoftware/web4rail/moving/Car.java
  3. 2
      src/main/java/de/srsoftware/web4rail/moving/Locomotive.java

2
pom.xml

@ -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>0.6.5</version> <version>0.6.6</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>

9
src/main/java/de/srsoftware/web4rail/moving/Car.java

@ -58,13 +58,14 @@ public class Car implements Constants {
public static Object action(HashMap<String, String> params) throws IOException { public static Object action(HashMap<String, String> params) throws IOException {
Car car = Car.get(params.get(Car.ID)); Car car = Car.get(params.get(Car.ID));
if (car == null) return t("No car with id {} found!",params.get(Car.ID)); if (car == null) return t("No car with id {} found!",params.get(Car.ID));
switch (params.get(ACTION)) { switch (params.get(ACTION)) {
case ACTION_UPDATE:
return car.update(params);
case ACTION_PROPS: case ACTION_PROPS:
return car.properties(); return car.properties();
} case ACTION_UPDATE:
return car.update(params);
}
if (car instanceof Locomotive) return Locomotive.action(params);
return t("Unknown action: {}",params.get(ACTION)); return t("Unknown action: {}",params.get(ACTION));
} }

2
src/main/java/de/srsoftware/web4rail/moving/Locomotive.java

@ -54,7 +54,7 @@ public class Locomotive extends Car implements Constants,Device{
return loco.turn(); return loco.turn();
} }
return Car.action(params); return t("Unknown action: {}",params.get(ACTION));
} }
protected Tag cockpit(String realm) { protected Tag cockpit(String realm) {

Loading…
Cancel
Save