From 3f7c75415bc73ab750f809bde0c5da02f5d8e7c2 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Sat, 13 Dec 2014 12:12:12 +0200
Subject: Support plain-text attribute for Label (#7749)

Change-Id: I4ef210d131f1e616b501468cb94ea518945a3b30
---
 server/src/com/vaadin/ui/Button.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'server/src/com/vaadin/ui/Button.java')

diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index 82666613bb..9a754c24d9 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -686,7 +686,7 @@ public class Button extends AbstractComponent implements
                 def.getTabIndex(), Integer.class));
         // plain-text (default is html)
         setHtmlContentAllowed(!DesignAttributeHandler.readAttribute(
-                "plain-text", attr, false, Boolean.class));
+                DESIGN_ATTR_PLAIN_TEXT, attr, false, Boolean.class));
         setIconAlternateText(DesignAttributeHandler.readAttribute("icon-alt",
                 attr, def.getIconAlternateText(), String.class));
         // click-shortcut
@@ -707,7 +707,7 @@ public class Button extends AbstractComponent implements
     protected Collection<String> getCustomAttributes() {
         Collection<String> result = super.getCustomAttributes();
         result.add("tabindex");
-        result.add("plain-text");
+        result.add(DESIGN_ATTR_PLAIN_TEXT);
         result.add("caption");
         result.add("icon-alt");
         result.add("click-shortcut");
@@ -736,7 +736,7 @@ public class Button extends AbstractComponent implements
                 def.getTabIndex(), Integer.class);
         // plain-text (default is html)
         if (!isHtmlContentAllowed()) {
-            design.attr("plain-text", "");
+            design.attr(DESIGN_ATTR_PLAIN_TEXT, "");
         }
         // icon-alt
         DesignAttributeHandler.writeAttribute("icon-alt", attr,
-- 
cgit v1.2.3