8 files changed, 10 insertions, 10 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java
index 3a427562d2..8fab8ec3a0 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/com/vaadin/ui/AbstractSelect.java
@@ -2241,7 +2241,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
         }
 
         String itemId;
-        String caption = DesignFormatter.unencodeFromTextNode(child.html());
+        String caption = DesignFormatter.decodeFromTextNode(child.html());
         if (child.hasAttr("item-id")) {
             itemId = child.attr("item-id");
             addItem(itemId);
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index e5ea05a1d3..5c12f20479 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -584,7 +584,7 @@ public class Button extends AbstractFocusable implements
         } else {
             // content is not intended to be interpreted as HTML,
             // so html entities need to be decoded
-            content = DesignFormatter.unencodeFromTextNode(design.html());
+            content = DesignFormatter.decodeFromTextNode(design.html());
         }
         setCaption(content);
         if (attr.hasKey("icon-alt")) {
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index cee045128f..102b38e588 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -2354,7 +2354,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
                     }
                 } else {
                     // text – need to unescape HTML entities
-                    setText(DesignFormatter.unencodeFromTextNode(cellElement
+                    setText(DesignFormatter.decodeFromTextNode(cellElement
                             .html()));
                 }
             }
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index 0ead70933b..79d9491ae9 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -594,7 +594,7 @@ public class Label extends AbstractComponent implements Property<String>,
         }
         if (innerHtml != null && !"".equals(innerHtml)) {
             if (plainText) {
-                innerHtml = DesignFormatter.unencodeFromTextNode(innerHtml);
+                innerHtml = DesignFormatter.decodeFromTextNode(innerHtml);
             }
             setValue(innerHtml);
         }
diff --git a/server/src/com/vaadin/ui/OptionGroup.java b/server/src/com/vaadin/ui/OptionGroup.java
index 183fc36500..37517bd1f2 100644
--- a/server/src/com/vaadin/ui/OptionGroup.java
+++ b/server/src/com/vaadin/ui/OptionGroup.java
@@ -283,7 +283,7 @@ public class OptionGroup extends AbstractSelect implements
             // like '>', '<' and '&'; in case HTML content is allowed this is
             // undesirable so we need to unencode entities. Entities other than
             // '<' and '>' will be taken care by Jsoup.
-            elem.html(DesignFormatter.unencodeFromTextNode(elem.html()));
+            elem.html(DesignFormatter.decodeFromTextNode(elem.html()));
         }
 
         return elem;
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index f7b0853ce9..62aca78223 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -6217,7 +6217,7 @@ public class Table extends AbstractSelect implements Action.Container,
             }
             Iterator<?> propertyIt = propertyIds.iterator();
             for (Element e : elems) {
-                String columnValue = DesignFormatter.unencodeFromTextNode(e
+                String columnValue = DesignFormatter.decodeFromTextNode(e
                         .html());
                 Object propertyId = propertyIt.next();
                 if (header) {
@@ -6259,7 +6259,7 @@ public class Table extends AbstractSelect implements Action.Container,
         }
         Object[] data = new String[cells.size()];
         for (int c = 0; c < cells.size(); ++c) {
-            data[c] = DesignFormatter.unencodeFromTextNode(cells.get(c).html());
+            data[c] = DesignFormatter.decodeFromTextNode(cells.get(c).html());
         }
 
         Object itemId = addItem(data,
diff --git a/server/src/com/vaadin/ui/TextArea.java b/server/src/com/vaadin/ui/TextArea.java
index c2af125338..d66fbf0668 100644
--- a/server/src/com/vaadin/ui/TextArea.java
+++ b/server/src/com/vaadin/ui/TextArea.java
@@ -146,7 +146,7 @@ public class TextArea extends AbstractTextField {
     @Override
     public void readDesign(Element design, DesignContext designContext) {
         super.readDesign(design, designContext);
-        setValue(DesignFormatter.unencodeFromTextNode(design.html()), false,
+        setValue(DesignFormatter.decodeFromTextNode(design.html()), false,
                 true);
     }
 
diff --git a/server/src/com/vaadin/ui/declarative/DesignFormatter.java b/server/src/com/vaadin/ui/declarative/DesignFormatter.java
index ca537ad59c..3ab0b9c12f 100644
--- a/server/src/com/vaadin/ui/declarative/DesignFormatter.java
+++ b/server/src/com/vaadin/ui/declarative/DesignFormatter.java
@@ -403,11 +403,11 @@ public class DesignFormatter implements Serializable {
      * unencodes more characters than {@link #encodeForTextNode(String)} encodes
      * </p>
      * 
-     * @since 7.5.7
+     * @since
      * @param input
      * @return
      */
-    public static String unencodeFromTextNode(String input) {
+    public static String decodeFromTextNode(String input) {
         return Parser.unescapeEntities(input, false);
     }