From 71a2653431d2dc244492f67e09d679e65b319630 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 25 Aug 2016 10:35:31 +0300 Subject: Move ComboBox shared classes to vaadin-compatibility-shared Change-Id: Icdb0ddc011e8749f4c3f159d2ecd94e4c564d28f --- .../com/vaadin/v7/client/ui/VFilterSelect.java | 2 +- .../v7/client/ui/combobox/ComboBoxConnector.java | 4 +- .../main/java/com/vaadin/v7/ui/AbstractSelect.java | 2 +- .../src/main/java/com/vaadin/v7/ui/ComboBox.java | 6 +- .../combobox/ComboBoxDeclarativeTest.java | 2 +- .../component/combobox/ComboBoxStateTest.java | 2 +- .../server/components/ComboBoxValueChangeTest.java | 2 +- .../v7/shared/ui/combobox/ComboBoxConstants.java | 27 +++++++++ .../v7/shared/ui/combobox/ComboBoxServerRpc.java | 53 ++++++++++++++++++ .../v7/shared/ui/combobox/ComboBoxState.java | 65 ++++++++++++++++++++++ .../v7/shared/ui/combobox/FilteringMode.java | 20 +++++++ .../shared/ui/combobox/ComboBoxConstants.java | 27 --------- .../shared/ui/combobox/ComboBoxServerRpc.java | 53 ------------------ .../vaadin/shared/ui/combobox/ComboBoxState.java | 65 ---------------------- .../vaadin/shared/ui/combobox/FilteringMode.java | 20 ------- .../com/vaadin/tests/TestSizeableIncomponents.java | 2 +- .../tests/components/calendar/CalendarTest.java | 2 +- .../ComboBoxCombinedWithEnterShortcut.java | 2 +- .../components/combobox/ComboBoxNavigation.java | 2 +- .../combobox/ComboBoxReapperingOldValue.java | 2 +- .../combobox/ComboBoxSuggestionPageLength.java | 2 +- .../components/combobox/ComboBoxTabWhenFilter.java | 2 +- .../components/combobox/ComboBoxValueInput.java | 2 +- .../tests/components/combobox/ComboBoxes2.java | 2 +- .../components/datefield/DateFieldTimezone.java | 2 +- .../vaadin/tests/components/select/EnumSelect.java | 2 +- .../sqlcontainer/ComboBoxUpdateProblem.java | 2 +- .../TableQueryWithNonUniqueFirstPrimaryKey.java | 2 +- .../com/vaadin/tests/themes/valo/CalendarTest.java | 2 +- 29 files changed, 189 insertions(+), 189 deletions(-) create mode 100644 compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxConstants.java create mode 100644 compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxServerRpc.java create mode 100644 compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxState.java create mode 100644 compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/FilteringMode.java delete mode 100644 shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java delete mode 100644 shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxServerRpc.java delete mode 100644 shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java delete mode 100644 shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java index adf360ccdb..0f52215a90 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java @@ -84,9 +84,9 @@ import com.vaadin.client.ui.menubar.MenuBar; import com.vaadin.client.ui.menubar.MenuItem; import com.vaadin.shared.AbstractComponentState; import com.vaadin.shared.ui.ComponentStateUtil; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.shared.util.SharedUtil; import com.vaadin.v7.client.ui.combobox.ComboBoxConnector; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; /** * Client side implementation of the Select component. diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/combobox/ComboBoxConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/combobox/ComboBoxConnector.java index f9790bb94e..95cde287ba 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/combobox/ComboBoxConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/combobox/ComboBoxConnector.java @@ -29,12 +29,12 @@ import com.vaadin.client.ui.SimpleManagedLayout; import com.vaadin.shared.EventId; import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.combobox.ComboBoxServerRpc; -import com.vaadin.shared.ui.combobox.ComboBoxState; import com.vaadin.v7.client.ui.AbstractFieldConnector; import com.vaadin.v7.client.ui.VFilterSelect; import com.vaadin.v7.client.ui.VFilterSelect.DataReceivedHandler; import com.vaadin.v7.client.ui.VFilterSelect.FilterSelectSuggestion; +import com.vaadin.v7.shared.ui.combobox.ComboBoxServerRpc; +import com.vaadin.v7.shared.ui.combobox.ComboBoxState; import com.vaadin.v7.ui.ComboBox; @Connect(ComboBox.class) diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java index e184cd0998..e30d666ea0 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java @@ -43,7 +43,6 @@ import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; import com.vaadin.server.VaadinSession; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.shared.ui.select.AbstractSelectState; import com.vaadin.ui.Component; @@ -60,6 +59,7 @@ import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.data.util.converter.Converter; import com.vaadin.v7.data.util.converter.Converter.ConversionException; import com.vaadin.v7.event.DataBoundTransferable; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.data.util.converter.ConverterUtil; /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java index 50b6ac505c..08a17151b7 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java @@ -33,12 +33,12 @@ import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.shared.ui.combobox.ComboBoxServerRpc; -import com.vaadin.shared.ui.combobox.ComboBoxState; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.ui.Component; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.shared.ui.combobox.ComboBoxServerRpc; +import com.vaadin.v7.shared.ui.combobox.ComboBoxState; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; /** * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java index 09dc1378e9..1e32e1dd1a 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java @@ -17,8 +17,8 @@ package com.vaadin.v7.tests.server.component.combobox; import org.junit.Test; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.design.DeclarativeTestBase; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; public class ComboBoxDeclarativeTest extends DeclarativeTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java index 1e0233f76a..83febabf43 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.combobox; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.combobox.ComboBoxState; +import com.vaadin.v7.shared.ui.combobox.ComboBoxState; import com.vaadin.v7.ui.ComboBox; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java index 51007e0f8e..dbba1a0e9f 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java @@ -4,8 +4,8 @@ import org.junit.Before; import com.vaadin.server.ServerRpcManager; import com.vaadin.server.ServerRpcMethodInvocation; -import com.vaadin.shared.ui.combobox.ComboBoxServerRpc; import com.vaadin.tests.server.components.AbstractFieldValueChangeTestBase; +import com.vaadin.v7.shared.ui.combobox.ComboBoxServerRpc; import com.vaadin.v7.ui.AbstractField; import com.vaadin.v7.ui.ComboBox; diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxConstants.java new file mode 100644 index 0000000000..4e79ab35fb --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxConstants.java @@ -0,0 +1,27 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.v7.shared.ui.combobox; + +import java.io.Serializable; + +@Deprecated +public class ComboBoxConstants implements Serializable { + @Deprecated + public static final String ATTR_INPUTPROMPT = "prompt"; + @Deprecated + public static final String ATTR_NO_TEXT_INPUT = "noInput"; + +} diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxServerRpc.java new file mode 100644 index 0000000000..f3dca9d6fb --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxServerRpc.java @@ -0,0 +1,53 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.v7.shared.ui.combobox; + +import com.vaadin.shared.communication.ServerRpc; + +/** + * Client to server RPC interface for ComboBox. + * + * @since + */ +public interface ComboBoxServerRpc extends ServerRpc { + /** + * Create a new item in the combo box. This method can only be used when the + * ComboBox is configured to allow the creation of new items by the user. + * + * @param itemValue + * user entered string value for the new item + */ + public void createNewItem(String itemValue); + + /** + * Set the current selection. + * + * @param item + * the id of a single item or null to deselect the current value + */ + public void setSelectedItem(String item); + + /** + * Request the server to send a page of the item list. + * + * @param filter + * filter string interpreted according to the current filtering + * mode + * @param page + * zero based page number + */ + public void requestPage(String filter, int page); +} diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxState.java new file mode 100644 index 0000000000..bbab911309 --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/ComboBoxState.java @@ -0,0 +1,65 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.v7.shared.ui.combobox; + +import com.vaadin.shared.ui.select.AbstractSelectState; + +/** + * Shared state for the ComboBox component. + * + * @since 7.0 + */ +public class ComboBoxState extends AbstractSelectState { + { + primaryStyleName = "v-filterselect"; + } + + /** + * If text input is not allowed, the ComboBox behaves like a pretty + * NativeSelect - the user can not enter any text and clicking the text + * field opens the drop down with options. + * + * @since + */ + public boolean textInputAllowed = true; + + /** + * A textual prompt that is displayed when the select would otherwise be + * empty, to prompt the user for input. + * + * @since + */ + public String inputPrompt = null; + + /** + * Number of items to show per page or 0 to disable paging. + */ + public int pageLength = 10; + + /** + * Current filtering mode (look for match of the user typed string in the + * beginning of the item caption or anywhere in the item caption). + */ + public FilteringMode filteringMode = FilteringMode.STARTSWITH; + + /** + * Suggestion pop-up's width as a CSS string. By using relative units (e.g. + * "50%") it's possible to set the popup's width relative to the ComboBox + * itself. + */ + public String suggestionPopupWidth = null; + +} diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/FilteringMode.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/FilteringMode.java new file mode 100644 index 0000000000..382f509b80 --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/combobox/FilteringMode.java @@ -0,0 +1,20 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.v7.shared.ui.combobox; + +public enum FilteringMode { + OFF, STARTSWITH, CONTAINS; +} diff --git a/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java deleted file mode 100644 index 3ff57eb324..0000000000 --- a/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2016 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.combobox; - -import java.io.Serializable; - -@Deprecated -public class ComboBoxConstants implements Serializable { - @Deprecated - public static final String ATTR_INPUTPROMPT = "prompt"; - @Deprecated - public static final String ATTR_NO_TEXT_INPUT = "noInput"; - -} diff --git a/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxServerRpc.java deleted file mode 100644 index 68052fc2de..0000000000 --- a/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxServerRpc.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2000-2016 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.combobox; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * Client to server RPC interface for ComboBox. - * - * @since - */ -public interface ComboBoxServerRpc extends ServerRpc { - /** - * Create a new item in the combo box. This method can only be used when the - * ComboBox is configured to allow the creation of new items by the user. - * - * @param itemValue - * user entered string value for the new item - */ - public void createNewItem(String itemValue); - - /** - * Set the current selection. - * - * @param item - * the id of a single item or null to deselect the current value - */ - public void setSelectedItem(String item); - - /** - * Request the server to send a page of the item list. - * - * @param filter - * filter string interpreted according to the current filtering - * mode - * @param page - * zero based page number - */ - public void requestPage(String filter, int page); -} diff --git a/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java deleted file mode 100644 index a1afceeba3..0000000000 --- a/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2000-2016 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.combobox; - -import com.vaadin.shared.ui.select.AbstractSelectState; - -/** - * Shared state for the ComboBox component. - * - * @since 7.0 - */ -public class ComboBoxState extends AbstractSelectState { - { - primaryStyleName = "v-filterselect"; - } - - /** - * If text input is not allowed, the ComboBox behaves like a pretty - * NativeSelect - the user can not enter any text and clicking the text - * field opens the drop down with options. - * - * @since - */ - public boolean textInputAllowed = true; - - /** - * A textual prompt that is displayed when the select would otherwise be - * empty, to prompt the user for input. - * - * @since - */ - public String inputPrompt = null; - - /** - * Number of items to show per page or 0 to disable paging. - */ - public int pageLength = 10; - - /** - * Current filtering mode (look for match of the user typed string in the - * beginning of the item caption or anywhere in the item caption). - */ - public FilteringMode filteringMode = FilteringMode.STARTSWITH; - - /** - * Suggestion pop-up's width as a CSS string. By using relative units (e.g. - * "50%") it's possible to set the popup's width relative to the ComboBox - * itself. - */ - public String suggestionPopupWidth = null; - -} diff --git a/shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java deleted file mode 100644 index edfca722a1..0000000000 --- a/shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2000-2016 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.combobox; - -public enum FilteringMode { - OFF, STARTSWITH, CONTAINS; -} diff --git a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java index 2849be80d6..92dda09f97 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java +++ b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java @@ -23,7 +23,6 @@ import java.util.Iterator; import com.vaadin.server.LegacyApplication; import com.vaadin.server.ThemeResource; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -38,6 +37,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.Table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java index 7989e42597..7bab92a513 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java @@ -26,7 +26,6 @@ import com.vaadin.annotations.Theme; import com.vaadin.data.Binder; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -47,6 +46,7 @@ import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.data.fieldgroup.FieldGroup; import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException; import com.vaadin.v7.data.util.BeanItem; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Calendar.TimeFormat; import com.vaadin.v7.ui.ComboBox; diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java index 5e7b5befc5..4938f24241 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.combobox; import com.vaadin.event.ShortcutAction.KeyCode; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; public class ComboBoxCombinedWithEnterShortcut extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java index fb7a6a35c3..2a1889e7d9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.combobox; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.components.TestBase; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; public class ComboBoxNavigation extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index 6e6d77c635..4de60b5748 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -1,7 +1,6 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.LegacyApplication; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; @@ -9,6 +8,7 @@ import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; @SuppressWarnings("serial") diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java index 06b97bd7bb..c25d2b43fa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java @@ -19,8 +19,8 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; public class ComboBoxSuggestionPageLength extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java index 024a5f0ade..0d6b9e669c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.TextField; /** diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java index 4592bbae0b..79fd46bc5e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; public class ComboBoxValueInput extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java index f5ab454737..b92b6c18a6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.combobox; import java.util.LinkedHashMap; import com.vaadin.server.Resource; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.components.select.AbstractSelectTestCase; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.ComboBox.ItemStyleGenerator; diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java index ccf50ca77e..33d1c659f0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java @@ -8,13 +8,13 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.DateField; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; public class DateFieldTimezone extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java b/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java index 93908bf015..bb0d3517ad 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java @@ -18,8 +18,8 @@ package com.vaadin.tests.components.select; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.Tree; diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java index d25919a9f2..496f2fb8f5 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java @@ -1,8 +1,8 @@ package com.vaadin.tests.containers.sqlcontainer; import com.vaadin.server.LegacyApplication; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.ui.LegacyWindow; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; /** diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java index c4aa32bd25..c9bbb9af3c 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java @@ -5,7 +5,6 @@ import java.sql.SQLException; import java.sql.Statement; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; @@ -15,6 +14,7 @@ import com.vaadin.v7.data.util.sqlcontainer.SQLContainer; import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java index 2cc53bbdd1..617ec7d584 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java @@ -10,7 +10,6 @@ import com.vaadin.annotations.Theme; import com.vaadin.data.Binder; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; -import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.calendar.CalendarTestEvent; import com.vaadin.ui.Alignment; @@ -33,6 +32,7 @@ import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.data.fieldgroup.FieldGroup; import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException; import com.vaadin.v7.data.util.BeanItem; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Calendar.TimeFormat; import com.vaadin.v7.ui.ComboBox; -- cgit v1.2.3