From 8b91ebd61bf72d4f1fb2925cea073de297da94fa Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 12 Sep 2016 16:36:45 +0300 Subject: Change ColorPicker to use new ComboBox ColorPicker is moved back to vaadin-server now that it no longer requires any old components Change-Id: Iebb34cc0724a4bba6eff53073400e803d9ffddd1 --- .../tests/components/colorpicker/ColorPickerHsvTest.java | 2 +- .../vaadin/tests/components/colorpicker/ColorPickerTestUI.java | 10 +++++----- .../tests/components/colorpicker/DefaultCaptionWidth.java | 2 +- .../src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java | 4 ++-- .../tests/minitutorials/v71beta/CSSInjectWithColorpicker.java | 6 +++--- .../main/java/com/vaadin/tests/themes/valo/ColorPickers.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'uitest') diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java index 14a78fd842..ab77fbf2ba 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java @@ -3,9 +3,9 @@ package com.vaadin.tests.components.colorpicker; import com.vaadin.server.VaadinRequest; 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; -import com.vaadin.v7.ui.ColorPickerArea; /** * Tests the HSV tab slider values when initially opening the tab. diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java index 950634039f..9f9164d582 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java @@ -31,19 +31,19 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.AbstractColorPicker; import com.vaadin.ui.Alignment; import com.vaadin.ui.CheckBox; +import com.vaadin.ui.ColorPicker; +import com.vaadin.ui.ColorPickerArea; import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; -import com.vaadin.v7.ui.AbstractColorPicker; -import com.vaadin.v7.ui.ColorPicker; -import com.vaadin.v7.ui.ColorPickerArea; -import com.vaadin.v7.ui.components.colorpicker.ColorChangeEvent; -import com.vaadin.v7.ui.components.colorpicker.ColorChangeListener; +import com.vaadin.ui.components.colorpicker.ColorChangeEvent; +import com.vaadin.ui.components.colorpicker.ColorChangeListener; public class ColorPickerTestUI extends AbstractTestUI implements ColorChangeListener { diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java index 5b110f0659..300bfd551f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java @@ -18,8 +18,8 @@ package com.vaadin.tests.components.colorpicker; 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.v7.ui.ColorPicker; /** * Test for color picker with default caption. diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java index 918fa1f461..63e2de75d6 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java @@ -21,6 +21,8 @@ import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; +import com.vaadin.ui.ColorPicker; +import com.vaadin.ui.ColorPickerArea; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; import com.vaadin.ui.GridLayout; @@ -30,8 +32,6 @@ import com.vaadin.ui.NativeButton; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.v7.ui.ColorPicker; -import com.vaadin.v7.ui.ColorPickerArea; import com.vaadin.v7.ui.TextField; /** diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java index 9c7fe6378e..72e3e28418 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java @@ -9,19 +9,19 @@ import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Alignment; +import com.vaadin.ui.ColorPicker; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.components.colorpicker.ColorChangeEvent; +import com.vaadin.ui.components.colorpicker.ColorChangeListener; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; -import com.vaadin.v7.ui.ColorPicker; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.TextArea; -import com.vaadin.v7.ui.components.colorpicker.ColorChangeEvent; -import com.vaadin.v7.ui.components.colorpicker.ColorChangeListener; public class CSSInjectWithColorpicker extends UI { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java index 7a7ae821e1..4c764e7fc6 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java @@ -18,12 +18,12 @@ package com.vaadin.tests.themes.valo; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.shared.ui.colorpicker.Color; +import com.vaadin.ui.ColorPicker; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.AbstractColorPicker.PopupStyle; import com.vaadin.ui.themes.ValoTheme; -import com.vaadin.v7.ui.AbstractColorPicker.PopupStyle; -import com.vaadin.v7.ui.ColorPicker; public class ColorPickers extends VerticalLayout implements View { public ColorPickers() { -- cgit v1.2.3