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

started to re-implement actions with promises

Browse Source
This commit is contained in:
Stephan Richter
2020-10-07 00:31:38 +02:00
parent ce7d141824
commit 3dc11c18e1
12 changed files with 163 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Random;
import java.util.Vector;
import java.util.concurrent.CompletableFuture;
import org.json.JSONObject;
import org.slf4j.Logger;
@@ -331,8 +332,8 @@ public class Train implements Constants {
this.speed = v;
}
public String start() throws IOException {
if (block == null) return t("{} not in a block",this);
public CompletableFuture<String> start() throws IOException {
if (block == null) return CompletableFuture.failedFuture(new RuntimeException(t("{} not in a block",this)));
if (route != null) route.unlock().setSignals(Signal.STOP);
HashSet<Route> routes = block.routes();
Vector<Route> availableRoutes = new Vector<Route>();
@@ -351,12 +352,18 @@ public class Train implements Constants {
availableRoutes.add(rt);
}
Random rand = new Random();
if (availableRoutes.isEmpty()) return t("No free routes from {}",block);
int sel = rand.nextInt(availableRoutes.size());
route = availableRoutes.get(sel).lock(this).setSignals(null);
if (direction != route.startDirection) turn();
setSpeed(100);
return t("started {}",this);
if (availableRoutes.isEmpty()) return CompletableFuture.failedFuture(new RuntimeException(t("No free routes from {}",block)));
route = availableRoutes.get(rand.nextInt(availableRoutes.size()));
return route.lock(this).thenApply(reply -> {
try {
route.setSignals(null);
if (direction != route.startDirection) turn();
setSpeed(100);
return t("started {}",this);
} catch (Exception e) {
throw new RuntimeException(e);
}
});
}
private Object stop() {
@@ -375,7 +382,11 @@ public class Train implements Constants {
}
private void turn() throws IOException {
if (direction != null) direction = direction.inverse();
LOG.debug("train.turn()");
if (direction != null) {
direction = direction.inverse();
for (Locomotive loco : locos) loco.turn();
}
if (block != null) block.train(this);
}