# HG changeset patch
# User gernotbelger
# Date 1525438213 -7200
# Node ID 2be202a8cb893034ba1b0d7ab41db423aad8314d
# Parent 95643dffd006411eef111c0a2b9321ed3dd1c708
local merge
diff -r 95643dffd006 -r 2be202a8cb89 artifacts/doc/conf/artifacts/sinfo.xml
--- a/artifacts/doc/conf/artifacts/sinfo.xml Fri May 04 13:36:01 2018 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml Fri May 04 14:50:13 2018 +0200
@@ -226,21 +226,57 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
diff -r 95643dffd006 -r 2be202a8cb89 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/YearChoice.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/YearChoice.java Fri May 04 13:36:01 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/YearChoice.java Fri May 04 14:50:13 2018 +0200
@@ -8,16 +8,27 @@
package org.dive4elements.river.artifacts.sinfo.collision;
-import org.dive4elements.river.artifacts.states.BooleanChoiceState;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dive4elements.river.artifacts.states.RadioSelect;
/**
* @author Ingo Weinzierl
*/
-public class YearChoice extends BooleanChoiceState {
-
+public class YearChoice extends RadioSelect {
private static final long serialVersionUID = 1L;
public YearChoice() {
- super("option", "active", "inactive"); // TODO: RADIO-Btn-Impl
+ super();
+ }
+
+ @Override
+ protected List makeEntries() {
+ final List entries = new ArrayList<>();
+ entries.add("state.sinfo.year");
+ entries.add("state.sinfo.epoch");
+ return entries;
+
}
}
\ No newline at end of file
diff -r 95643dffd006 -r 2be202a8cb89 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties Fri May 04 13:36:01 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties Fri May 04 14:50:13 2018 +0200
@@ -75,6 +75,13 @@
state.minfo.t_per_a = t/a
state.minfo.m3_per_a = m\u00b3/a
+state.sinfo.year_epoch = Year/Epoch
+state.sinfo.year=Year
+state.sinfo.epoch=Epoch
+state.sinfo.riverside.left = Linkes Ufer
+state.sinfo.riverside.right = Rechtes Ufer
+state.sinfo.riverside.both = Beide Ufer
+
year=Year
epoch=Epoch
off_epoch = off. Epochs