From d3ca0a08ef7670ffe4f56a60e19ee159ca3e9fed Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Fri, 6 Nov 2020 20:52:55 +0100 Subject: [PATCH] minor changes --- pom.xml | 2 +- .../translations/Application.de.translation | 2 +- .../java/de/srsoftware/web4rail/Plan.java | 2 +- .../java/de/srsoftware/web4rail/Route.java | 2 +- .../web4rail/actions/ActionList.java | 4 ++-- .../web4rail/actions/ConditionalAction.java | 20 +++++++++++++------ .../web4rail/actions/DelayedAction.java | 6 +++++- .../de/srsoftware/web4rail/moving/Train.java | 2 +- .../de/srsoftware/web4rail/tiles/Contact.java | 5 +++++ .../srsoftware/web4rail/tiles/ContactV.java | 2 +- .../de/srsoftware/web4rail/tiles/Tile.java | 4 ++-- 11 files changed, 34 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 36db1da..69c910d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.10.9 + 0.10.10 Web4Rail jar Java Model Railway Control diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index 152278b..22bbd1e 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -105,7 +105,7 @@ train is shorter than {} : Zug ist kürzer als {} Trains : Züge Trains\: : Züge: TrainHasTag : Zug mit Tag -TrainLength : Zuglänge +TrainLength : Zug-Länge TrainSelect : Zug-Auswahl Trigger {} : {} betätigen TriggerContact : Kontakt auslösen diff --git a/src/main/java/de/srsoftware/web4rail/Plan.java b/src/main/java/de/srsoftware/web4rail/Plan.java index c7d4241..cd64544 100644 --- a/src/main/java/de/srsoftware/web4rail/Plan.java +++ b/src/main/java/de/srsoftware/web4rail/Plan.java @@ -671,7 +671,7 @@ public class Plan extends BaseClass{ public void sensor(int addr, boolean active) { Contact contact = Contact.get(addr); - LOG.debug("contact: {}",contact); + LOG.debug("contact: {}",isSet(contact) ? contact : addr); if (contact != null) { contact.activate(active); } else { diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java index 32c4f22..96f8942 100644 --- a/src/main/java/de/srsoftware/web4rail/Route.java +++ b/src/main/java/de/srsoftware/web4rail/Route.java @@ -646,7 +646,7 @@ public class Route extends BaseClass{ trace.add(t); if (t == tile) break; } - train.addToTrace(trace); + if (isSet(train)) train.addToTrace(trace); } public boolean train(Train newTrain) { diff --git a/src/main/java/de/srsoftware/web4rail/actions/ActionList.java b/src/main/java/de/srsoftware/web4rail/actions/ActionList.java index 8f13307..a8d3b19 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/ActionList.java +++ b/src/main/java/de/srsoftware/web4rail/actions/ActionList.java @@ -76,7 +76,7 @@ public class ActionList extends Vector implements Constants{ public void addActionsFrom(ActionList other) { for (Action otherAction : other) { - LOG.debug("old action: {}",otherAction); + //LOG.debug("old action ({}): {}",otherAction.getClass().getSimpleName(),otherAction); boolean exists = false; int len = this.size(); for (int i=0; i implements Constants{ } return t("No action with id {} found.",actionId); } -} \ No newline at end of file +} diff --git a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java index eed699f..2bd4960 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java +++ b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java @@ -33,6 +33,15 @@ public class ConditionalAction extends Action { return actions; } + private StringBuffer conditions() { + StringBuffer sb = new StringBuffer(); + for (int i = 0; i0) sb.append(t(" or ")); + sb.append(conditions.get(i).toString()); + } + return sb; + } + private Tag conditionForm(HashMap params) { Fieldset fieldset = new Fieldset(t("Conditions")); @@ -53,6 +62,10 @@ public class ConditionalAction extends Action { Condition.selector().addTo(form); return new Button(t("Add condition"),form).addTo(form).addTo(fieldset); } + + public boolean equals(ConditionalAction other) { + return (conditions()+":"+actions).equals(other.conditions()+":"+other.actions); + } @Override public boolean fire(Context context) throws IOException { @@ -97,12 +110,7 @@ public class ConditionalAction extends Action { @Override public String toString() { if (conditions.isEmpty()) return t("[Click here to add condition]"); - StringBuffer sb = new StringBuffer(); - for (int i = 0; i0) sb.append(t(" or ")); - sb.append(conditions.get(i).toString()); - } - return t("if ({}): {}",sb,actions); + return t("if ({}):",conditions()); } @Override diff --git a/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java b/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java index d2f57c6..ffe274f 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java +++ b/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java @@ -44,6 +44,10 @@ public class DelayedAction extends Action { new Input(DELAY,delay).numeric().addTo(new Label(t("Delay")+NBSP)).content(NBSP+"ms").addTo(form); return new Button(t("Apply"),form).addTo(form).addTo(fieldset); } + + public boolean equals(DelayedAction other) { + return (delay+":"+actions).equals(other.delay+":"+other.actions); + } @Override public boolean fire(Context context) throws IOException { @@ -85,7 +89,7 @@ public class DelayedAction extends Action { @Override public String toString() { - return t("Wait {} ms, then: {}",delay,actions); + return t("Wait {} ms, then: ",delay); } @Override diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java index 0363e01..072c45e 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Train.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java @@ -87,7 +87,7 @@ public class Train extends BaseClass implements Comparable { stop = false; while (true) { if (isNull(route)) { - Thread.sleep(2000); + Thread.sleep(1000); if (stop) return; Train.this.start(); } diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Contact.java b/src/main/java/de/srsoftware/web4rail/tiles/Contact.java index c4ec0be..914cc2d 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/Contact.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/Contact.java @@ -136,6 +136,11 @@ public abstract class Contact extends Tile{ } + @Override + public String title() { + return t("Contact {} @ ({}, {})",addr,x,y); + } + public String trigger() { if (trigger == null) trigger = getClass().getSimpleName()+"-"+id(); return trigger; diff --git a/src/main/java/de/srsoftware/web4rail/tiles/ContactV.java b/src/main/java/de/srsoftware/web4rail/tiles/ContactV.java index 2732e55..67c7ab4 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/ContactV.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/ContactV.java @@ -21,7 +21,7 @@ public class ContactV extends Contact { default: return new HashMap<>(); } - } + } @Override public List possibleDirections() { diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Tile.java b/src/main/java/de/srsoftware/web4rail/tiles/Tile.java index 297cf91..8b1dd8e 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/Tile.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/Tile.java @@ -355,6 +355,8 @@ public abstract class Tile extends BaseClass{ default: } } + String title = title(); + if (isSet(title)) new Tag("title").content(title()).addTo(svg); } else { new Tag("title").content(t("No display defined for this tile ({})",getClass().getSimpleName())).addTo(svg); new Tag("text") @@ -362,8 +364,6 @@ public abstract class Tile extends BaseClass{ .content("?") .addTo(svg); } - String title = title(); - if (isSet(title)) new Tag("title").content(title()).addTo(svg); return svg; }