# HG changeset patch
# User gernotbelger
# Date 1531394854 -7200
# Node ID 9e6b70cce3376ebe5d618be7ea3051167dd04e57
# Parent 1ec3b891ab02fc24ca91bf03034408cb861d3339
pseudo epoch for salix.historical
diff -r 1ec3b891ab02 -r 9e6b70cce337 artifacts/doc/conf/artifacts/uinfo.xml
--- a/artifacts/doc/conf/artifacts/uinfo.xml Thu Jul 12 12:12:01 2018 +0200
+++ b/artifacts/doc/conf/artifacts/uinfo.xml Thu Jul 12 13:27:34 2018 +0200
@@ -118,7 +118,7 @@
-
+
@@ -132,9 +132,10 @@
-
+
+
diff -r 1ec3b891ab02 -r 9e6b70cce337 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java Thu Jul 12 12:12:01 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java Thu Jul 12 13:27:34 2018 +0200
@@ -37,7 +37,7 @@
@Override
protected String getUIProvider() {
- return "common.load_single_epoch_select";
+ return "uinfo.salix.load_single_year_pseudo_epoch_select";
}
@Override
diff -r 1ec3b891ab02 -r 9e6b70cce337 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java Thu Jul 12 12:12:01 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java Thu Jul 12 13:27:34 2018 +0200
@@ -30,8 +30,8 @@
import org.dive4elements.river.client.client.ui.sinfo.FlowDepthTwinPanel;
import org.dive4elements.river.client.client.ui.sq.SQPeriodPanel;
import org.dive4elements.river.client.client.ui.uinfo.LoadSedimentHeightPanel;
-import org.dive4elements.river.client.client.ui.uinfo.LoadSingleEpochSelect;
import org.dive4elements.river.client.client.ui.uinfo.LoadSingleYearPanel;
+import org.dive4elements.river.client.client.ui.uinfo.LoadSingleYearPseudoEpochPanel;
import org.dive4elements.river.client.client.ui.uinfo.SupraRegionalTablePanel;
import org.dive4elements.river.client.client.ui.uinfo.VegetationzonesTableEditPanel;
import org.dive4elements.river.client.client.ui.uinfo.VegetationzonesTablePanel;
@@ -168,8 +168,8 @@
return new CollisionLoadEpochPanel();
} else if (uiProvider.equals("common.state.load_single_year_select")) {
return new LoadSingleYearPanel();
- } else if (uiProvider.equals("common.load_single_epoch_select")) {
- return new LoadSingleEpochSelect();
+ } else if (uiProvider.equals("uinfo.salix.load_single_year_pseudo_epoch_select")) {
+ return new LoadSingleYearPseudoEpochPanel();
} else if (uiProvider.equals("minfo.sedimentload_sqti_select")) {
return new SedLoadSQTiPanel();
} else if (uiProvider.equals("uinfo.sedimentheight_select")) {
diff -r 1ec3b891ab02 -r 9e6b70cce337 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleEpochSelect.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleEpochSelect.java Thu Jul 12 12:12:01 2018 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
- * Software engineering by Intevation GmbH
- *
- * This file is Free Software under the GNU AGPL (>=v3)
- * and comes with ABSOLUTELY NO WARRANTY! Check out the
- * documentation coming with Dive4Elements River for details.
- */
-
-package org.dive4elements.river.client.client.ui.uinfo;
-
-import org.dive4elements.river.client.client.ui.AbstractEpochPanel;
-import org.dive4elements.river.client.client.ui.PanelHelper;
-import org.dive4elements.river.client.shared.model.DataList;
-
-import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.Label;
-import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.TextItem;
-import com.smartgwt.client.widgets.layout.VLayout;
-
-public class LoadSingleEpochSelect extends AbstractEpochPanel {
-
- private static final long serialVersionUID = 1L;
-
- public LoadSingleEpochSelect() {
- super(Type.single);
- }
-
- @Override
- protected String getDatakey() {
- return "singleepoch";
- }
-
- @Override
- protected Canvas createWidget(final DataList data) {
- final VLayout root = new VLayout();
-
- final Label title = new Label(data.get(0).getDescription());
- title.setHeight("25px");
-
- final DynamicForm form = new DynamicForm();
- form.setNumCols(4);
- final TextItem start = createStartInputItem(this.MSG.from());
- start.setCanEdit(false);
-
- final TextItem end = createEndInputItem(this.MSG.to());
- end.setCanEdit(false);
-
- form.setFields(start, end);
-
- root.addMember(title);
- root.addMember(PanelHelper.getSpacer(10));
- root.addMember(form);
-
- return root;
- }
-
-}
diff -r 1ec3b891ab02 -r 9e6b70cce337 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleYearPseudoEpochPanel.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleYearPseudoEpochPanel.java Thu Jul 12 13:27:34 2018 +0200
@@ -0,0 +1,25 @@
+/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
+ * Software engineering by Intevation GmbH
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+
+package org.dive4elements.river.client.client.ui.uinfo;
+
+public class LoadSingleYearPseudoEpochPanel extends LoadSingleYearPanel {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getDatakey() {
+ return "singleepoch";
+ }
+
+ @Override
+ protected String errorForItemMsg() {
+ return this.MSG.no_data_for_year();// NO DATA FOR EPOCH TODO möglicherweise, wenn der ablauf klar ist
+ }
+
+}
\ No newline at end of file