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

code optimization

Browse Source
This commit is contained in:
Stephan Richter
2021-02-11 16:30:34 +01:00
parent 5ec07efb63
commit 853ae2a0c1
12 changed files with 185 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/srsoftware/web4rail/actions/ActionList.java
View File

@@ -263,6 +263,6 @@ public class ActionList extends Action implements Iterable<Action>{
@Override
public String toString() {
return actions.toString();
return actions.isEmpty() ? "[no actions]" : actions.toString();
}
}

9
src/main/java/de/srsoftware/web4rail/actions/AddDestination.java
View File

@@ -10,7 +10,6 @@ import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Application;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Checkbox;
import de.srsoftware.web4rail.tags.Fieldset;
@@ -43,11 +42,11 @@ public class AddDestination extends Action {
return true;
}
String flags = "+";
if (turnAtDestination) flags += Route.TURN_FLAG;
if (shunting) flags += Route.SHUNTING_FLAG;
String dest = Route.DESTINATION_PREFIX+destination.id() + (flags.length()>1 ? flags : "");
if (turnAtDestination) flags += Train.TURN_FLAG;
if (shunting) flags += Train.SHUNTING_FLAG;
String dest = Train.DESTINATION_PREFIX+destination.id() + (flags.length()>1 ? flags : "");
for (String tag: train.tags()) {
if (tag.startsWith(Route.DESTINATION_PREFIX)) {
if (tag.startsWith(Train.DESTINATION_PREFIX)) {
train.removeTag(tag);
dest = tag+dest;
break;