[PATCH 2 of 2] Merge

[Wald Commits]

# HG changeset patch
# User gernotbelger
# Date 1532424375 -7200
# Node ID 913bc7d1d2a897487d7f340881f4d1f52998df03
# Parent  fe207a8699f76eddee8fd7aa7b19a71c9ef2a031
# Parent  3729434f6dec70ba96012225da5bfbed5077d827
Merge

diff -r fe207a8699f7 -r 913bc7d1d2a8 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstWQPanel.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstWQPanel.java	Tue Jul 24 10:51:09 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstWQPanel.java	Tue Jul 24 11:26:15 2018 +0200
@@ -151,9 +151,9 @@
 
                 final String value = e.getValue().toString();
                 if (value.equals(String.valueOf(mode.UD))) {
+                    enableUD();
+                } else if (value.equals(String.valueOf(mode.Q))) {
                     enableQ();
-                } else if (value.equals(String.valueOf(mode.Q))) {
-                    enableUD();
                 }
             }
         });
@@ -161,17 +161,17 @@
     }
 
     private void enableUD() {
+        BunduWstWQPanel.this.list.setVisibility(Visibility.HIDDEN);
+        BunduWstWQPanel.this.udForm.setVisibility(Visibility.VISIBLE);
+        BunduWstWQPanel.this.tabs.disable();
+    }
+
+    private void enableQ() {
         BunduWstWQPanel.this.list.setVisibility(Visibility.VISIBLE);
         BunduWstWQPanel.this.udForm.setVisibility(Visibility.HIDDEN);
         BunduWstWQPanel.this.tabs.enable();
     }
 
-    private void enableQ() {
-        BunduWstWQPanel.this.list.setVisibility(Visibility.HIDDEN);
-        BunduWstWQPanel.this.udForm.setVisibility(Visibility.VISIBLE);
-        BunduWstWQPanel.this.tabs.disable();
-    }
-
     private final String getMode() {
         return (String) this.radiogroup.getValue();
     }
@@ -246,9 +246,11 @@
             errors.addAll(this.validateRange(this.qranges));
         } else if (getMode().equals(mode.UD.toString())) {
             try {
-                if (this.udInputItem.validate()) {
+                if (!this.udInputItem.validate()) {
                     errors.add(this.udInputItem.getRequiredMessage());
                 }
+                final int test = Integer.valueOf(this.udInputItem.getValueAsString());// irgendwie klappt die validator-validierung nur bei der eingabe von
+                                                                                      // ganzzahlen :-(
             }
             catch (final NumberFormatException e) {
                 errors.add(this.MSG.error_invalid_integer());