fixing ugly 'null' representation also for MinMaxTextField and fixing wrong label

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/MinMaxTextField.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/MinMaxTextField.java
index db96d6168a5278659006aa2e39116773f8244038..ebe6e3621f11f272051fea81aad6d9e241cb7502 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/MinMaxTextField.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/common/MinMaxTextField.java
@@ -50,7 +50,7 @@ public class MinMaxTextField extends HorizontalLayout {
      */
     protected void initFields(String unitOfMeasure) {
         textField = new TextFieldNFix("free text");
-        maxField = new MaxTextField(String.format("min (%s)", unitOfMeasure));
+        maxField = new MaxTextField(String.format("max (%s)", unitOfMeasure));
         minField = new TextFieldNFix(String.format("min (%s)", unitOfMeasure)) {
 
             private static final long serialVersionUID = -536012841624056585L;
@@ -128,7 +128,7 @@ public class MinMaxTextField extends HorizontalLayout {
         super.setEnabled(enabled);
     }
 
-    class MaxTextField extends TextField {
+    class MaxTextField extends TextFieldNFix {
 
         private static final long serialVersionUID = -536012841624056585L;