summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/Button.java
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-10-07 11:08:15 +0300
committerVaadin Code Review <review@vaadin.com>2015-10-07 08:42:42 +0000
commitbe3cc216f2826a50a66c4473c638a7137ee823de (patch)
tree86edc6ca4fc8e629d540efeda2e22cf797d2415d /server/src/com/vaadin/ui/Button.java
parent5d6a3c9aed4d9912364db4dbef179a8d64304b89 (diff)
downloadvaadin-framework-be3cc216f2826a50a66c4473c638a7137ee823de.tar.gz
vaadin-framework-be3cc216f2826a50a66c4473c638a7137ee823de.zip
Rename DesignFormatter.unencodeFromTextNode to decodeFromTextNode
Change-Id: I9e20fa21ae2f503a8d34740fcef860c66b369c7b
Diffstat (limited to 'server/src/com/vaadin/ui/Button.java')
-rw-r--r--server/src/com/vaadin/ui/Button.java2
1 files changed, 1 insertions, 1 deletions
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")) {