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

refactoring tile delete method

Browse Source
This commit is contained in:
Stephan Richter
2020-12-03 13:33:45 +01:00
parent 50a5508a33
commit 5aa66099fe
30 changed files with 81 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,11 +234,6 @@ public abstract class Block extends StretchableTile implements Comparable<Block>
return this;
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
public static Select selector(Block preselected,Collection<Block> exclude) {
if (isNull(exclude)) exclude = new Vector<Block>();
Select select = new Select(Block.class.getSimpleName());

2
src/main/java/de/srsoftware/web4rail/tiles/Bridge.java
View File

@@ -102,7 +102,7 @@ public abstract class Bridge extends Tile {
}
@Override
protected void removeChild(BaseClass child) {
public void removeChild(BaseClass child) {
if (child == counterpart) counterpart = null;
plan.place(this);
}

2
src/main/java/de/srsoftware/web4rail/tiles/Contact.java
View File

@@ -167,7 +167,7 @@ public class Contact extends Tile{
}
@Override
protected void removeChild(BaseClass child) {
public void removeChild(BaseClass child) {
if (child == actions) actions = null;
}

6
src/main/java/de/srsoftware/web4rail/tiles/Cross.java
View File

@@ -2,15 +2,9 @@ package de.srsoftware.web4rail.tiles;
import java.util.Map;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
public abstract class Cross extends Tile {
public abstract Map<Connector,Turnout.State> offsetConnections(Direction from);
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}

6
src/main/java/de/srsoftware/web4rail/tiles/CrossPlus.java
View File

@@ -4,7 +4,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.tiles.Turnout.State;
@@ -32,9 +31,4 @@ public class CrossPlus extends Tile{
public List<Direction> possibleDirections() {
return List.of(Direction.EAST,Direction.WEST,Direction.NORTH,Direction.SOUTH);
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}

6
src/main/java/de/srsoftware/web4rail/tiles/DiagES.java
View File

@@ -3,7 +3,6 @@ package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.Map;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.tiles.Turnout.State;
@@ -22,9 +21,4 @@ public class DiagES extends Tile{
return new HashMap<>();
}
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}

6
src/main/java/de/srsoftware/web4rail/tiles/DiagNE.java
View File

@@ -3,7 +3,6 @@ package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.Map;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.tiles.Turnout.State;
@@ -22,9 +21,4 @@ public class DiagNE extends Tile{
return new HashMap<>();
}
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}

6
src/main/java/de/srsoftware/web4rail/tiles/DiagSW.java
View File

@@ -3,7 +3,6 @@ package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.Map;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.tiles.Turnout.State;
@@ -21,9 +20,4 @@ public class DiagSW extends Tile{
return new HashMap<>();
}
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/DiagWN.java
View File

@@ -3,7 +3,6 @@ package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.Map;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.tiles.Turnout.State;
@@ -23,10 +22,4 @@ public class DiagWN extends Tile{
return new HashMap<>();
}
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}

9
src/main/java/de/srsoftware/web4rail/tiles/EndE.java
View File

@@ -1,10 +1,3 @@
package de.srsoftware.web4rail.tiles;
import de.srsoftware.web4rail.BaseClass;
public class EndE extends Tile{
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}
public class EndE extends Tile{}

10
src/main/java/de/srsoftware/web4rail/tiles/EndN.java
View File

@@ -1,11 +1,3 @@
package de.srsoftware.web4rail.tiles;
import de.srsoftware.web4rail.BaseClass;
public class EndN extends Tile{
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}
public class EndN extends Tile{}

9
src/main/java/de/srsoftware/web4rail/tiles/EndS.java
View File

@@ -1,10 +1,3 @@
package de.srsoftware.web4rail.tiles;
import de.srsoftware.web4rail.BaseClass;
public class EndS extends Tile{
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}
public class EndS extends Tile{}

9
src/main/java/de/srsoftware/web4rail/tiles/EndW.java
View File

@@ -1,10 +1,3 @@
package de.srsoftware.web4rail.tiles;
import de.srsoftware.web4rail.BaseClass;
public class EndW extends Tile{
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}
public class EndW extends Tile{}

9
src/main/java/de/srsoftware/web4rail/tiles/Eraser.java
View File

@@ -1,10 +1,3 @@
package de.srsoftware.web4rail.tiles;
import de.srsoftware.web4rail.BaseClass;
public class Eraser extends Tile {
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
}
public class Eraser extends Tile {}

7
src/main/java/de/srsoftware/web4rail/tiles/Relay.java
View File

@@ -159,12 +159,7 @@ public class Relay extends Tile implements Device{
return 'P';
}
}
@Override
protected void removeChild(BaseClass child) {
// TODO Auto-generated method stub
}
public Relay setLabel(boolean state, String tx) {
if (state) {
stateLabelA = tx;

2
src/main/java/de/srsoftware/web4rail/tiles/Shadow.java
View File

@@ -30,7 +30,7 @@ public class Shadow extends Tile{
}
@Override
protected void removeChild(BaseClass child) {
public void removeChild(BaseClass child) {
if (child == overlay) {
overlay = null;
remove();

6
src/main/java/de/srsoftware/web4rail/tiles/Signal.java
View File

@@ -7,7 +7,6 @@ import java.util.TreeSet;
import java.util.Vector;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Plan.Direction;
public abstract class Signal extends Tile implements Comparable<Signal>{
@@ -38,11 +37,6 @@ public abstract class Signal extends Tile implements Comparable<Signal>{
}
public abstract boolean isAffectedFrom(Direction dir);
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
public boolean state(String state) {
this.state = state;

6
src/main/java/de/srsoftware/web4rail/tiles/StraightH.java
View File

@@ -4,7 +4,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.tiles.Turnout.State;
@@ -29,11 +28,6 @@ public class StraightH extends StretchableTile{
return List.of(Direction.EAST,Direction.WEST);
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
@Override
protected String stretchType() {
return t("Width");

6
src/main/java/de/srsoftware/web4rail/tiles/StraightV.java
View File

@@ -4,7 +4,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.tiles.Turnout.State;
@@ -34,11 +33,6 @@ public class StraightV extends StretchableTile{
return List.of(Direction.NORTH,Direction.SOUTH);
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
@Override
protected String stretchType() {
return t("Height");

5
src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java
View File

@@ -44,11 +44,6 @@ public class TextDisplay extends StretchableTile {
formInputs.add(t("Text"),new Input(TEXT, text));
return super.properties(preForm, formInputs, postForm);
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
public static Select selector(TextDisplay preselected,Collection<TextDisplay> exclude) {
if (isNull(exclude)) exclude = new Vector<TextDisplay>();

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

@@ -61,7 +61,7 @@ public abstract class Tile extends BaseClass{
protected Train train = null;
public Integer x = null;
public Integer y = null;
public void add(Route route) {
this.routes.add(route);
}
@@ -108,7 +108,7 @@ public abstract class Tile extends BaseClass{
private static void inflate(String clazz, JSONObject json, Plan plan) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException, IOException {
clazz = Tile.class.getName().replace(".Tile", "."+clazz);
Tile tile = (Tile) Tile.class.getClassLoader().loadClass(clazz).getDeclaredConstructor().newInstance();
tile.load(json);
tile.load(json).parent(plan);
plan.set(tile.x, tile.y, tile);
}
@@ -251,12 +251,6 @@ public abstract class Tile extends BaseClass{
return super.properties(preForm, formInputs, postForm);
}
@Override
public BaseClass remove() {
plan.stream("remove "+id());
return super.remove();
}
private static String replace(String line, Entry<String, Object> replacement) {
String key = replacement.getKey();
Object val = replacement.getValue();
@@ -379,6 +373,27 @@ public abstract class Tile extends BaseClass{
return train;
}
@Override
public BaseClass remove() {
super.remove();
routes.forEach(route -> {
route.remove();
});
shadows.forEach(shadow -> {
shadow.remove();
});
return this;
}
@Override
public void removeChild(BaseClass child) {
routes.remove(child);
shadows.remove(child);
if (child == train) train = null;
if (child == route) route = null;
plan.place(this);
}
public void unlock() {
route = null;
train = null;

6
src/main/java/de/srsoftware/web4rail/tiles/Turnout.java
View File

@@ -9,7 +9,6 @@ import java.util.concurrent.TimeoutException;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Command;
import de.srsoftware.web4rail.Command.Reply;
import de.srsoftware.web4rail.Device;
@@ -140,11 +139,6 @@ public abstract class Turnout extends Tile implements Device{
}
}
@Override
protected void removeChild(BaseClass child) {
// this class has no child elements
}
public State state() {
return state;
}