From 806502b4591a26767313524879c6a86ef3c9d02a Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Thu, 5 Nov 2020 21:00:13 +0100 Subject: [PATCH] remove unused class and functions --- src/main/java/de/srsoftware/web4rail/Route.java | 12 +----------- .../srsoftware/web4rail/actions/ActivateRoute.java | 12 ------------ 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 src/main/java/de/srsoftware/web4rail/actions/ActivateRoute.java diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java index a7dd9ad..f357196 100644 --- a/src/main/java/de/srsoftware/web4rail/Route.java +++ b/src/main/java/de/srsoftware/web4rail/Route.java @@ -23,7 +23,6 @@ import de.srsoftware.web4rail.Plan.Direction; import de.srsoftware.web4rail.actions.Action; import de.srsoftware.web4rail.actions.Action.Context; import de.srsoftware.web4rail.actions.ActionList; -import de.srsoftware.web4rail.actions.ActivateRoute; import de.srsoftware.web4rail.actions.FinishRoute; import de.srsoftware.web4rail.actions.SetSignalsToStop; import de.srsoftware.web4rail.actions.SetSpeed; @@ -124,14 +123,6 @@ public class Route extends BaseClass{ return properties(params); } - /** - * Route wurde von Zug betreten - * @throws IOException - */ - public void activate() throws IOException { - // TODO - } - /** * adds a tile to the route * @param tile @@ -300,7 +291,6 @@ public class Route extends BaseClass{ public void complete() { if (contacts.size()>1) { // mindestens 2 Kontakte: erster Kontakt aktiviert Block, vorletzter Kontakt leitet Bremsung ein - add(contacts.firstElement().trigger(),new ActivateRoute()); Contact nextToLastContact = contacts.get(contacts.size()-2); add(nextToLastContact.trigger(),new SetSpeed().speed(30)); add(nextToLastContact.trigger(),new SetSignalsToStop()); @@ -525,7 +515,7 @@ public class Route extends BaseClass{ name = generateName(); name(name); } - return name; + return name + (disabled?" ["+t("disabled")+"]" : ""); } public void name(String name) { diff --git a/src/main/java/de/srsoftware/web4rail/actions/ActivateRoute.java b/src/main/java/de/srsoftware/web4rail/actions/ActivateRoute.java deleted file mode 100644 index a36bc10..0000000 --- a/src/main/java/de/srsoftware/web4rail/actions/ActivateRoute.java +++ /dev/null @@ -1,12 +0,0 @@ -package de.srsoftware.web4rail.actions; - -import java.io.IOException; - -public class ActivateRoute extends Action { - - @Override - public boolean fire(Context context) throws IOException { - context.route.activate(); - return true; - } -}