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

bugfix

Browse Source
This commit is contained in:
Stephan Richter
2020-11-06 11:32:31 +01:00
parent 5e088deda2
commit 2f9a9d74be
25 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ public class BlockH extends Block{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from)) return new HashMap<Connector, Turnout.State>();
switch (from) {
case WEST:
return Map.of(new Connector(x+width(),y,Direction.WEST),State.UNDEF);

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

@@ -13,6 +13,7 @@ public class BlockV extends Block{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from)) return new HashMap<Connector, Turnout.State>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+height(),Direction.NORTH),State.UNDEF);

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

@@ -11,7 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State;
public class ContactH extends Contact {
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+1,y,from),State.UNDEF);

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

@@ -12,7 +12,7 @@ public class ContactV extends Contact {
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+1,from),State.UNDEF);

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

@@ -13,6 +13,7 @@ public class CrossH extends Cross{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from)) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x+1,y+1,Direction.NORTH),State.UNDEF);
@@ -30,6 +31,7 @@ public class CrossH extends Cross{
@Override
public Map<Connector,State> offsetConnections(Direction from) {
if (isNull(from)) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+1,Direction.NORTH),State.UNDEF);

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

@@ -11,6 +11,7 @@ public class DiagES extends Tile{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from)) return new HashMap<>();
switch (from) {
case SOUTH:
return Map.of(new Connector(x+1,y,Direction.WEST),State.UNDEF);

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

@@ -11,6 +11,7 @@ public class DiagNE extends Tile{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from)) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x+1,y,Direction.WEST),State.UNDEF);

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

@@ -10,6 +10,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State;
public class DiagSW extends Tile{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from)) return new HashMap<>();
switch (from) {
case SOUTH:
return Map.of(new Connector(x-1,y,Direction.EAST),State.UNDEF);

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

@@ -11,6 +11,8 @@ public class DiagWN extends Tile{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from)) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x-1,y,Direction.EAST),State.UNDEF);

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

@@ -11,7 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State;
public class SignalE extends Signal{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+1,y,Direction.WEST),State.UNDEF);

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

@@ -12,7 +12,7 @@ public class SignalN extends Signal {
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+1,Direction.NORTH),State.UNDEF);

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

@@ -12,7 +12,7 @@ public class SignalS extends Signal{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+1,Direction.NORTH),State.UNDEF);

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

@@ -11,7 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State;
public class SignalW extends Signal{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+1,y,Direction.WEST),State.UNDEF);

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

@@ -12,7 +12,7 @@ public class StraightH extends StretchableTile{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+width(),y,Direction.WEST),State.UNDEF);

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

@@ -12,7 +12,7 @@ public class StraightV extends StretchableTile{
@Override
public Map<Connector, State> connections(Direction from) {
if (oneWay == from) return new HashMap<>();
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+height(),Direction.NORTH),State.UNDEF);

1
src/main/java/de/srsoftware/web4rail/tiles/Turnout3E.java
View File

@@ -16,6 +16,7 @@ public class Turnout3E extends Turnout{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case EAST:
return Map.of(

1
src/main/java/de/srsoftware/web4rail/tiles/TurnoutLE.java
View File

@@ -10,6 +10,7 @@ public class TurnoutLE extends TurnoutL{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case EAST:
return Map.of(new Connector(x,y+1,Direction.NORTH),State.LEFT,new Connector(x-1, y, Direction.EAST),State.STRAIGHT);

1
src/main/java/de/srsoftware/web4rail/tiles/TurnoutLN.java
View File

@@ -10,6 +10,7 @@ public class TurnoutLN extends TurnoutL{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x,y+1,Direction.NORTH),State.STRAIGHT,new Connector(x+1, y, Direction.WEST),State.LEFT);

1
src/main/java/de/srsoftware/web4rail/tiles/TurnoutLS.java
View File

@@ -10,6 +10,7 @@ public class TurnoutLS extends TurnoutL{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case SOUTH:
return Map.of(new Connector(x-1,y,Direction.EAST),State.LEFT,new Connector(x, y-1, Direction.SOUTH),State.STRAIGHT);

1
src/main/java/de/srsoftware/web4rail/tiles/TurnoutLW.java
View File

@@ -10,6 +10,7 @@ public class TurnoutLW extends TurnoutL{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+1,y,Direction.WEST),State.STRAIGHT,new Connector(x, y-1, Direction.SOUTH),State.LEFT);

1
src/main/java/de/srsoftware/web4rail/tiles/TurnoutRE.java
View File

@@ -10,6 +10,7 @@ public class TurnoutRE extends TurnoutR{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case EAST:
return Map.of(new Connector(x,y-1,Direction.SOUTH),State.RIGHT,new Connector(x-1, y, Direction.EAST),State.STRAIGHT);

1
src/main/java/de/srsoftware/web4rail/tiles/TurnoutRN.java
View File

@@ -10,6 +10,7 @@ public class TurnoutRN extends TurnoutR{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case NORTH:
return Map.of(new Connector(x-1,y,Direction.EAST),State.RIGHT,new Connector(x, y+1, Direction.NORTH),State.STRAIGHT);

1
src/main/java/de/srsoftware/web4rail/tiles/TurnoutRS.java
View File

@@ -10,6 +10,7 @@ public class TurnoutRS extends TurnoutR{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case SOUTH:
return Map.of(new Connector(x+1,y,Direction.WEST),State.RIGHT,new Connector(x, y-1, Direction.SOUTH),State.STRAIGHT);

1
src/main/java/de/srsoftware/web4rail/tiles/TurnoutRW.java
View File

@@ -10,6 +10,7 @@ public class TurnoutRW extends TurnoutR{
@Override
public Map<Connector, State> connections(Direction from) {
if (isNull(from) || oneWay == from) return new HashMap<>();
switch (from) {
case WEST:
return Map.of(new Connector(x+1,y,Direction.WEST),State.STRAIGHT,new Connector(x, y+1, Direction.NORTH),State.RIGHT);