From f2b013e8d6908c6605acb2b7e89a400a6a0f0391 Mon Sep 17 00:00:00 2001
From: Ilia Motornyi <elmot@vaadin.com>
Date: Wed, 4 May 2016 08:31:05 +0000
Subject: Revert "Documentation fix for null representation (#13221)"

This reverts commit 41e29dd2e32d8ca70bfcec25a1883f7965e53296.

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

diff --git a/all/src/main/templates/release-notes.html b/all/src/main/templates/release-notes.html
index 712295f432..6c522ef4d6 100644
--- a/all/src/main/templates/release-notes.html
+++ b/all/src/main/templates/release-notes.html
@@ -100,9 +100,6 @@
                 (<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 0d16127e69..ce1d6f638d 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.7
+     * @since 7.6
      * @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.7 the infamous default value "null" for
+     * In 7.6 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.7
+     * @since 7.6
      * @param nullRepresentationString
      *            the value that will be used as a default for
      *            {@link AbstractTextField#getNullRepresentation()} in new
-- 
cgit v1.2.3