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

made route names persistent during route discovery

Browse Source
This commit is contained in:
Stephan Richter
2020-09-17 00:00:46 +02:00
parent d7239ffb7a
commit 38463135c8
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/de/srsoftware/web4rail/Route.java
View File

@@ -23,12 +23,12 @@ import de.srsoftware.web4rail.tiles.Turnout.State;
public class Route { public class Route {
private static final Logger LOG = LoggerFactory.getLogger(Route.class); private static final Logger LOG = LoggerFactory.getLogger(Route.class);
private static final String NAME = "name"; private static final String NAME = "name";
private static final HashMap<String,String> names = new HashMap<String, String>();
private Vector<Tile> path; private Vector<Tile> path;
private Vector<Signal> signals; private Vector<Signal> signals;
private Vector<Contact> contacts; private Vector<Contact> contacts;
private HashMap<Turnout,Turnout.State> turnouts; private HashMap<Turnout,Turnout.State> turnouts;
private String id; private String id;
private String name;
public Tile add(Tile tile, Direction direrction) { public Tile add(Tile tile, Direction direrction) {
if (tile instanceof Shadow) tile = ((Shadow)tile).overlay(); if (tile instanceof Shadow) tile = ((Shadow)tile).overlay();
@@ -76,8 +76,8 @@ public class Route {
} }
public String name() { public String name() {
if (name == null) name = id(); String name = names.get(id());
return name; return name == null ? id() : name;
} }
public Vector<Tile> path() { public Vector<Tile> path() {
@@ -118,7 +118,7 @@ public class Route {
new Tag("input").attr("type", "hidden").attr("name","route").attr("value", id()).addTo(form); new Tag("input").attr("type", "hidden").attr("name","route").attr("value", id()).addTo(form);
Tag label = new Tag("label").content(t("name:")); Tag label = new Tag("label").content(t("name:"));
new Tag("input").attr("type", "text").attr(NAME,"name").attr("value", name).addTo(label); new Tag("input").attr("type", "text").attr(NAME,"name").attr("value", name()).addTo(label);
label.addTo(form); label.addTo(form);
return form; return form;
@@ -138,6 +138,18 @@ public class Route {
return getClass().getSimpleName()+"("+name()+")"; return getClass().getSimpleName()+"("+name()+")";
} }
public void setLast(State state) {
if (state == null || state == State.UNDEF) return;
Tile lastTile = path.lastElement();
if (lastTile instanceof Turnout) turnouts.put((Turnout) lastTile,state);
}
private void setName(String name) {
if (name.isEmpty()) {
names.remove(id());
} else names.put(id(),name);
}
public Block startBlock() { public Block startBlock() {
return (Block) path.get(0); return (Block) path.get(0);
} }
@@ -146,14 +158,8 @@ public class Route {
return Translation.get(Application.class, txt, fills); return Translation.get(Application.class, txt, fills);
} }
public void setLast(State state) {
if (state == null || state == State.UNDEF) return;
Tile lastTile = path.lastElement();
if (lastTile instanceof Turnout) turnouts.put((Turnout) lastTile,state);
}
public void update(HashMap<String, String> params) { public void update(HashMap<String, String> params) {
LOG.debug("update({})",params); LOG.debug("update({})",params);
if (params.containsKey(NAME)) name = params.get(NAME); if (params.containsKey(NAME)) setName(params.get(NAME));
} }
} }