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

implemented manual coupling/decoupling of trains

Browse Source
This commit is contained in:
Stephan Richter
2021-01-17 18:28:11 +01:00
parent d454f18ecc
commit 8f52c79798
67 changed files with 167 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,6 @@ import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Range;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Button;
import de.srsoftware.web4rail.tags.Checkbox;
@@ -26,6 +25,7 @@ import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Window;
/**
* Base class for all kinds of Blocks
@@ -298,7 +298,7 @@ public abstract class Block extends StretchableTile{
return super.load(json);
}
private Fieldset parkedTrains() {
private Fieldset parkedTrainList() {
Fieldset fieldset = new Fieldset(t("parked trains"));
Tag list = new Tag("ul");
for (Train t : parkedTrains) {
@@ -308,7 +308,11 @@ public abstract class Block extends StretchableTile{
return fieldset;
}
public Train parkedTrains(boolean last) {
public List<Train> parkedTrains(){
return parkedTrains;
}
public Train parkedTrain(boolean last) {
if (parkedTrains.isEmpty()) return null;
return last ? parkedTrains.lastElement() : parkedTrains.firstElement();
}
@@ -321,7 +325,7 @@ public abstract class Block extends StretchableTile{
formInputs.add(t("Train"),Train.selector(train, null));
postForm.add(contactForm());
postForm.add(waitTimeForm());
if (!parkedTrains.isEmpty()) postForm.add(parkedTrains());
if (!parkedTrains.isEmpty()) postForm.add(parkedTrainList());
return super.properties(preForm, formInputs, postForm);
}
@@ -346,7 +350,8 @@ public abstract class Block extends StretchableTile{
public void removeChild(BaseClass child) {
super.removeChild(child);
internalContacts.remove(child);
parkedTrains.remove(child);
if (parkedTrains.remove(child)) plan.place(this);
if (train == child) setTrain(null);
}
public void removeContact(BlockContact blockContact) {

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

@@ -11,9 +11,9 @@ import de.srsoftware.web4rail.Application;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Window;
public abstract class Bridge extends Tile {
private static final String COUNTERPART = "counterpart";

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

@@ -15,12 +15,12 @@ import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Application;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.actions.Action;
import de.srsoftware.web4rail.actions.ActionList;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Window;
public class Contact extends Tile{

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

@@ -15,11 +15,11 @@ import de.srsoftware.web4rail.Command;
import de.srsoftware.web4rail.Command.Reply;
import de.srsoftware.web4rail.Device;
import de.srsoftware.web4rail.Protocol;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Radio;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Window;
public abstract class Decoupler extends Tile implements Device{

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

@@ -16,11 +16,11 @@ import de.srsoftware.web4rail.Command;
import de.srsoftware.web4rail.Command.Reply;
import de.srsoftware.web4rail.Device;
import de.srsoftware.web4rail.Protocol;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Radio;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Window;
public class Relay extends Tile implements Device{
public static final String STATE = "state";

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

@@ -16,13 +16,13 @@ import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Command;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Protocol;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Button;
import de.srsoftware.web4rail.tags.Checkbox;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Table;
import de.srsoftware.web4rail.tags.Window;
public abstract class Signal extends Tile {
public static final String STATE = "state";

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

@@ -8,9 +8,9 @@ import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Window;
public abstract class StretchableTile extends TileWithShadow {
private static final String STRETCH_LENGTH = "stretch";

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

@@ -12,10 +12,10 @@ import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Window;
public class TextDisplay extends StretchableTile {
private static final String TEXT = "text";

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

@@ -27,12 +27,12 @@ import de.srsoftware.web4rail.Plan;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.actions.AlterDirection;
import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Checkbox;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Radio;
import de.srsoftware.web4rail.tags.Window;
/**
* Base class for all tiles

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

@@ -15,11 +15,11 @@ import de.srsoftware.web4rail.Command;
import de.srsoftware.web4rail.Command.Reply;
import de.srsoftware.web4rail.Device;
import de.srsoftware.web4rail.Protocol;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Radio;
import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tags.Window;
/**
* Base class for Turnouts

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

@@ -4,9 +4,9 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Window;
public abstract class TurnoutL extends Turnout {

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

@@ -4,9 +4,9 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Window;
public abstract class TurnoutR extends Turnout {