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

working on now property dialogs

Browse Source
This commit is contained in:
Stephan Richter
2020-12-02 15:11:46 +01:00
parent 0291523900
commit e8d79b71d9
14 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/srsoftware/web4rail/moving/Car.java
View File

@@ -5,7 +5,6 @@ import java.io.BufferedWriter;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.AbstractMap;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -200,12 +199,12 @@ public class Car extends BaseClass implements Comparable<Car>{
}
@Override
protected Window properties(List<Fieldset> preForm, List<Entry<String, Tag>> formInputs, List<Fieldset> postForm) {
formInputs.add(new AbstractMap.SimpleEntry<>(t("Name"),new Input(NAME,name)));
formInputs.add(new AbstractMap.SimpleEntry<>(t("Stock ID"),new Input(STOCK_ID,stockId)));
formInputs.add(new AbstractMap.SimpleEntry<>(t("Length"),new Input(LENGTH,length).attr("type", "number").addTo(new Tag("span")).content(NBSP+lengthUnit)));
formInputs.add(new AbstractMap.SimpleEntry<>(t("Tag"), new Input(TAGS,String.join(", ", tags))));
formInputs.add(new AbstractMap.SimpleEntry<>(t("Maximum Speed"),new Input(MAX_SPEED, maxSpeed).numeric().addTo(new Tag("span")).content(NBSP+speedUnit)));
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(t("Name"),new Input(NAME,name));
formInputs.add(t("Stock ID"),new Input(STOCK_ID,stockId));
formInputs.add(t("Length"),new Input(LENGTH,length).attr("type", "number").addTo(new Tag("span")).content(NBSP+lengthUnit));
formInputs.add(t("Tag"), new Input(TAGS,String.join(", ", tags)));
formInputs.add(t("Maximum Speed"),new Input(MAX_SPEED, maxSpeed).numeric().addTo(new Tag("span")).content(NBSP+speedUnit));
Fieldset fieldset = new Fieldset(t("Train"));
if (train != null) train.link().addTo(fieldset);

8
src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
View File

@@ -1,13 +1,11 @@
package de.srsoftware.web4rail.moving;
import java.io.IOException;
import java.util.AbstractMap;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.Map.Entry;
import org.json.JSONObject;
@@ -263,14 +261,14 @@ public class Locomotive extends Car implements Constants,Device{
}
@Override
protected Window properties(List<Fieldset> preForm, List<Entry<String, Tag>> formInputs, List<Fieldset> postForm) {
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
preForm.add(cockpit(this));
Tag div = new Tag("div");
for (Protocol proto : Protocol.values()) {
new Radio(PROTOCOL, proto.toString(), t(proto.toString()), proto == this.proto).addTo(div);
}
formInputs.add(new AbstractMap.SimpleEntry<String,Tag>(t("Protocol"),div));
formInputs.add(new AbstractMap.SimpleEntry<String,Tag>(t("Address"),new Input(ADDRESS, address).numeric()));
formInputs.add(t("Protocol"),div);
formInputs.add(t("Address"),new Input(ADDRESS, address).numeric());
return super.properties(preForm, formInputs, postForm);
}

9
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -5,7 +5,6 @@ import java.io.BufferedWriter;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.AbstractMap;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -505,7 +504,7 @@ public class Train extends BaseClass implements Comparable<Train> {
}
@Override
protected Window properties(List<Fieldset> preForm, List<Entry<String, Tag>> formInputs, List<Fieldset> postForm) {
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
Fieldset otherTrainProsps = new Fieldset(t("other train properties"));
Tag propList = new Tag("ul").clazz("proplist");
@@ -546,9 +545,9 @@ public class Train extends BaseClass implements Comparable<Train> {
propList.addTo(otherTrainProsps);
formInputs.add(new AbstractMap.SimpleEntry<>(t("Name"), new Input(NAME,name)));
formInputs.add(new AbstractMap.SimpleEntry<>(t("Push-pull train"),new Checkbox(PUSH_PULL, t("Push-pull train"), pushPull)));
formInputs.add(new AbstractMap.SimpleEntry<>(t("Tags"), new Input(TAGS,String.join(", ", tags))));
formInputs.add(t("Name"), new Input(NAME,name));
formInputs.add(t("Push-pull train"),new Checkbox(PUSH_PULL, t("Push-pull train"), pushPull));
formInputs.add(t("Tags"), new Input(TAGS,String.join(", ", tags)));
preForm.add(Locomotive.cockpit(this));
postForm.add(otherTrainProsps);