Move read-only to AbstractFieldState (#8514)

Change-Id: I0baea991bd80075d63c5d57e3b07f4e9fcb12676

5 files changed, 19 insertions, 31 deletions

diff --git a/client/src/main/java/com/vaadin/client/ComponentConnector.java b/client/src/main/java/com/vaadin/client/ComponentConnector.java
index c9c793d714..e7f29b3b5b 100644
--- a/client/src/main/java/com/vaadin/client/ComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ComponentConnector.java
@@ -86,15 +86,6 @@ public interface ComponentConnector extends ServerConnector {
     public boolean isRelativeHeight();
 
     /**
-     * Checks if the connector is read only.
-     *
-     * @deprecated This belongs in AbstractFieldConnector, see #8514
-     * @return true
-     */
-    @Deprecated
-    public boolean isReadOnly();
-
-    /**
      * Return true if parent handles caption, false if the paintable handles the
      * caption itself.
      *
diff --git a/client/src/main/java/com/vaadin/client/connectors/AbstractListingConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractListingConnector.java
index 6593b5a0be..b89106307e 100644
--- a/client/src/main/java/com/vaadin/client/connectors/AbstractListingConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/AbstractListingConnector.java
@@ -17,7 +17,7 @@ package com.vaadin.client.connectors;
 
 import com.vaadin.client.connectors.data.HasDataSource;
 import com.vaadin.client.data.DataSource;
-import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.shared.data.DataCommunicatorConstants;
 import com.vaadin.shared.data.selection.SelectionModel;
 import com.vaadin.ui.AbstractListing;
@@ -36,7 +36,7 @@ import elemental.json.JsonValue;
  * @since 8.0
  */
 public abstract class AbstractListingConnector<SELECTIONMODEL extends SelectionModel<?>>
-        extends AbstractComponentConnector implements HasDataSource {
+        extends AbstractFieldConnector implements HasDataSource {
 
     private DataSource<JsonObject> dataSource = null;
 
@@ -64,7 +64,7 @@ public abstract class AbstractListingConnector<SELECTIONMODEL extends SelectionM
 
     /**
      * Returns the selection model instance used.
-     * 
+     *
      * @return the selection model
      */
     public SELECTIONMODEL getSelectionModel() {
@@ -73,7 +73,7 @@ public abstract class AbstractListingConnector<SELECTIONMODEL extends SelectionM
 
     /**
      * Returns the key of the given data row.
-     * 
+     *
      * @param row
      *            the row
      * @return the row key
@@ -84,7 +84,7 @@ public abstract class AbstractListingConnector<SELECTIONMODEL extends SelectionM
 
     /**
      * Returns the data of the given data row.
-     * 
+     *
      * @param row
      *            the row
      * @return the row data
@@ -95,7 +95,7 @@ public abstract class AbstractListingConnector<SELECTIONMODEL extends SelectionM
 
     /**
      * Returns whether the given row is selected.
-     * 
+     *
      * @param row
      *            the row
      * @return {@code true} if the row is selected, {@code false} otherwise
diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java
index 5fff238fd4..c2bf273e7d 100644
--- a/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -628,10 +628,6 @@ public abstract class AbstractComponentConnector extends AbstractConnector
         // Set the core 'v' style name for the widget
         setWidgetStyleName(StyleConstants.UI_WIDGET, true);
 
-        // should be in AbstractFieldConnector ?
-        // add / remove read-only style name
-        setWidgetStyleName("v-readonly", isReadOnly());
-
         // add / remove error style name
         setWidgetStyleNameWithPrefix(primaryStyleName, StyleConstants.ERROR_EXT,
                 null != state.errorMessage);
@@ -730,17 +726,6 @@ public abstract class AbstractComponentConnector extends AbstractConnector
         getWidget().setStyleName(prefix + styleName, add);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.client.ComponentConnector#isReadOnly()
-     */
-    @Override
-    @Deprecated
-    public boolean isReadOnly() {
-        return getState().readOnly;
-    }
-
     @Override
     public LayoutManager getLayoutManager() {
         return LayoutManager.get(getConnection());
diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java
index fde1f548a0..7c6c681485 100644
--- a/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java
@@ -35,8 +35,20 @@ public abstract class AbstractFieldConnector extends AbstractComponentConnector
     protected void updateWidgetStyleNames() {
         super.updateWidgetStyleNames();
 
+        // add / remove read-only style name
+        setWidgetStyleName("v-readonly", isReadOnly());
+
         // add / remove error style name to Fields
         setWidgetStyleNameWithPrefix(getWidget().getStylePrimaryName(),
                 StyleConstants.REQUIRED_EXT, isRequiredIndicatorVisible());
     }
+
+    /**
+     * Checks if the connector is read only.
+     *
+     * @return true
+     */
+    public boolean isReadOnly() {
+        return getState().readOnly;
+    }
 }
diff --git a/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java b/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java
index f84b07d964..73c672c370 100644
--- a/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java
@@ -84,7 +84,7 @@ public class UploadConnector extends AbstractComponentConnector
         }
         getWidget().fu.setName(getWidget().paintableId + "_file");
 
-        if (!isEnabled() || isReadOnly()) {
+        if (!isEnabled()) {
             getWidget().disableUpload();
         } else if (!uidl.getBooleanAttribute("state")) {
             // Enable the button only if an upload is not in progress