From 41e29dd2e32d8ca70bfcec25a1883f7965e53296 Mon Sep 17 00:00:00 2001
From: elmot <elmot@vaadin.com>
Date: Mon, 2 May 2016 12:40:41 +0300
Subject: [PATCH] Documentation fix for null representation (#13221)

Change-Id: Ib532fbd9efd587080a75155139ae1a7a219c1003
---
 all/src/main/templates/release-notes.html                 | 3 +++
 server/src/main/java/com/vaadin/ui/AbstractTextField.java | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/all/src/main/templates/release-notes.html b/all/src/main/templates/release-notes.html
index 6c522ef4d6..712295f432 100644
--- a/all/src/main/templates/release-notes.html
+++ b/all/src/main/templates/release-notes.html
@@ -100,6 +100,9 @@
                 (<a href="http://dev.vaadin.com/ticket/19683">#19683</a>)</li>
             <li>Vaadin can now automatically use default widgetset AppWidgetset optionally generated
                 by the latest Vaadin Maven plug-in (<a href="http://dev.vaadin.com/ticket/19675">#19675</a>)</li>
+            <li>Default <code>null</code> representation is changed to an empty string
+                (<a href="http://dev.vaadin.com/ticket/13221">#13221</a>,
+                 <a href="http://dev.vaadin.com/ticket/12877">#12877</a>)</li>
         </ul>
 
         <p>
diff --git a/server/src/main/java/com/vaadin/ui/AbstractTextField.java b/server/src/main/java/com/vaadin/ui/AbstractTextField.java
index ce1d6f638d..0d16127e69 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractTextField.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractTextField.java
@@ -814,7 +814,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     /**
-     * @since 7.6
+     * @since 7.7
      * @return the default value used for nullRepresentation
      */
     public static String getNullRepresentationDefault() {
@@ -824,7 +824,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     /**
      * A static helper to define the default value used for nullRepresentation.
      * <p>
-     * In 7.6 the infamous default value "null" for
+     * In 7.7 the infamous default value "null" for
      * AbstractTextField.nullRepresentation was changed to "", which may cause
      * unexpected issues in certain applications that don't tackle null values.
      * If there are several places in your application that depend on the old
@@ -834,7 +834,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
      * "com.vaadin.nullrepresentationlegacymode" (before AbstractTextField class
      * is loaded by your class loader).
      * 
-     * @since 7.6
+     * @since 7.7
      * @param nullRepresentationString
      *            the value that will be used as a default for
      *            {@link AbstractTextField#getNullRepresentation()} in new
-- 
2.39.5