From b965c256e86dd14b8baf607f4456da58f6f1d21a Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 30 Aug 2016 13:16:41 +0300 Subject: [PATCH] Move and duplicate client side and state to compatibility package * Calendar * CheckBox * CustomField * Label * RichTextArea * TextField * TextArea Change-Id: Iba8915195e4d205fb4db9a4df5d96a4a10ab2f96 --- .../com/vaadin/v7/client/ui/VCalendar.java | 2 +- .../vaadin/v7/client/ui/VCustomComponent.java | 30 ++++++++++ .../java/com/vaadin/v7/client/ui/VLabel.java | 60 +++++++++++++++++++ .../com/vaadin/v7/client/ui/VScrollTable.java | 1 - .../com/vaadin/v7/client/ui/VTextField.java | 2 +- .../client/ui/calendar/CalendarConnector.java | 10 ++-- .../client/ui/calendar/VCalendarAction.java | 4 +- .../ui/calendar/schedule/CalendarEvent.java | 2 +- .../calendar/schedule/DateCellDayEvent.java | 2 +- .../client/ui/calendar/schedule/DateUtil.java | 2 +- .../ui/calendar/schedule/SimpleDayCell.java | 2 +- .../client/ui/calendar/schedule/WeekGrid.java | 2 +- .../client/ui/checkbox/CheckBoxConnector.java | 4 +- .../ui/customfield/CustomFieldConnector.java | 2 +- .../v7/client/ui/label/LabelConnector.java | 2 +- .../richtextarea/RichTextAreaConnector.java | 2 +- .../ui/textfield/TextFieldConnector.java | 8 +-- .../com/vaadin/v7/ui/AbstractTextField.java | 12 ++-- .../main/java/com/vaadin/v7/ui/Calendar.java | 8 +-- .../main/java/com/vaadin/v7/ui/CheckBox.java | 4 +- .../java/com/vaadin/v7/ui/RichTextArea.java | 2 +- .../main/java/com/vaadin/v7/ui/TextArea.java | 2 +- .../calendar/CalendarComponentEvents.java | 2 +- .../handler/BasicBackwardHandler.java | 2 +- .../calendar/handler/BasicForwardHandler.java | 2 +- .../richtextarea/RichTextAreaStateTest.java | 2 +- .../shared/ui/calendar/CalendarClientRpc.java | 2 +- .../shared/ui/calendar/CalendarEventId.java | 2 +- .../shared/ui/calendar/CalendarServerRpc.java | 2 +- .../v7}/shared/ui/calendar/CalendarState.java | 2 +- .../v7}/shared/ui/calendar/DateConstants.java | 2 +- .../shared/ui/checkbox/CheckBoxServerRpc.java | 26 ++++++++ .../v7/shared/ui/checkbox/CheckBoxState.java | 26 ++++++++ .../v7/shared/ui/label/ContentMode.java | 0 .../vaadin/v7/shared/ui/label/LabelState.java | 0 .../ui/textarea/LegacyTextAreaState.java | 6 +- .../shared/ui/textarea/RichTextAreaState.java | 6 +- .../v7/shared/ui/textarea/TextAreaState.java | 4 +- .../ui/textfield/AbstractTextFieldState.java | 4 +- .../textfield/LegacyTextFieldConstants.java | 2 +- .../main/java/com/vaadin/server/FontIcon.java | 2 +- .../LabelEmbeddedClickThroughForTable.java | 4 +- .../TableClickAndDragOnIconAndComponents.java | 2 +- .../TableMatchesMouseDownMouseUpElement.java | 4 +- .../client/ClientRpcClassWidget.java | 2 +- .../widgetset/client/DummyLabelConnector.java | 2 +- .../MissingFromDefaultWidgetsetConnector.java | 2 +- .../tests/widgetset/client/VIdTestLabel.java | 2 +- .../grid/GridBasicClientFeaturesWidget.java | 2 +- 49 files changed, 210 insertions(+), 69 deletions(-) create mode 100644 compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCustomComponent.java create mode 100644 compatibility-client/src/main/java/com/vaadin/v7/client/ui/VLabel.java rename {shared/src/main/java/com/vaadin => compatibility-shared/src/main/java/com/vaadin/v7}/shared/ui/calendar/CalendarClientRpc.java (94%) rename {shared/src/main/java/com/vaadin => compatibility-shared/src/main/java/com/vaadin/v7}/shared/ui/calendar/CalendarEventId.java (97%) rename {shared/src/main/java/com/vaadin => compatibility-shared/src/main/java/com/vaadin/v7}/shared/ui/calendar/CalendarServerRpc.java (97%) rename {shared/src/main/java/com/vaadin => compatibility-shared/src/main/java/com/vaadin/v7}/shared/ui/calendar/CalendarState.java (98%) rename {shared/src/main/java/com/vaadin => compatibility-shared/src/main/java/com/vaadin/v7}/shared/ui/calendar/DateConstants.java (96%) create mode 100644 compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxServerRpc.java create mode 100644 compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java rename {shared => compatibility-shared}/src/main/java/com/vaadin/v7/shared/ui/label/ContentMode.java (100%) rename {shared => compatibility-shared}/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java (100%) rename {shared/src/main/java/com/vaadin/shared/v7 => compatibility-shared/src/main/java/com/vaadin/v7/shared}/ui/textarea/LegacyTextAreaState.java (85%) rename {shared/src/main/java/com/vaadin => compatibility-shared/src/main/java/com/vaadin/v7}/shared/ui/textarea/RichTextAreaState.java (80%) rename shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyAbstractTextFieldState.java => compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java (91%) rename {shared/src/main/java/com/vaadin/shared/v7 => compatibility-shared/src/main/java/com/vaadin/v7/shared}/ui/textfield/LegacyTextFieldConstants.java (96%) diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java index dbe42ce1e9..9130a3faec 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java @@ -31,7 +31,6 @@ import com.google.gwt.user.client.ui.DockPanel; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ui.dd.VHasDropHandler; -import com.vaadin.shared.ui.calendar.DateConstants; import com.vaadin.v7.client.ui.calendar.schedule.CalendarDay; import com.vaadin.v7.client.ui.calendar.schedule.CalendarEvent; import com.vaadin.v7.client.ui.calendar.schedule.DayToolbar; @@ -42,6 +41,7 @@ import com.vaadin.v7.client.ui.calendar.schedule.SimpleWeekToolbar; import com.vaadin.v7.client.ui.calendar.schedule.WeekGrid; import com.vaadin.v7.client.ui.calendar.schedule.WeeklyLongEvents; import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarDropHandler; +import com.vaadin.v7.shared.ui.calendar.DateConstants; /** * Client side implementation for Calendar diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCustomComponent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCustomComponent.java new file mode 100644 index 0000000000..fc76e269ac --- /dev/null +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCustomComponent.java @@ -0,0 +1,30 @@ +/* + * 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.client.ui; + +import com.google.gwt.user.client.ui.SimplePanel; + +public class VCustomComponent extends SimplePanel { + + private static final String CLASSNAME = "v-customcomponent"; + + public VCustomComponent() { + super(); + setStyleName(CLASSNAME); + } + +} diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VLabel.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VLabel.java new file mode 100644 index 0000000000..ebe28c0d31 --- /dev/null +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VLabel.java @@ -0,0 +1,60 @@ +/* + * 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.client.ui; + +import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.ui.HTML; +import com.vaadin.client.Util; +import com.vaadin.client.VTooltip; + +public class VLabel extends HTML { + + public static final String CLASSNAME = "v-label"; + private static final String CLASSNAME_UNDEFINED_WIDTH = "v-label-undef-w"; + + public VLabel() { + super(); + setStyleName(CLASSNAME); + sinkEvents(VTooltip.TOOLTIP_EVENTS); + } + + public VLabel(String text) { + super(text); + setStyleName(CLASSNAME); + } + + @Override + public void onBrowserEvent(Event event) { + super.onBrowserEvent(event); + if (event.getTypeInt() == Event.ONLOAD) { + Util.notifyParentOfSizeChange(this, true); + event.stopPropagation(); + return; + } + } + + @Override + public void setWidth(String width) { + super.setWidth(width); + if (width == null || width.equals("")) { + setStyleName(getElement(), CLASSNAME_UNDEFINED_WIDTH, true); + } else { + setStyleName(getElement(), CLASSNAME_UNDEFINED_WIDTH, false); + } + } + +} diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java index 252f78ca86..524e7f88cf 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java @@ -102,7 +102,6 @@ import com.vaadin.client.ui.TouchScrollDelegate; import com.vaadin.client.ui.TreeAction; import com.vaadin.client.ui.VContextMenu; import com.vaadin.client.ui.VEmbedded; -import com.vaadin.client.ui.VLabel; import com.vaadin.client.ui.VOverlay; import com.vaadin.client.ui.dd.DDUtil; import com.vaadin.client.ui.dd.VAbstractDropHandler; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java index 9fb529ff20..36d272644e 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java @@ -37,7 +37,7 @@ import com.vaadin.client.BrowserInfo; import com.vaadin.client.WidgetUtil; import com.vaadin.client.ui.Field; import com.vaadin.shared.EventId; -import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants; +import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants; /** * This class represents a basic text input field with one row. diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java index 6ce348d0d0..ea3aa49833 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java @@ -45,11 +45,6 @@ import com.vaadin.client.ui.ActionOwner; import com.vaadin.client.ui.SimpleManagedLayout; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.shared.ui.calendar.CalendarClientRpc; -import com.vaadin.shared.ui.calendar.CalendarEventId; -import com.vaadin.shared.ui.calendar.CalendarServerRpc; -import com.vaadin.shared.ui.calendar.CalendarState; -import com.vaadin.shared.ui.calendar.DateConstants; import com.vaadin.v7.client.ui.VCalendar; import com.vaadin.v7.client.ui.VCalendar.BackwardListener; import com.vaadin.v7.client.ui.VCalendar.DateClickListener; @@ -72,6 +67,11 @@ import com.vaadin.v7.client.ui.calendar.schedule.DateCell.DateCellSlot; import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarDropHandler; import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarMonthDropHandler; import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarWeekDropHandler; +import com.vaadin.v7.shared.ui.calendar.CalendarClientRpc; +import com.vaadin.v7.shared.ui.calendar.CalendarEventId; +import com.vaadin.v7.shared.ui.calendar.CalendarServerRpc; +import com.vaadin.v7.shared.ui.calendar.CalendarState; +import com.vaadin.v7.shared.ui.calendar.DateConstants; import com.vaadin.v7.ui.Calendar; /** diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/VCalendarAction.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/VCalendarAction.java index a5c54e5c4a..9e81ea22dc 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/VCalendarAction.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/VCalendarAction.java @@ -19,9 +19,9 @@ import java.util.Date; import com.google.gwt.i18n.client.DateTimeFormat; import com.vaadin.client.ui.Action; -import com.vaadin.shared.ui.calendar.CalendarServerRpc; -import com.vaadin.shared.ui.calendar.DateConstants; import com.vaadin.v7.client.ui.calendar.schedule.CalendarEvent; +import com.vaadin.v7.shared.ui.calendar.CalendarServerRpc; +import com.vaadin.v7.shared.ui.calendar.DateConstants; /** * Action performed by the calendar diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/CalendarEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/CalendarEvent.java index dfb84f3788..abb657c4b4 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/CalendarEvent.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/CalendarEvent.java @@ -18,7 +18,7 @@ package com.vaadin.v7.client.ui.calendar.schedule; import java.util.Date; import com.google.gwt.i18n.client.DateTimeFormat; -import com.vaadin.shared.ui.calendar.DateConstants; +import com.vaadin.v7.shared.ui.calendar.DateConstants; /** * A client side implementation of a calendar event diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCellDayEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCellDayEvent.java index 52c4e56a21..5695365db8 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCellDayEvent.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateCellDayEvent.java @@ -42,7 +42,7 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.HorizontalPanel; import com.vaadin.client.WidgetUtil; -import com.vaadin.shared.ui.calendar.DateConstants; +import com.vaadin.v7.shared.ui.calendar.DateConstants; /** * Internally used by the calendar diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateUtil.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateUtil.java index b8abb31262..d0ed6f9149 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateUtil.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/DateUtil.java @@ -18,7 +18,7 @@ package com.vaadin.v7.client.ui.calendar.schedule; import java.util.Date; import com.google.gwt.i18n.client.DateTimeFormat; -import com.vaadin.shared.ui.calendar.DateConstants; +import com.vaadin.v7.shared.ui.calendar.DateConstants; /** * Utility class for {@link Date} operations diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/SimpleDayCell.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/SimpleDayCell.java index eb206824ec..f671d7c21d 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/SimpleDayCell.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/SimpleDayCell.java @@ -38,8 +38,8 @@ import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ui.FocusableFlowPanel; -import com.vaadin.shared.ui.calendar.DateConstants; import com.vaadin.v7.client.ui.VCalendar; +import com.vaadin.v7.shared.ui.calendar.DateConstants; /** * A class representing a single cell within the calendar in month-view diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/WeekGrid.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/WeekGrid.java index 687333e4b8..736c5d873f 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/WeekGrid.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/schedule/WeekGrid.java @@ -32,8 +32,8 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.DateTimeService; import com.vaadin.client.WidgetUtil; -import com.vaadin.shared.ui.calendar.DateConstants; import com.vaadin.v7.client.ui.VCalendar; +import com.vaadin.v7.shared.ui.calendar.DateConstants; /** * diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/checkbox/CheckBoxConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/checkbox/CheckBoxConnector.java index 67e83a754f..5d103e419f 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/checkbox/CheckBoxConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/checkbox/CheckBoxConnector.java @@ -31,9 +31,9 @@ import com.vaadin.client.ui.VCheckBox; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc; -import com.vaadin.shared.ui.checkbox.CheckBoxState; import com.vaadin.v7.client.ui.AbstractFieldConnector; +import com.vaadin.v7.shared.ui.checkbox.CheckBoxServerRpc; +import com.vaadin.v7.shared.ui.checkbox.CheckBoxState; import com.vaadin.v7.ui.CheckBox; @Connect(CheckBox.class) diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java index 33495a399d..9da418279d 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java @@ -25,8 +25,8 @@ import com.vaadin.client.ConnectorHierarchyChangeEvent; import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler; import com.vaadin.client.HasComponentsConnector; import com.vaadin.client.ui.AbstractFieldConnector; -import com.vaadin.client.ui.VCustomComponent; import com.vaadin.shared.ui.Connect; +import com.vaadin.v7.client.ui.VCustomComponent; import com.vaadin.v7.ui.CustomField; @Connect(value = CustomField.class) diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/label/LabelConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/label/LabelConnector.java index d8c35a275d..7e37aa5f77 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/label/LabelConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/label/LabelConnector.java @@ -21,9 +21,9 @@ import com.vaadin.client.Profiler; import com.vaadin.client.WidgetUtil; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentConnector; -import com.vaadin.client.ui.VLabel; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.v7.client.ui.VLabel; import com.vaadin.v7.shared.ui.label.LabelState; import com.vaadin.v7.ui.Label; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/richtextarea/RichTextAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/richtextarea/RichTextAreaConnector.java index fc96e9b16f..0bdf78fa3a 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/richtextarea/RichTextAreaConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/richtextarea/RichTextAreaConnector.java @@ -23,10 +23,10 @@ import com.vaadin.client.UIDL; import com.vaadin.client.ui.SimpleManagedLayout; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.shared.ui.textarea.RichTextAreaState; import com.vaadin.shared.util.SharedUtil; import com.vaadin.v7.client.ui.AbstractFieldConnector; import com.vaadin.v7.client.ui.VRichTextArea; +import com.vaadin.v7.shared.ui.textarea.RichTextAreaState; import com.vaadin.v7.ui.RichTextArea; @Connect(value = RichTextArea.class, loadStyle = LoadStyle.LAZY) diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java index 34f6c7068a..2bb9b37fc8 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java @@ -25,9 +25,9 @@ import com.vaadin.client.Util; import com.vaadin.client.ui.AbstractFieldConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; -import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants; import com.vaadin.v7.client.ui.VTextField; +import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState; +import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants; import com.vaadin.v7.ui.TextField; @Deprecated @@ -36,8 +36,8 @@ public class TextFieldConnector extends AbstractFieldConnector implements Paintable { @Override - public LegacyAbstractTextFieldState getState() { - return (LegacyAbstractTextFieldState) super.getState(); + public AbstractTextFieldState getState() { + return (AbstractTextFieldState) super.getState(); } @Override diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java index f534662583..f72ee383e5 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java @@ -30,14 +30,14 @@ import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.FocusNotifier; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; -import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.v7.event.FieldEvents.TextChangeEvent; import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.v7.event.FieldEvents.TextChangeNotifier; +import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState; +import com.vaadin.v7.shared.ui.textfield.LegacyTextFieldConstants; @Deprecated public abstract class AbstractTextField extends AbstractField implements @@ -99,13 +99,13 @@ public abstract class AbstractTextField extends AbstractField implements } @Override - protected LegacyAbstractTextFieldState getState() { - return (LegacyAbstractTextFieldState) super.getState(); + protected AbstractTextFieldState getState() { + return (AbstractTextFieldState) super.getState(); } @Override - protected LegacyAbstractTextFieldState getState(boolean markAsDirty) { - return (LegacyAbstractTextFieldState) super.getState(markAsDirty); + protected AbstractTextFieldState getState(boolean markAsDirty) { + return (AbstractTextFieldState) super.getState(markAsDirty); } @Override diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java index 5c6e0de421..cb0ce7d220 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java @@ -49,16 +49,16 @@ import com.vaadin.event.dd.TargetDetails; import com.vaadin.server.KeyMapper; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.shared.ui.calendar.CalendarEventId; -import com.vaadin.shared.ui.calendar.CalendarServerRpc; -import com.vaadin.shared.ui.calendar.CalendarState; -import com.vaadin.shared.ui.calendar.DateConstants; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.util.BeanItemContainer; +import com.vaadin.v7.shared.ui.calendar.CalendarEventId; +import com.vaadin.v7.shared.ui.calendar.CalendarServerRpc; +import com.vaadin.v7.shared.ui.calendar.CalendarState; +import com.vaadin.v7.shared.ui.calendar.DateConstants; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvent; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java index 84488bc875..47323f001c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java @@ -27,11 +27,11 @@ import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc; -import com.vaadin.shared.ui.checkbox.CheckBoxState; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.v7.data.Property; +import com.vaadin.v7.shared.ui.checkbox.CheckBoxServerRpc; +import com.vaadin.v7.shared.ui.checkbox.CheckBoxState; public class CheckBox extends AbstractField { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java index e7a790a2cc..15887e0fb0 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java @@ -22,10 +22,10 @@ import org.jsoup.nodes.Element; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.shared.ui.textarea.RichTextAreaState; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.v7.data.Property; +import com.vaadin.v7.shared.ui.textarea.RichTextAreaState; /** * A simple RichTextArea to edit HTML format text. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java index 852dd76c2c..b1f50859d6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java @@ -18,10 +18,10 @@ package com.vaadin.v7.ui; import org.jsoup.nodes.Element; -import com.vaadin.shared.v7.ui.textarea.LegacyTextAreaState; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignFormatter; import com.vaadin.v7.data.Property; +import com.vaadin.v7.shared.ui.textarea.LegacyTextAreaState; /** * A text field that supports multi line editing. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java index 14494eedbe..ea892a6b9d 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java @@ -20,8 +20,8 @@ import java.lang.reflect.Method; import java.util.Date; import java.util.EventListener; -import com.vaadin.shared.ui.calendar.CalendarEventId; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.shared.ui.calendar.CalendarEventId; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java index 956db6b179..3f38d19a4f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java @@ -18,7 +18,7 @@ package com.vaadin.v7.ui.components.calendar.handler; import java.util.Calendar; import java.util.Date; -import com.vaadin.shared.ui.calendar.DateConstants; +import com.vaadin.v7.shared.ui.calendar.DateConstants; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java index d71958536e..aa13c650ef 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java @@ -18,7 +18,7 @@ package com.vaadin.v7.ui.components.calendar.handler; import java.util.Calendar; import java.util.Date; -import com.vaadin.shared.ui.calendar.DateConstants; +import com.vaadin.v7.shared.ui.calendar.DateConstants; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler; diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java index 56a60de396..131dfa329b 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.richtextarea; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.textarea.RichTextAreaState; +import com.vaadin.v7.shared.ui.textarea.RichTextAreaState; import com.vaadin.v7.ui.RichTextArea; /** diff --git a/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarClientRpc.java similarity index 94% rename from shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarClientRpc.java index d6856662a4..20b9a3663a 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarClientRpc.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.calendar; +package com.vaadin.v7.shared.ui.calendar; import com.vaadin.shared.communication.ClientRpc; diff --git a/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarEventId.java similarity index 97% rename from shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarEventId.java index b010c9bded..a0de1e52ec 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarEventId.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.calendar; +package com.vaadin.v7.shared.ui.calendar; import java.io.Serializable; diff --git a/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarServerRpc.java similarity index 97% rename from shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarServerRpc.java index 645c153092..15a3af55ca 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarServerRpc.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.calendar; +package com.vaadin.v7.shared.ui.calendar; import com.vaadin.shared.annotations.Delayed; import com.vaadin.shared.communication.ServerRpc; diff --git a/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java similarity index 98% rename from shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java index 8664c6366f..df62f84bbd 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.calendar; +package com.vaadin.v7.shared.ui.calendar; import java.util.List; diff --git a/shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/DateConstants.java similarity index 96% rename from shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/DateConstants.java index 83408d013b..a7c609cc4e 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/DateConstants.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.calendar; +package com.vaadin.v7.shared.ui.calendar; import java.io.Serializable; diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxServerRpc.java new file mode 100644 index 0000000000..606bdb3fa3 --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxServerRpc.java @@ -0,0 +1,26 @@ +/* + * 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.checkbox; + +import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.annotations.Delayed; +import com.vaadin.shared.communication.ServerRpc; + +public interface CheckBoxServerRpc extends ServerRpc { + @Delayed + public void setChecked(boolean checked, + MouseEventDetails mouseEventDetails); +} diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java new file mode 100644 index 0000000000..58b52ee97c --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java @@ -0,0 +1,26 @@ +/* + * 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.checkbox; + +import com.vaadin.shared.AbstractFieldState; + +public class CheckBoxState extends AbstractFieldState { + { + primaryStyleName = "v-checkbox"; + } + + public boolean checked = false; +} diff --git a/shared/src/main/java/com/vaadin/v7/shared/ui/label/ContentMode.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/ContentMode.java similarity index 100% rename from shared/src/main/java/com/vaadin/v7/shared/ui/label/ContentMode.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/ContentMode.java diff --git a/shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java similarity index 100% rename from shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java diff --git a/shared/src/main/java/com/vaadin/shared/v7/ui/textarea/LegacyTextAreaState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/LegacyTextAreaState.java similarity index 85% rename from shared/src/main/java/com/vaadin/shared/v7/ui/textarea/LegacyTextAreaState.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/LegacyTextAreaState.java index a3aa758499..bb851832c3 100644 --- a/shared/src/main/java/com/vaadin/shared/v7/ui/textarea/LegacyTextAreaState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/LegacyTextAreaState.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.v7.ui.textarea; +package com.vaadin.v7.shared.ui.textarea; import com.vaadin.shared.annotations.DelegateToWidget; import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; +import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState; @Deprecated -public class LegacyTextAreaState extends LegacyAbstractTextFieldState { +public class LegacyTextAreaState extends AbstractTextFieldState { { primaryStyleName = "v-textarea"; } diff --git a/shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/RichTextAreaState.java similarity index 80% rename from shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/RichTextAreaState.java index 1d5512d3fd..9d24c4410b 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/RichTextAreaState.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.textarea; +package com.vaadin.v7.shared.ui.textarea; -import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; +import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState; /** * @@ -23,7 +23,7 @@ import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; * * @since 7.6 */ -public class RichTextAreaState extends LegacyAbstractTextFieldState { +public class RichTextAreaState extends AbstractTextFieldState { { primaryStyleName = "v-richtextarea"; diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/TextAreaState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/TextAreaState.java index 8735136085..aa403032a8 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/TextAreaState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textarea/TextAreaState.java @@ -17,10 +17,10 @@ package com.vaadin.v7.shared.ui.textarea; import com.vaadin.shared.annotations.DelegateToWidget; import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; +import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState; @Deprecated -public class TextAreaState extends LegacyAbstractTextFieldState { +public class TextAreaState extends AbstractTextFieldState { { primaryStyleName = "v-textarea"; } diff --git a/shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyAbstractTextFieldState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java similarity index 91% rename from shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyAbstractTextFieldState.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java index 48c7decdd4..c25694ff2e 100644 --- a/shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyAbstractTextFieldState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.v7.ui.textfield; +package com.vaadin.v7.shared.ui.textfield; import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.annotations.NoLayout; @Deprecated -public class LegacyAbstractTextFieldState extends AbstractFieldState { +public class AbstractTextFieldState extends AbstractFieldState { { primaryStyleName = "v-textfield"; } diff --git a/shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyTextFieldConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/LegacyTextFieldConstants.java similarity index 96% rename from shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyTextFieldConstants.java rename to compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/LegacyTextFieldConstants.java index 5162f4cf90..f2f91ea87b 100644 --- a/shared/src/main/java/com/vaadin/shared/v7/ui/textfield/LegacyTextFieldConstants.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/LegacyTextFieldConstants.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.v7.ui.textfield; +package com.vaadin.v7.shared.ui.textfield; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/server/FontIcon.java b/server/src/main/java/com/vaadin/server/FontIcon.java index 68a6f40269..c7aeec2987 100644 --- a/server/src/main/java/com/vaadin/server/FontIcon.java +++ b/server/src/main/java/com/vaadin/server/FontIcon.java @@ -16,8 +16,8 @@ package com.vaadin.server; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.v7.shared.ui.label.ContentMode; /** * A font icon is a type of icon that is made by displaying one character from a diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index 7b6f9c858f..a72fe7b722 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -5,11 +5,11 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; -import com.vaadin.ui.Label; import com.vaadin.v7.data.Item; import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; -import com.vaadin.shared.ui.label.ContentMode; +import com.vaadin.v7.shared.ui.label.ContentMode; +import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.Table; public class LabelEmbeddedClickThroughForTable extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java index 717d1a1548..925d39f46b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java @@ -10,11 +10,11 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; -import com.vaadin.ui.Label; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails; +import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.ColumnGenerator; import com.vaadin.v7.ui.Table.RowHeaderMode; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java index 1842449a57..664cc39ed1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java @@ -6,10 +6,10 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; -import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Item; -import com.vaadin.shared.ui.label.ContentMode; +import com.vaadin.v7.shared.ui.label.ContentMode; +import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.Table; public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java index 6c0ebada45..946c952304 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.widgetset.client; -import com.vaadin.client.ui.VLabel; import com.vaadin.shared.ui.MediaControl; +import com.vaadin.v7.client.ui.VLabel; public class ClientRpcClassWidget extends VLabel implements MediaControl { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java index 8287125f8f..327113b886 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java @@ -18,9 +18,9 @@ package com.vaadin.tests.widgetset.client; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentConnector; -import com.vaadin.client.ui.VLabel; import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.DummyLabel; +import com.vaadin.v7.client.ui.VLabel; /** * Dummy connector just to cause {@link LabelState} to be used to test #8683 diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java index 775dbd5db4..d036e2a6ae 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java @@ -16,9 +16,9 @@ package com.vaadin.tests.widgetset.client; import com.vaadin.client.ui.AbstractComponentConnector; -import com.vaadin.client.ui.VLabel; import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; +import com.vaadin.v7.client.ui.VLabel; @Connect(MissingFromDefaultWidgetsetComponent.class) public class MissingFromDefaultWidgetsetConnector diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java index 9271f562b7..c1bb4c314a 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java @@ -1,6 +1,6 @@ package com.vaadin.tests.widgetset.client; -import com.vaadin.client.ui.VLabel; +import com.vaadin.v7.client.ui.VLabel; /** * Client-side implementation for IdTestLabel (#10179). diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java index 7edba039e1..0921c868c1 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java @@ -46,13 +46,13 @@ import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.data.DataSource; import com.vaadin.client.data.DataSource.RowHandle; -import com.vaadin.client.ui.VLabel; import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget.Data; import com.vaadin.v7.client.renderers.DateRenderer; import com.vaadin.v7.client.renderers.HtmlRenderer; import com.vaadin.v7.client.renderers.NumberRenderer; import com.vaadin.v7.client.renderers.Renderer; import com.vaadin.v7.client.renderers.TextRenderer; +import com.vaadin.v7.client.ui.VLabel; import com.vaadin.v7.client.widget.grid.CellReference; import com.vaadin.v7.client.widget.grid.CellStyleGenerator; import com.vaadin.v7.client.widget.grid.DetailsGenerator; -- 2.39.5