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

implemented route display on block properties

Browse Source
This commit is contained in:
Stephan Richter
2020-09-16 11:06:03 +02:00
parent 4ff28b34e2
commit f793d5b078
6 changed files with 110 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/de/srsoftware/web4rail/tiles/Block.java
View File

@@ -1,13 +1,80 @@
package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Route;
public abstract class Block extends StretchableTile{
public abstract Set<Route> routes();
private static final String NAME = "name";
public String name = "Block";
private HashSet<Route> routes = new HashSet<Route>();
@Override
public JSONObject config() {
JSONObject config = super.config();
config.put(NAME, name);
return config;
}
@Override
public void configure(JSONObject config) {
super.configure(config);
if (config.has(NAME)) name = config.getString(NAME);
}
public Set<Route> routes(){
return routes;
}
public abstract List<Connector> startPoints();
public void add(Route route) {
routes.add(route);
}
@Override
public Tag propForm() {
Tag form = super.propForm();
Tag label = new Tag("label").content(t("name:"));
new Tag("input").attr("type", "text").attr(NAME,"name").attr("value", name).addTo(label);
label.addTo(form);
new Tag("h4").content(t("Routes from here:")).addTo(form);
Tag routeList = new Tag("ul");
for (Route route : routes) {
new Tag("li").content(route.id()).addTo(routeList);
}
routeList.addTo(form);
return form;
}
@Override
public Tag tag(Map<String, Object> replacements) throws IOException {
if (replacements == null) replacements = new HashMap<String, Object>();
replacements.put("%text%",name);
return super.tag(replacements);
}
@Override
public String toString() {
return getClass().getSimpleName()+"("+name+") @ ("+x+","+y+")";
}
@Override
public Tile update(HashMap<String, String> params) {
super.update(params);
if (params.containsKey(NAME)) name=params.get(NAME);
return this;
}
}

60
src/main/java/de/srsoftware/web4rail/tiles/BlockH.java
View File

@@ -1,78 +1,20 @@
package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Route;
public class BlockH extends Block{
private static final String NAME = "name";
Contact north,center,south;
private String name = "Block";
@Override
public JSONObject config() {
JSONObject config = super.config();
config.put(NAME, name);
return config;
}
@Override
public void configure(JSONObject config) {
super.configure(config);
if (config.has(NAME)) name = config.getString(NAME);
}
@Override
public int len() {
return length;
}
@Override
public Tag propForm() {
Tag form = super.propForm();
Tag label = new Tag("label").content(t("name:"));
new Tag("input").attr("type", "text").attr(NAME,"name").attr("value", name).addTo(label);
label.addTo(form);
return form;
}
@Override
public Set<Route> routes() {
return null;
}
@Override
public List<Connector> startPoints() {
return List.of(new Connector(x-1, y, Direction.EAST),new Connector(x+len(), y, Direction.WEST));
}
@Override
public Tag tag(Map<String, Object> replacements) throws IOException {
if (replacements == null) replacements = new HashMap<String, Object>();
replacements.put("%text%",name);
return super.tag(replacements);
}
@Override
public String toString() {
return getClass().getSimpleName()+"("+name+") @ ("+x+","+y+")";
}
@Override
public Tile update(HashMap<String, String> params) {
super.update(params);
if (params.containsKey(NAME)) name=params.get(NAME);
return this;
}
}

61
src/main/java/de/srsoftware/web4rail/tiles/BlockV.java
View File

@@ -1,79 +1,20 @@
package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Route;
public class BlockV extends Block{
private static final String NAME = "name";
Contact west,center,east;
private String name = "Block";
@Override
public JSONObject config() {
JSONObject config = super.config();
config.put(NAME, name);
return config;
}
@Override
public void configure(JSONObject config) {
super.configure(config);
if (config.has(NAME)) name = config.getString(NAME);
}
@Override
public int height() {
return length;
}
@Override
public Tag propForm() {
Tag form = super.propForm();
Tag label = new Tag("label").content(t("name:"));
new Tag("input").attr("type", "text").attr(NAME,"name").attr("value", name).addTo(label);
label.addTo(form);
return form;
}
@Override
public Set<Route> routes() {
return null;
}
@Override
public List<Connector> startPoints() {
return List.of(new Connector(x,y-1,Direction.SOUTH),new Connector(x,y+height(),Direction.NORTH));
}
@Override
public Tag tag(Map<String, Object> replacements) throws IOException {
if (replacements == null) replacements = new HashMap<String, Object>();
replacements.put("%text%",name);
return super.tag(replacements);
}
@Override
public String toString() {
return getClass().getSimpleName()+"("+name+") @ ("+x+","+y+")";
}
@Override
public Tile update(HashMap<String, String> params) {
super.update(params);
if (params.containsKey(NAME)) name=params.get(NAME);
return this;
}
}
}

12
src/main/java/de/srsoftware/web4rail/tiles/Tile.java
View File

@@ -24,7 +24,7 @@ import de.srsoftware.web4rail.Plan.Direction;
public abstract class Tile {
protected int x = -1,y = -1;
public int x = -1,y = -1;
protected HashSet<String> classes = new HashSet<String>();
protected HashSet<Shadow> shadows = new HashSet<Shadow>();
protected static Logger LOG = LoggerFactory.getLogger(Tile.class);
@@ -33,6 +33,10 @@ public abstract class Tile {
classes.add("tile");
classes.add(getClass().getSimpleName());
}
public void addShadow(Shadow shadow) {
shadows.add(shadow);
}
public JSONObject config() {
return new JSONObject();
@@ -149,9 +153,5 @@ public abstract class Tile {
public Tile update(HashMap<String, String> params) {
LOG.debug("{}.update({})",getClass().getSimpleName(),params);
return this;
}
public void addShadow(Shadow shadow) {
shadows.add(shadow);
}
}
}