Browse Source

refactoring...

lookup-tables
Stephan Richter 4 years ago
parent
commit
559538d55e
  1. 2
      pom.xml
  2. 7
      src/main/java/de/srsoftware/web4rail/BaseClass.java
  3. 13
      src/main/java/de/srsoftware/web4rail/actions/Action.java
  4. 7
      src/main/java/de/srsoftware/web4rail/actions/SetSignal.java
  5. 6
      src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java

2
pom.xml

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>1.2.5</version> <version>1.2.6</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

7
src/main/java/de/srsoftware/web4rail/BaseClass.java

@ -11,6 +11,8 @@ import java.util.Map;
import java.util.Random; import java.util.Random;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.keawe.tools.translations.Translation; import de.keawe.tools.translations.Translation;
import de.srsoftware.tools.Tag; import de.srsoftware.tools.Tag;
@ -37,6 +39,8 @@ public abstract class BaseClass implements Constants{
private static final char[] HEX_CHARS = "0123456789ABCDEF".toCharArray(); private static final char[] HEX_CHARS = "0123456789ABCDEF".toCharArray();
protected Id id = null; protected Id id = null;
protected String notes; protected String notes;
public static final Logger LOG = LoggerFactory.getLogger(BaseClass.class);
private BaseClass parent; private BaseClass parent;
public static class Context { public static class Context {
@ -145,7 +149,7 @@ public abstract class BaseClass implements Constants{
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
internalId = md5sum(new Date()); internalId = ""+new Date().getTime();
} }
@ -351,6 +355,7 @@ public abstract class BaseClass implements Constants{
} }
protected Object update(HashMap<String, String> params) { protected Object update(HashMap<String, String> params) {
LOG.debug("update: {}",params);
if (params.containsKey(NOTES)) notes = params.get(NOTES).trim(); if (params.containsKey(NOTES)) notes = params.get(NOTES).trim();
return this; return this;
} }

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

@ -125,8 +125,17 @@ public abstract class Action extends BaseClass {
public String toString() { public String toString() {
return t(getClass().getSimpleName()); return t(getClass().getSimpleName());
} }
@Override
protected Object update(HashMap<String, String> params) { protected Object update(HashMap<String, String> params) {
return t("Nothing changed"); super.update(params);
BaseClass parent = parent();
if (isNull(parent)) return properties();
if (parent instanceof ActionList) {
ActionList al = (ActionList) parent;
return al.parent().properties();
}
return parent.properties();
} }
} }

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

@ -83,14 +83,11 @@ public class SetSignal extends Action {
}; };
@Override @Override
protected Object update(HashMap<String, String> params) { public Object update(HashMap<String, String> params) {
LOG.debug("update: {}",params);
Tile tile = plan.get(new Id(params.get(SIGNAL)), false); Tile tile = plan.get(new Id(params.get(SIGNAL)), false);
if (tile instanceof Signal) signal = (Signal) tile; if (tile instanceof Signal) signal = (Signal) tile;
String st = params.get(Signal.STATE); String st = params.get(Signal.STATE);
if (isSet(st)) state = st; if (isSet(st)) state = st;
return properties(); return super.update(params);
} }
} }

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

@ -5,7 +5,6 @@ import java.util.List;
import org.json.JSONObject; import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.BaseClass; import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Window; import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset; import de.srsoftware.web4rail.tags.Fieldset;
@ -59,7 +58,6 @@ public class SetSpeed extends Action{
@Override @Override
protected Object update(HashMap<String, String> params) { protected Object update(HashMap<String, String> params) {
LOG.debug("update: {}",params);
String error = null; String error = null;
String ms = params.get(MAX_SPEED); String ms = params.get(MAX_SPEED);
if (ms == null) { if (ms == null) {
@ -76,7 +74,7 @@ public class SetSpeed extends Action{
error = t("Not a valid number!"); error = t("Not a valid number!");
} }
} }
Window win = properties(); if (isSet(error)) return error;
return new Tag("span").content(error).addTo(win); return super.update(params);
} }
} }

Loading…
Cancel
Save