From a747b927e417f40aa57afdab4d0ddb68438caf74 Mon Sep 17 00:00:00 2001
From: Yuriy Artamonov <artamonov@haulmont.com>
Date: Tue, 17 Feb 2015 08:49:49 +0000
Subject: [PATCH] Deprecate cuba.web.useNativeButtons in 5.3, remove from 5.4
 #PL-4918

---
 .../web/src/com/haulmont/cuba/web/WebConfig.java    |  7 -------
 .../haulmont/cuba/web/gui/components/WebButton.java | 13 ++-----------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/modules/web/src/com/haulmont/cuba/web/WebConfig.java b/modules/web/src/com/haulmont/cuba/web/WebConfig.java
index fa07fd3181..36079bbbc2 100644
--- a/modules/web/src/com/haulmont/cuba/web/WebConfig.java
+++ b/modules/web/src/com/haulmont/cuba/web/WebConfig.java
@@ -73,13 +73,6 @@ public interface WebConfig extends Config {
     @DefaultInt(7)
     int getMaxTabCount();
 
-    /**
-     * @return Whether to use native HTML buttons
-     */
-    @Property("cuba.web.useNativeButtons")
-    @DefaultBoolean(false)
-    boolean getUseNativeButtons();
-
     /**
      * @return Request execution time in seconds, after which a message log will be logged.
      */
diff --git a/modules/web/src/com/haulmont/cuba/web/gui/components/WebButton.java b/modules/web/src/com/haulmont/cuba/web/gui/components/WebButton.java
index 4765ed96a8..0599b90fad 100644
--- a/modules/web/src/com/haulmont/cuba/web/gui/components/WebButton.java
+++ b/modules/web/src/com/haulmont/cuba/web/gui/components/WebButton.java
@@ -4,13 +4,9 @@
  */
 package com.haulmont.cuba.web.gui.components;
 
-import com.haulmont.cuba.core.global.AppBeans;
-import com.haulmont.cuba.core.global.Configuration;
 import com.haulmont.cuba.gui.components.Action;
 import com.haulmont.cuba.gui.components.Button;
-import com.haulmont.cuba.web.WebConfig;
 import com.haulmont.cuba.web.toolkit.ui.CubaButton;
-import com.vaadin.ui.NativeButton;
 import org.apache.commons.lang.StringUtils;
 
 import java.beans.PropertyChangeEvent;
@@ -20,7 +16,7 @@ import java.beans.PropertyChangeListener;
  * @author abramov
  * @version $Id$
  */
-public class WebButton extends WebAbstractComponent<com.vaadin.ui.Button> implements Button {
+public class WebButton extends WebAbstractComponent<CubaButton> implements Button {
 
     public static final String ICON_STYLE = "icon";
 
@@ -29,12 +25,7 @@ public class WebButton extends WebAbstractComponent<com.vaadin.ui.Button> implem
     protected PropertyChangeListener actionPropertyChangeListener;
 
     public WebButton() {
-        Configuration configuration = AppBeans.get(Configuration.NAME);
-        if (configuration.getConfig(WebConfig.class).getUseNativeButtons()) {
-            component = new NativeButton();
-        } else {
-            component = new CubaButton();
-        }
+        component = new CubaButton();
         component.addClickListener(new com.vaadin.ui.Button.ClickListener() {
             @Override
             public void buttonClick(com.vaadin.ui.Button.ClickEvent event) {