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

minor improvement on autopilot

Browse Source
This commit is contained in:
Stephan Richter
2020-09-20 19:30:24 +02:00
parent 451c35c066
commit 41e05ef397
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/srsoftware/web4rail/Plan.java
View File

@@ -501,7 +501,7 @@ public class Plan {
public synchronized void stream(String data) { public synchronized void stream(String data) {
data = data.replaceAll("\n", "").replaceAll("\r", ""); data = data.replaceAll("\n", "").replaceAll("\r", "");
LOG.debug("streaming: {}",data); //LOG.debug("streaming: {}",data);
Vector<OutputStreamWriter> badClients = null; Vector<OutputStreamWriter> badClients = null;
for (Entry<OutputStreamWriter, Integer> entry : clients.entrySet()) { for (Entry<OutputStreamWriter, Integer> entry : clients.entrySet()) {
OutputStreamWriter client = entry.getKey(); OutputStreamWriter client = entry.getKey();

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

@@ -20,6 +20,7 @@ import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tiles.Block; import de.srsoftware.web4rail.tiles.Block;
import de.srsoftware.web4rail.tiles.Contact; import de.srsoftware.web4rail.tiles.Contact;
import de.srsoftware.web4rail.tiles.Signal; import de.srsoftware.web4rail.tiles.Signal;
import de.srsoftware.web4rail.tiles.Tile;
public class Train { public class Train {
@@ -27,18 +28,19 @@ public class Train {
@Override @Override
public void run() { public void run() {
try { try {
Vector<Contact> contacts = null; Vector<Tile> path = new Vector<Tile>();
while (true) { while (true) {
if (route == null) { if (route == null) {
Thread.sleep(3000);
Train.this.start(); Train.this.start();
contacts = route == null ? new Vector<Contact>() : route.contacts(); path = route == null ? new Vector<Tile>() : route.path();
} else { } else {
if (!contacts.isEmpty()) { if (!path.isEmpty()) {
Contact contact = contacts.remove(0); Tile t = path.remove(0);
contact.activate(); if (t instanceof Contact) ((Contact)t).activate();
} }
} }
Thread.sleep(1000); Thread.sleep(500);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();