changeset 9250:b64cf2f5f719

bundu showHint "JJJJ"
author gernotbelger
date Thu, 12 Jul 2018 15:30:32 +0200
parents 600e1ac42049
children 4082b8429353
files artifacts/doc/conf/artifacts/bundu.xml gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleYearPanel.java
diffstat 6 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/bundu.xml	Thu Jul 12 14:15:36 2018 +0200
+++ b/artifacts/doc/conf/artifacts/bundu.xml	Thu Jul 12 15:30:32 2018 +0200
@@ -325,7 +325,7 @@
     </transition>
 
 
-    <state id="state.bundu.yearselect" helpText="state.bundu.yearselect" description="state.bundu.yearselect" state="org.dive4elements.river.artifacts.states.LoadSingleYearSelectState">
+    <state id="state.bundu.yearselect" helpText="state.bundu.yearselect" description="state.bundu.yearselect" state="org.dive4elements.river.artifacts.bundu.bezugswst.LoadSingleYearSelectState">
       <data name="singleyear" type="String" />
     </state>
 
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Jul 12 14:15:36 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Jul 12 15:30:32 2018 +0200
@@ -1570,4 +1570,6 @@
     String uinfo_salix_km_anschluss();
 
     String uinfo_salix_input_complete();
+
+    String common_input_hint_year();
 }
\ No newline at end of file
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Jul 12 14:15:36 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Jul 12 15:30:32 2018 +0200
@@ -89,6 +89,7 @@
 sedimentload_ls = Sediment Load
 welcome = Welcome to Flusshydrologische Software
 welcome_open_or_create = Please open a project from the project list or create a
+common_input_hint_year = YYYY
 
 # Header images
 flysLogo = images/flys_logo.gif
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Jul 12 14:15:36 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Jul 12 15:30:32 2018 +0200
@@ -89,6 +89,7 @@
 sedimentload_ls = Sediment Fracht
 welcome = Willkommen bei der Flusshydrologischen Software
 welcome_open_or_create = Bitte \u00f6ffnen Sie ein bestehendes Projekt aus der Projektliste oder erstellen Sie ein
+common_input_hint_year = JJJJ
 
 # Header images
 flysLogo = images/flys_logo.gif
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java	Thu Jul 12 14:15:36 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java	Thu Jul 12 15:30:32 2018 +0200
@@ -168,6 +168,8 @@
             return new CollisionLoadEpochPanel();
         } else if (uiProvider.equals("common.state.load_single_year_select")) {
             return new LoadSingleYearPanel();
+        } else if (uiProvider.equals("common.state.load_single_year_select.show_hint")) {
+            return new LoadSingleYearPanel(true);
         } else if (uiProvider.equals("uinfo.salix.load_single_year_pseudo_epoch_select")) {
             return new LoadSingleYearPseudoEpochPanel();
         } else if (uiProvider.equals("minfo.sedimentload_sqti_select")) {
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleYearPanel.java	Thu Jul 12 14:15:36 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleYearPanel.java	Thu Jul 12 15:30:32 2018 +0200
@@ -20,11 +20,17 @@
 public class LoadSingleYearPanel extends AbstractSingleItemPanel {
 
     private static final long serialVersionUID = 1L;
+    private boolean showHint = false;
 
     public LoadSingleYearPanel() {
         super(Type.single);
     }
 
+    public LoadSingleYearPanel(final boolean showHint) {
+        super(Type.single);
+        this.showHint = showHint;
+    }
+
     @Override
     protected String getDatakey() {
         return "singleyear";
@@ -46,6 +52,9 @@
         form.setNumCols(4);
 
         final TextItem inputItem = createInputItem("YEAR_INPUT");
+        inputItem.setShowHint(this.showHint);
+        inputItem.setHint(this.MSG.common_input_hint_year());
+        inputItem.setShowHintInField(true);
         inputItem.setShowTitle(false);
         form.setFields(inputItem);
 

http://dive4elements.wald.intevation.org