Browse Source

bugfix

lookup-tables
Stephan Richter 5 years ago
parent
commit
2f9a9d74be
  1. 2
      pom.xml
  2. 1
      src/main/java/de/srsoftware/web4rail/tiles/BlockH.java
  3. 1
      src/main/java/de/srsoftware/web4rail/tiles/BlockV.java
  4. 2
      src/main/java/de/srsoftware/web4rail/tiles/ContactH.java
  5. 2
      src/main/java/de/srsoftware/web4rail/tiles/ContactV.java
  6. 2
      src/main/java/de/srsoftware/web4rail/tiles/CrossH.java
  7. 1
      src/main/java/de/srsoftware/web4rail/tiles/DiagES.java
  8. 1
      src/main/java/de/srsoftware/web4rail/tiles/DiagNE.java
  9. 1
      src/main/java/de/srsoftware/web4rail/tiles/DiagSW.java
  10. 2
      src/main/java/de/srsoftware/web4rail/tiles/DiagWN.java
  11. 2
      src/main/java/de/srsoftware/web4rail/tiles/SignalE.java
  12. 2
      src/main/java/de/srsoftware/web4rail/tiles/SignalN.java
  13. 2
      src/main/java/de/srsoftware/web4rail/tiles/SignalS.java
  14. 2
      src/main/java/de/srsoftware/web4rail/tiles/SignalW.java
  15. 2
      src/main/java/de/srsoftware/web4rail/tiles/StraightH.java
  16. 2
      src/main/java/de/srsoftware/web4rail/tiles/StraightV.java
  17. 1
      src/main/java/de/srsoftware/web4rail/tiles/Turnout3E.java
  18. 1
      src/main/java/de/srsoftware/web4rail/tiles/TurnoutLE.java
  19. 1
      src/main/java/de/srsoftware/web4rail/tiles/TurnoutLN.java
  20. 1
      src/main/java/de/srsoftware/web4rail/tiles/TurnoutLS.java
  21. 1
      src/main/java/de/srsoftware/web4rail/tiles/TurnoutLW.java
  22. 1
      src/main/java/de/srsoftware/web4rail/tiles/TurnoutRE.java
  23. 1
      src/main/java/de/srsoftware/web4rail/tiles/TurnoutRN.java
  24. 1
      src/main/java/de/srsoftware/web4rail/tiles/TurnoutRS.java
  25. 1
      src/main/java/de/srsoftware/web4rail/tiles/TurnoutRW.java

2
pom.xml

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId>
<version>0.10.8s</version>
<version>0.10.9</version>
<name>Web4Rail</name>
<packaging>jar</packaging>
<description>Java Model Railway Control</description>

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

@ -13,6 +13,7 @@ public class BlockH extends Block{ @@ -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

@ -13,6 +13,7 @@ public class BlockV extends Block{ @@ -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

@ -11,7 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State; @@ -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

@ -12,7 +12,7 @@ public class ContactV extends Contact { @@ -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

@ -13,6 +13,7 @@ public class CrossH extends Cross{ @@ -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{ @@ -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

@ -11,6 +11,7 @@ public class DiagES extends Tile{ @@ -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

@ -11,6 +11,7 @@ public class DiagNE extends Tile{ @@ -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

@ -10,6 +10,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State; @@ -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

@ -11,6 +11,8 @@ public class DiagWN extends Tile{ @@ -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

@ -11,7 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State; @@ -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

@ -12,7 +12,7 @@ public class SignalN extends Signal { @@ -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

@ -12,7 +12,7 @@ public class SignalS extends Signal{ @@ -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

@ -11,7 +11,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State; @@ -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

@ -12,7 +12,7 @@ public class StraightH extends StretchableTile{ @@ -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

@ -12,7 +12,7 @@ public class StraightV extends StretchableTile{ @@ -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

@ -16,6 +16,7 @@ public class Turnout3E extends Turnout{ @@ -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

@ -10,6 +10,7 @@ public class TurnoutLE extends TurnoutL{ @@ -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

@ -10,6 +10,7 @@ public class TurnoutLN extends TurnoutL{ @@ -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

@ -10,6 +10,7 @@ public class TurnoutLS extends TurnoutL{ @@ -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

@ -10,6 +10,7 @@ public class TurnoutLW extends TurnoutL{ @@ -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

@ -10,6 +10,7 @@ public class TurnoutRE extends TurnoutR{ @@ -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

@ -10,6 +10,7 @@ public class TurnoutRN extends TurnoutR{ @@ -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

@ -10,6 +10,7 @@ public class TurnoutRS extends TurnoutR{ @@ -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

@ -10,6 +10,7 @@ public class TurnoutRW extends TurnoutR{ @@ -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);

Loading…
Cancel
Save