Make ColorPicker an AbstractField<Color>

Remove old ColorSelector API from ColorPicker.
The various subcomponents still implement ColorSelector for now.

Change-Id: If0e30eda71c5fe30f7128056a65fb127a4953089

server/src/main/java/com/vaadin/ui/ColorPicker.java

@@ -63,5 +63,4 @@ protected void setDefaultStyles() {
         setPrimaryStyleName(STYLENAME_BUTTON);
         addStyleName(STYLENAME_DEFAULT);
     }
-
 }

server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java

@@ -34,7 +34,7 @@ public void testAllAbstractColorPickerFeatures() {
                 + " history-visibility=false textfield-visibility=false />";
         ColorPicker colorPicker = new ColorPicker();
         int colorInt = Integer.parseInt("fafafa", 16);
-        colorPicker.setColor(new Color(colorInt));
+        colorPicker.setValue(new Color(colorInt));
         colorPicker.setDefaultCaptionEnabled(true);
         colorPicker.setPosition(100, 100);
         colorPicker.setPopupStyle(PopupStyle.POPUP_SIMPLE);
@@ -63,7 +63,7 @@ public void testAllAbstractColorPickerAreaFeatures() {
                 + " history-visibility=false textfield-visibility=false />";
         AbstractColorPicker colorPicker = new ColorPickerArea();
         int colorInt = Integer.parseInt("fafafa", 16);
-        colorPicker.setColor(new Color(colorInt));
+        colorPicker.setValue(new Color(colorInt));
         colorPicker.setDefaultCaptionEnabled(true);
         colorPicker.setPosition(100, 100);
         colorPicker.setPopupStyle(PopupStyle.POPUP_SIMPLE);

shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java

@@ -15,15 +15,15 @@
  */
 package com.vaadin.shared.ui.colorpicker;
 
-import com.vaadin.shared.AbstractComponentState;
+import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.annotations.DelegateToWidget;
 
 /**
  * Default shared state implementation for AbstractColorPicker.
  *
  * @since 7.0.0
  */
-public class ColorPickerState extends AbstractComponentState {
+public class ColorPickerState extends AbstractFieldState {
     {
         primaryStyleName = "v-colorpicker";
     }
@@ -35,5 +35,4 @@ public class ColorPickerState extends AbstractComponentState {
     public String color = null;
 
     public boolean showDefaultCaption;
-
 }

uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java

@@ -4,8 +4,6 @@
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.ColorPickerArea;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.VerticalLayout;
 
 /**
  * Tests the HSV tab slider values when initially opening the tab.
@@ -14,18 +12,11 @@ public class ColorPickerHsvTest extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        VerticalLayout layout = new VerticalLayout();
-        layout.setMargin(true);
-        setContent(layout);
-
-        layout.addComponent(new Label(
-                "HSV initial values when opening the tab for the first time"));
         ColorPickerArea colorpicker = new ColorPickerArea();
-        colorpicker.setColor(new Color(Integer.parseInt("00b4f0", 16)));
+        colorpicker.setValue(new Color(Integer.parseInt("00b4f0", 16)));
         colorpicker.setDefaultCaptionEnabled(false);
         colorpicker.setId("colorpicker");
-        layout.addComponent(colorpicker);
-
+        addComponent(colorpicker);
     }
 
     @Override

uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java

@@ -26,6 +26,8 @@
 
 import javax.imageio.ImageIO;
 
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.data.HasValue.ValueChange;
 import com.vaadin.server.StreamResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.colorpicker.Color;
@@ -42,11 +44,9 @@
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.components.colorpicker.ColorChangeEvent;
-import com.vaadin.ui.components.colorpicker.ColorChangeListener;
 
-public class ColorPickerTestUI extends AbstractTestUI
-        implements ColorChangeListener {
+@Widgetset("com.vaadin.DefaultWidgetSet")
+public class ColorPickerTestUI extends AbstractTestUI {
 
     @Override
     public String getTestDescription() {
@@ -274,14 +274,14 @@ protected void setup(VaadinRequest request) {
         HorizontalLayout layout1 = createHorizontalLayout();
 
         colorpicker1 = new ColorPicker("Foreground", foregroundColor);
-        colorpicker1.setHtmlContentAllowed(true);
-        colorpicker1.addColorChangeListener(this);
+        colorpicker1.setCaptionAsHtml(true);
+        colorpicker1.addValueChangeListener(this::colorChanged);
         colorpicker1.setId("colorpicker1");
         layout1.addComponent(colorpicker1);
         layout1.setComponentAlignment(colorpicker1, Alignment.MIDDLE_CENTER);
 
         colorpicker2 = new ColorPicker("Background", backgroundColor);
-        colorpicker2.addColorChangeListener(this);
+        colorpicker2.addValueChangeListener(this::colorChanged);
         colorpicker2.setId("colorpicker2");
         layout1.addComponent(colorpicker2);
         layout1.setComponentAlignment(colorpicker2, Alignment.MIDDLE_CENTER);
@@ -294,15 +294,15 @@ protected void setup(VaadinRequest request) {
         HorizontalLayout layout2 = createHorizontalLayout();
 
         colorpicker3 = new ColorPicker("Foreground", foregroundColor);
-        colorpicker3.addColorChangeListener(this);
+        colorpicker3.addValueChangeListener(this::colorChanged);
         colorpicker3.setWidth("120px");
         colorpicker3.setCaption("Foreground");
         colorpicker3.setId("colorpicker3");
         layout2.addComponent(colorpicker3);
         layout2.setComponentAlignment(colorpicker3, Alignment.MIDDLE_CENTER);
 
         colorpicker4 = new ColorPicker("Background", backgroundColor);
-        colorpicker4.addColorChangeListener(this);
+        colorpicker4.addValueChangeListener(this::colorChanged);
         colorpicker4.setWidth("120px");
         colorpicker4.setCaption("Background");
         colorpicker4.setId("colorpicker4");
@@ -318,15 +318,15 @@ protected void setup(VaadinRequest request) {
 
         colorpicker5 = new ColorPickerArea("Foreground", foregroundColor);
         colorpicker5.setCaption("Foreground");
-        colorpicker5.addColorChangeListener(this);
+        colorpicker5.addValueChangeListener(this::colorChanged);
         colorpicker5.setId("colorpicker5");
         layout3.addComponent(colorpicker5);
         layout3.setComponentAlignment(colorpicker5, Alignment.MIDDLE_CENTER);
 
         colorpicker6 = new ColorPickerArea("Background", backgroundColor);
         colorpicker6.setCaption("Background");
         colorpicker6.setDefaultCaptionEnabled(false);
-        colorpicker6.addColorChangeListener(this);
+        colorpicker6.addValueChangeListener(this::colorChanged);
         colorpicker6.setId("colorpicker6");
         layout3.addComponent(colorpicker6);
         layout3.setComponentAlignment(colorpicker6, Alignment.MIDDLE_CENTER);
@@ -451,36 +451,35 @@ public void updateDisplay(Color fg, Color bg) {
         display.setSource(imageresource);
     }
 
-    @Override
-    public void colorChanged(ColorChangeEvent event) {
+    private void colorChanged(ValueChange<Color> event) {
         if (event.getSource() == colorpicker1
                 || event.getSource() == colorpicker3
                 || event.getSource() == colorpicker5) {
-            foregroundColor = event.getColor();
+            foregroundColor = event.getValue();
 
             if (event.getSource() != colorpicker1) {
-                colorpicker1.setColor(event.getColor());
+                colorpicker1.setValue(event.getValue());
             }
             if (event.getSource() != colorpicker3) {
-                colorpicker3.setColor(event.getColor());
+                colorpicker3.setValue(event.getValue());
             }
             if (event.getSource() != colorpicker5) {
-                colorpicker5.setColor(event.getColor());
+                colorpicker5.setValue(event.getValue());
             }
 
         } else if (event.getSource() == colorpicker2
                 || event.getSource() == colorpicker4
                 || event.getSource() == colorpicker6) {
-            backgroundColor = event.getColor();
+            backgroundColor = event.getValue();
 
             if (event.getSource() != colorpicker2) {
-                colorpicker2.setColor(event.getColor());
+                colorpicker2.setValue(event.getValue());
             }
             if (event.getSource() != colorpicker4) {
-                colorpicker4.setColor(event.getColor());
+                colorpicker4.setValue(event.getValue());
             }
             if (event.getSource() != colorpicker6) {
-                colorpicker6.setColor(event.getColor());
+                colorpicker6.setValue(event.getValue());
             }
 
         } else {

uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java

@@ -15,17 +15,19 @@
  */
 package com.vaadin.tests.components.colorpicker;
 
+import com.vaadin.annotations.Widgetset;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.ColorPicker;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.ColorPicker;
 
 /**
  * Test for color picker with default caption.
  *
  * @author Vaadin Ltd
  */
+@Widgetset("com.vaadin.DefaultWidgetSet")
 public class DefaultCaptionWidth extends AbstractTestUI {
 
     @Override