implemented manual coupling/decoupling of trains

src/main/java/de/srsoftware/web4rail/actions/Action.java

@@ -14,7 +14,6 @@ import de.keawe.tools.translations.Translation;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.Application;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Button;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Form;
@@ -22,6 +21,7 @@ import de.srsoftware.web4rail.tags.Input;
 import de.srsoftware.web4rail.tags.Label;
 import de.srsoftware.web4rail.tags.Select;
 import de.srsoftware.web4rail.tags.TextArea;
+import de.srsoftware.web4rail.tags.Window;
 
 /**
  * Base Class for all other actions

src/main/java/de/srsoftware/web4rail/actions/ActionList.java

@@ -14,11 +14,11 @@ import org.slf4j.LoggerFactory;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.BaseClass;
 import de.srsoftware.web4rail.Plan;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Button;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Form;
 import de.srsoftware.web4rail.tags.Input;
+import de.srsoftware.web4rail.tags.Window;
 
 public class ActionList extends Action implements Iterable<Action>{
 	static final Logger LOG = LoggerFactory.getLogger(ActionList.class);

src/main/java/de/srsoftware/web4rail/actions/AddDestination.java

@@ -11,10 +11,10 @@ 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.moving.Train;
 import de.srsoftware.web4rail.tags.Checkbox;
 import de.srsoftware.web4rail.tags.Fieldset;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Block;
 import de.srsoftware.web4rail.tiles.Tile;
 

src/main/java/de/srsoftware/web4rail/actions/AddRemoveTag.java

@@ -7,10 +7,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.Radio;
+import de.srsoftware.web4rail.tags.Window;
 
 public class AddRemoveTag extends Action{
 

src/main/java/de/srsoftware/web4rail/actions/AlterDirection.java

@@ -8,10 +8,10 @@ import org.json.JSONObject;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.BaseClass;
 import de.srsoftware.web4rail.Plan.Direction;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.moving.Train;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Radio;
+import de.srsoftware.web4rail.tags.Window;
 
 public class AlterDirection extends Action{
 	

src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java

@@ -7,10 +7,10 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.conditions.Condition;
 import de.srsoftware.web4rail.conditions.ConditionList;
 import de.srsoftware.web4rail.tags.Fieldset;
+import de.srsoftware.web4rail.tags.Window;
 
 public class ConditionalAction extends ActionList {
 	

src/main/java/de/srsoftware/web4rail/actions/CoupleTrain.java

@@ -6,10 +6,10 @@ import java.util.List;
 import org.json.JSONObject;
 
 import de.srsoftware.web4rail.BaseClass;
-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.Window;
 import de.srsoftware.web4rail.tiles.Block;
 
 public class CoupleTrain extends Action {
@@ -29,7 +29,7 @@ public class CoupleTrain extends Action {
 		if (isNull(train)) return false;		
 		Block block = train.currentBlock();
 		if (isNull(block)) return false;
-		Train parkingTrain = block.parkedTrains(last);
+		Train parkingTrain = block.parkedTrain(last);
 		if (isNull(parkingTrain)) return false;
 		train.coupleWith(parkingTrain,swap);
 		return true;

src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java

@@ -8,9 +8,9 @@ import org.json.JSONObject;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.Application;
 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 class DelayedAction extends ActionList {
 	

src/main/java/de/srsoftware/web4rail/actions/DetermineTrainInBlock.java

@@ -8,8 +8,8 @@ import org.json.JSONObject;
 
 import de.srsoftware.web4rail.Application;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Block;
 import de.srsoftware.web4rail.tiles.Tile;
 

src/main/java/de/srsoftware/web4rail/actions/DisableEnableBlock.java

@@ -8,9 +8,9 @@ import org.json.JSONObject;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.Application;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Radio;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Block;
 
 public class DisableEnableBlock extends Action {

src/main/java/de/srsoftware/web4rail/actions/EngageDecoupler.java

@@ -8,8 +8,8 @@ import org.json.JSONObject;
 
 import de.srsoftware.web4rail.Application;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Decoupler;
 import de.srsoftware.web4rail.tiles.Tile;
 

src/main/java/de/srsoftware/web4rail/actions/Loop.java

@@ -9,10 +9,10 @@ import org.json.JSONObject;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.BaseClass;
 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.Select;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Block;
 import de.srsoftware.web4rail.tiles.Contact;
 import de.srsoftware.web4rail.tiles.Signal;

src/main/java/de/srsoftware/web4rail/actions/SendCommand.java

@@ -9,10 +9,10 @@ import org.json.JSONObject;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.BaseClass;
 import de.srsoftware.web4rail.Command;
-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.Window;
 
 public class SendCommand extends Action{
 

src/main/java/de/srsoftware/web4rail/actions/SetContextTrain.java

@@ -7,9 +7,9 @@ import org.json.JSONObject;
 
 import de.srsoftware.web4rail.Application;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.moving.Train;
 import de.srsoftware.web4rail.tags.Fieldset;
+import de.srsoftware.web4rail.tags.Window;
 
 public class SetContextTrain extends Action {
 		

src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java

@@ -8,9 +8,9 @@ import org.json.JSONObject;
 
 import de.srsoftware.web4rail.Application;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Label;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.TextDisplay;
 import de.srsoftware.web4rail.tiles.Tile;
 

src/main/java/de/srsoftware/web4rail/actions/SetPower.java

@@ -8,9 +8,9 @@ import org.json.JSONObject;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.BaseClass;
 import de.srsoftware.web4rail.ControlUnit;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Radio;
+import de.srsoftware.web4rail.tags.Window;
 
 public class SetPower extends Action{
 	

src/main/java/de/srsoftware/web4rail/actions/SetRelay.java

@@ -7,9 +7,9 @@ import org.json.JSONObject;
 
 import de.srsoftware.web4rail.Application;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Select;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Relay;
 
 public class SetRelay extends Action {

src/main/java/de/srsoftware/web4rail/actions/SetSignal.java

@@ -7,9 +7,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.Select;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Signal;
 import de.srsoftware.web4rail.tiles.Tile;
 

src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java

@@ -6,9 +6,9 @@ import java.util.List;
 import org.json.JSONObject;
 
 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 class SetSpeed extends Action{
 

src/main/java/de/srsoftware/web4rail/actions/SetTurnout.java

@@ -9,9 +9,9 @@ import org.json.JSONObject;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.Application;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Select;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Turnout;
 import de.srsoftware.web4rail.tiles.Turnout.State;
 

src/main/java/de/srsoftware/web4rail/actions/SplitTrain.java

@@ -7,10 +7,10 @@ import org.json.JSONObject;
 
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.moving.Train;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Input;
+import de.srsoftware.web4rail.tags.Window;
 
 public class SplitTrain extends Action {
 	

src/main/java/de/srsoftware/web4rail/actions/StartStopAuto.java

@@ -6,9 +6,9 @@ import java.util.List;
 import org.json.JSONObject;
 
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Checkbox;
 import de.srsoftware.web4rail.tags.Fieldset;
+import de.srsoftware.web4rail.tags.Window;
 
 public class StartStopAuto extends Action {
 

src/main/java/de/srsoftware/web4rail/actions/SwitchFunction.java

@@ -7,10 +7,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.Radio;
 import de.srsoftware.web4rail.tags.Select;
+import de.srsoftware.web4rail.tags.Window;
 
 public class SwitchFunction extends Action {
 

src/main/java/de/srsoftware/web4rail/actions/TextAction.java

@@ -6,10 +6,10 @@ import java.util.List;
 import org.json.JSONObject;
 
 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.Label;
+import de.srsoftware.web4rail.tags.Window;
 
 public abstract class TextAction extends Action {
 	

src/main/java/de/srsoftware/web4rail/actions/TriggerContact.java

@@ -6,8 +6,8 @@ import java.util.List;
 import org.json.JSONObject;
 
 import de.srsoftware.web4rail.BaseClass;
-import de.srsoftware.web4rail.Window;
 import de.srsoftware.web4rail.tags.Fieldset;
+import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.tiles.Contact;
 
 public class TriggerContact extends Action {

src/main/java/de/srsoftware/web4rail/actions/WaitForContact.java

@@ -9,9 +9,9 @@ import org.json.JSONObject;
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.Application;
 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;
 import de.srsoftware.web4rail.tiles.Contact;
 import de.srsoftware.web4rail.tiles.Contact.Listener;
 import de.srsoftware.web4rail.tiles.Tile;