diff options
56 files changed, 246 insertions, 82 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ProgressBarRenderer.java b/compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ProgressBarRenderer.java index be4a3d0dfb..94e6d82fea 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ProgressBarRenderer.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/renderers/ProgressBarRenderer.java @@ -16,7 +16,7 @@ package com.vaadin.v7.client.renderers; import com.google.gwt.core.shared.GWT; -import com.vaadin.client.ui.VProgressBar; +import com.vaadin.v7.client.ui.VProgressBar; import com.vaadin.v7.client.widget.grid.RendererCellReference; /** diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java index 632944c48b..b67edfe93c 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroup.java @@ -48,7 +48,7 @@ import com.vaadin.client.WidgetUtil; import com.vaadin.client.ui.Icon; import com.vaadin.client.ui.VCheckBox; import com.vaadin.shared.EventId; -import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; +import com.vaadin.v7.shared.ui.optiongroup.OptionGroupConstants; public class VOptionGroup extends VOptionGroupBase implements FocusHandler, BlurHandler { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressBar.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressBar.java new file mode 100644 index 0000000000..b4c5f7f0f2 --- /dev/null +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressBar.java @@ -0,0 +1,101 @@ +/* + * 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.dom.client.Element; +import com.google.gwt.dom.client.Style.Unit; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.HasEnabled; +import com.google.gwt.user.client.ui.Widget; +import com.vaadin.client.StyleConstants; + +/** + * Widget for showing the current progress of a long running task. + * <p> + * The default mode is to show the current progress internally represented by a + * floating point value between 0 and 1 (inclusive). The progress bar can also + * be in an indeterminate mode showing an animation indicating that the task is + * running but without providing any information about the current progress. + * + * @since 7.1 + * @author Vaadin Ltd + */ +public class VProgressBar extends Widget implements HasEnabled { + + public static final String PRIMARY_STYLE_NAME = "v-progressbar"; + + Element wrapper = DOM.createDiv(); + Element indicator = DOM.createDiv(); + + private boolean indeterminate = false; + private float state = 0.0f; + private boolean enabled; + + public VProgressBar() { + setElement(DOM.createDiv()); + getElement().appendChild(wrapper); + wrapper.appendChild(indicator); + + setStylePrimaryName(PRIMARY_STYLE_NAME); + } + + /* + * (non-Javadoc) + * + * @see + * com.google.gwt.user.client.ui.UIObject#setStylePrimaryName(java.lang. + * String) + */ + @Override + public void setStylePrimaryName(String style) { + super.setStylePrimaryName(style); + indicator.setClassName(getStylePrimaryName() + "-indicator"); + wrapper.setClassName(getStylePrimaryName() + "-wrapper"); + + } + + public void setIndeterminate(boolean indeterminate) { + this.indeterminate = indeterminate; + setStyleName(getStylePrimaryName() + "-indeterminate", indeterminate); + } + + public void setState(float state) { + final int size = Math.round(100 * state); + indicator.getStyle().setWidth(size, Unit.PCT); + } + + public boolean isIndeterminate() { + return indeterminate; + } + + public float getState() { + return state; + } + + @Override + public boolean isEnabled() { + return enabled; + } + + @Override + public void setEnabled(boolean enabled) { + if (this.enabled != enabled) { + this.enabled = enabled; + setStyleName(StyleConstants.DISABLED, !enabled); + } + } +} diff --git a/client/src/main/java/com/vaadin/client/ui/VProgressIndicator.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressIndicator.java index ad46639f64..8feee02a86 100644 --- a/client/src/main/java/com/vaadin/client/ui/VProgressIndicator.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VProgressIndicator.java @@ -14,9 +14,9 @@ * the License. */ -package com.vaadin.client.ui; +package com.vaadin.v7.client.ui; -import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState; +import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorState; /** * 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 524e7f88cf..074e8d23da 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 @@ -113,9 +113,9 @@ import com.vaadin.client.ui.dd.VTransferable; import com.vaadin.shared.AbstractComponentState; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; -import com.vaadin.shared.ui.table.CollapseMenuContent; -import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow; +import com.vaadin.v7.shared.ui.table.CollapseMenuContent; +import com.vaadin.v7.shared.ui.table.TableConstants; /** * VScrollTable diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java index cb07c0b8be..80b83c9504 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTree.java @@ -82,8 +82,8 @@ import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.MouseEventDetails.MouseButton; import com.vaadin.shared.ui.MultiSelectMode; import com.vaadin.shared.ui.dd.VerticalDropLocation; -import com.vaadin.shared.ui.tree.TreeConstants; import com.vaadin.v7.client.ui.tree.TreeConnector; +import com.vaadin.v7.shared.ui.tree.TreeConstants; /** * diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTwinColSelect.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTwinColSelect.java index c11dd7b569..32bc14d330 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTwinColSelect.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTwinColSelect.java @@ -42,7 +42,7 @@ import com.vaadin.client.UIDL; import com.vaadin.client.WidgetUtil; import com.vaadin.client.ui.SubPartAware; import com.vaadin.client.ui.VButton; -import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants; +import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectConstants; public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, MouseDownHandler, DoubleClickHandler, SubPartAware { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java index fdeb2e08dd..53c0c0d06a 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java @@ -21,10 +21,10 @@ import com.vaadin.client.Paintable; import com.vaadin.client.StyleConstants; import com.vaadin.client.UIDL; import com.vaadin.client.ui.VNativeButton; -import com.vaadin.shared.ui.select.AbstractSelectState; import com.vaadin.v7.client.ui.AbstractFieldConnector; import com.vaadin.v7.client.ui.VOptionGroupBase; import com.vaadin.v7.client.ui.VTextField; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; public abstract class OptionGroupBaseConnector extends AbstractFieldConnector implements Paintable { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java index 172c872772..e88a2070bc 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupConnector.java @@ -25,8 +25,8 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.UIDL; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.optiongroup.OptionGroupState; import com.vaadin.v7.client.ui.VOptionGroup; +import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState; import com.vaadin.v7.ui.OptionGroup; @Connect(OptionGroup.class) diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressBarConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressBarConnector.java index 77602a4974..c98d8acaff 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressBarConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressBarConnector.java @@ -17,10 +17,10 @@ package com.vaadin.v7.client.ui.progressindicator; import com.vaadin.client.communication.StateChangeEvent; -import com.vaadin.client.ui.VProgressBar; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.progressindicator.ProgressBarState; import com.vaadin.v7.client.ui.AbstractFieldConnector; +import com.vaadin.v7.client.ui.VProgressBar; +import com.vaadin.v7.shared.ui.progressindicator.ProgressBarState; import com.vaadin.v7.ui.ProgressBar; /** diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressIndicatorConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressIndicatorConnector.java index d70055b3b3..0081ff34f9 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressIndicatorConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/progressindicator/ProgressIndicatorConnector.java @@ -18,11 +18,11 @@ package com.vaadin.v7.client.ui.progressindicator; import com.google.gwt.user.client.Timer; import com.vaadin.client.communication.StateChangeEvent; -import com.vaadin.client.ui.VProgressBar; -import com.vaadin.client.ui.VProgressIndicator; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc; -import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState; +import com.vaadin.v7.client.ui.VProgressBar; +import com.vaadin.v7.client.ui.VProgressIndicator; +import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc; +import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorState; import com.vaadin.v7.ui.ProgressIndicator; /** diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java index 405fdd1393..8cb408fd7a 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java @@ -40,16 +40,16 @@ import com.vaadin.client.WidgetUtil; import com.vaadin.client.ui.PostLayoutListener; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.table.TableConstants; -import com.vaadin.shared.ui.table.TableConstants.Section; import com.vaadin.v7.client.ui.AbstractFieldConnector; import com.vaadin.v7.client.ui.VScrollTable; import com.vaadin.v7.client.ui.VScrollTable.ContextMenuDetails; import com.vaadin.v7.client.ui.VScrollTable.FooterCell; import com.vaadin.v7.client.ui.VScrollTable.HeaderCell; import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow; -import com.vaadin.shared.ui.table.TableServerRpc; -import com.vaadin.shared.ui.table.TableState; +import com.vaadin.v7.shared.ui.table.TableConstants; +import com.vaadin.v7.shared.ui.table.TableServerRpc; +import com.vaadin.v7.shared.ui.table.TableState; +import com.vaadin.v7.shared.ui.table.TableConstants.Section; @Connect(com.vaadin.v7.ui.Table.class) public class TableConnector extends AbstractFieldConnector diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/TreeConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/TreeConnector.java index c9b58da9fc..fd1927e895 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/TreeConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/tree/TreeConnector.java @@ -35,11 +35,11 @@ import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.MultiSelectMode; -import com.vaadin.shared.ui.tree.TreeConstants; -import com.vaadin.shared.ui.tree.TreeServerRpc; -import com.vaadin.shared.ui.tree.TreeState; import com.vaadin.v7.client.ui.VTree; import com.vaadin.v7.client.ui.VTree.TreeNode; +import com.vaadin.v7.shared.ui.tree.TreeConstants; +import com.vaadin.v7.shared.ui.tree.TreeServerRpc; +import com.vaadin.v7.shared.ui.tree.TreeState; import com.vaadin.v7.ui.Tree; @Connect(Tree.class) diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java index 5fbdafe1b7..094bbc0e9b 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java @@ -22,13 +22,13 @@ import com.vaadin.client.UIDL; import com.vaadin.client.WidgetUtil; import com.vaadin.client.ui.FocusableScrollPanel; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.treetable.TreeTableConstants; -import com.vaadin.shared.ui.treetable.TreeTableState; import com.vaadin.v7.client.ui.VTreeTable; import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow; import com.vaadin.v7.client.ui.VTreeTable.PendingNavigationEvent; import com.vaadin.v7.client.ui.VTreeTable.VTreeTableScrollBody.VTreeTableRow; import com.vaadin.v7.client.ui.table.TableConnector; +import com.vaadin.v7.shared.ui.treetable.TreeTableConstants; +import com.vaadin.v7.shared.ui.treetable.TreeTableState; import com.vaadin.v7.ui.TreeTable; @Connect(TreeTable.class) diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/twincolselect/TwinColSelectConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/twincolselect/TwinColSelectConnector.java index 62084366d8..8a8d5559c4 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/twincolselect/TwinColSelectConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/twincolselect/TwinColSelectConnector.java @@ -20,9 +20,9 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.DirectionalManagedLayout; import com.vaadin.client.UIDL; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.twincolselect.TwinColSelectState; import com.vaadin.v7.client.ui.VTwinColSelect; import com.vaadin.v7.client.ui.optiongroup.OptionGroupBaseConnector; +import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState; import com.vaadin.v7.ui.TwinColSelect; @Connect(TwinColSelect.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 e30d666ea0..f522cef77a 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 @@ -44,7 +44,6 @@ import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; import com.vaadin.server.VaadinSession; import com.vaadin.shared.ui.dd.VerticalDropLocation; -import com.vaadin.shared.ui.select.AbstractSelectState; import com.vaadin.ui.Component; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; @@ -60,6 +59,7 @@ 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.shared.ui.select.AbstractSelectState; import com.vaadin.v7.data.util.converter.ConverterUtil; /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java index f4e3415cf5..c85e0ff631 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java @@ -30,11 +30,11 @@ import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; -import com.vaadin.shared.ui.optiongroup.OptionGroupState; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignFormatter; import com.vaadin.v7.data.Container; +import com.vaadin.v7.shared.ui.optiongroup.OptionGroupConstants; +import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState; /** * Configures select to be used as an option group. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java index 444724fcf8..62074a69db 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java @@ -18,10 +18,10 @@ package com.vaadin.v7.ui; import org.jsoup.nodes.Element; -import com.vaadin.shared.ui.progressindicator.ProgressBarState; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.v7.data.Property; +import com.vaadin.v7.shared.ui.progressindicator.ProgressBarState; import com.vaadin.v7.ui.AbstractField; /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java index 8a969f96c3..1f3feb99ed 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressIndicator.java @@ -17,10 +17,10 @@ package com.vaadin.v7.ui; import com.vaadin.shared.communication.PushMode; -import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc; -import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState; import com.vaadin.ui.UI; import com.vaadin.v7.data.Property; +import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc; +import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorState; /** * A {@link ProgressBar} which polls the server for updates. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java index d47f5479f4..33b74df857 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java @@ -54,11 +54,6 @@ import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.MultiSelectMode; -import com.vaadin.shared.ui.table.CollapseMenuContent; -import com.vaadin.shared.ui.table.TableConstants; -import com.vaadin.shared.ui.table.TableConstants.Section; -import com.vaadin.shared.ui.table.TableServerRpc; -import com.vaadin.shared.ui.table.TableState; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.Component; import com.vaadin.ui.HasChildMeasurementHint; @@ -80,6 +75,11 @@ import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier; +import com.vaadin.v7.shared.ui.table.CollapseMenuContent; +import com.vaadin.v7.shared.ui.table.TableConstants; +import com.vaadin.v7.shared.ui.table.TableServerRpc; +import com.vaadin.v7.shared.ui.table.TableState; +import com.vaadin.v7.shared.ui.table.TableConstants.Section; /** * <p> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java index 5744879ea6..87917ffa53 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java @@ -51,9 +51,6 @@ import com.vaadin.server.Resource; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.MultiSelectMode; import com.vaadin.shared.ui.dd.VerticalDropLocation; -import com.vaadin.shared.ui.tree.TreeConstants; -import com.vaadin.shared.ui.tree.TreeServerRpc; -import com.vaadin.shared.ui.tree.TreeState; import com.vaadin.ui.Component; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; @@ -67,6 +64,9 @@ import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier; +import com.vaadin.v7.shared.ui.tree.TreeConstants; +import com.vaadin.v7.shared.ui.tree.TreeServerRpc; +import com.vaadin.v7.shared.ui.tree.TreeState; /** * Tree component. A Tree can be used to select an item (or multiple items) from diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java index 446c9c271c..f9a35f2b46 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java @@ -33,8 +33,6 @@ import org.jsoup.nodes.Element; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.shared.ui.treetable.TreeTableConstants; -import com.vaadin.shared.ui.treetable.TreeTableState; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; @@ -45,6 +43,8 @@ import com.vaadin.v7.data.Container.ItemSetChangeEvent; import com.vaadin.v7.data.util.ContainerHierarchicalWrapper; import com.vaadin.v7.data.util.HierarchicalContainer; import com.vaadin.v7.data.util.HierarchicalContainerOrderedWrapper; +import com.vaadin.v7.shared.ui.treetable.TreeTableConstants; +import com.vaadin.v7.shared.ui.treetable.TreeTableState; import com.vaadin.v7.ui.Tree.CollapseEvent; import com.vaadin.v7.ui.Tree.CollapseListener; import com.vaadin.v7.ui.Tree.ExpandEvent; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java index 68853ddaa1..4766d938ea 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java @@ -20,9 +20,9 @@ import java.util.Collection; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants; -import com.vaadin.shared.ui.twincolselect.TwinColSelectState; import com.vaadin.v7.data.Container; +import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectConstants; +import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState; /** * Multiselect component with two lists: left side for available items and right diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java index cc1c9f8d27..14f03739d1 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.abstractselect; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; import com.vaadin.v7.ui.AbstractSelect; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java index 8a34077e73..d9e31e6bc1 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.listselect; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; import com.vaadin.v7.ui.ListSelect; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java index f15c3aeb1e..85aff22711 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.optiongroup; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.optiongroup.OptionGroupState; +import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState; import com.vaadin.v7.ui.OptionGroup; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java index 162d57c0da..5f9f19f19d 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import com.vaadin.event.ContextClickEvent; import com.vaadin.event.ContextClickEvent.ContextClickListener; -import com.vaadin.shared.ui.table.TableConstants.Section; +import com.vaadin.v7.shared.ui.table.TableConstants.Section; import com.vaadin.v7.ui.Table; public class TableContextClickTest extends Table { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java index 2c993fe03f..f61a027c0a 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.table; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.table.TableState; +import com.vaadin.v7.shared.ui.table.TableState; import com.vaadin.v7.ui.Table; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java index 04673af2bd..4f4bdead4e 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java @@ -12,10 +12,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.shared.ui.tree.TreeState; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.util.HierarchicalContainer; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.shared.ui.tree.TreeState; import com.vaadin.v7.ui.Tree; public class TreeTest { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java index a6948256df..08e77db859 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java @@ -20,8 +20,8 @@ import java.util.EnumSet; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.treetable.TreeTableState; import com.vaadin.v7.ui.Table.RowHeaderMode; +import com.vaadin.v7.shared.ui.treetable.TreeTableState; import com.vaadin.v7.ui.TreeTable; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java index 7479d3f8e6..d2498d9160 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.server.component.twincolselect; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.twincolselect.TwinColSelectState; +import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState; import com.vaadin.v7.ui.TwinColSelect; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java index a5ff142490..5accba796d 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java @@ -20,8 +20,8 @@ import java.util.Collections; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.select.AbstractSelectState; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; public class NativeSelectTest { 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 index bbab911309..5911308111 100644 --- 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 @@ -15,7 +15,7 @@ */ package com.vaadin.v7.shared.ui.combobox; -import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; /** * Shared state for the ComboBox component. diff --git a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java index ef22967906..6c0a74b7ea 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupConstants.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.optiongroup; +package com.vaadin.v7.shared.ui.optiongroup; import java.io.Serializable; diff --git a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java index c754ded239..167b1b31f0 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/optiongroup/OptionGroupState.java @@ -13,10 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.optiongroup; +package com.vaadin.v7.shared.ui.optiongroup; import com.vaadin.shared.annotations.DelegateToWidget; -import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; /** * Shared state for the OptionGroup component. diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java new file mode 100644 index 0000000000..c5b07dd3e4 --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java @@ -0,0 +1,39 @@ +/* + * 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.progressindicator; + +import com.vaadin.shared.AbstractFieldState; +import com.vaadin.shared.annotations.NoLayout; +import com.vaadin.shared.communication.SharedState; + +/** + * {@link SharedState} for {@link com.vaadin.ui.ProgressBar} + * + * @since 7.1 + * @author Vaadin Ltd + */ +public class ProgressBarState extends AbstractFieldState { + public static final String PRIMARY_STYLE_NAME = "v-progressbar"; + + { + primaryStyleName = PRIMARY_STYLE_NAME; + } + public boolean indeterminate = false; + @NoLayout + public float state = 0.0f; + +} diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorServerRpc.java new file mode 100644 index 0000000000..26ca1143e8 --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorServerRpc.java @@ -0,0 +1,24 @@ +/* + * 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.progressindicator; + +import com.vaadin.shared.annotations.NoLoadingIndicator; +import com.vaadin.shared.communication.ServerRpc; + +public interface ProgressIndicatorServerRpc extends ServerRpc { + @NoLoadingIndicator + public void poll(); +} diff --git a/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorState.java index 50680efc4e..9cc19d860f 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressIndicatorState.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.progressindicator; +package com.vaadin.v7.shared.ui.progressindicator; import com.vaadin.shared.annotations.NoLayout; diff --git a/shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java index 101fadc1a8..624a20162a 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.select; +package com.vaadin.v7.shared.ui.select; import com.vaadin.shared.AbstractFieldState; diff --git a/shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/CollapseMenuContent.java index e0a659a163..adc2e7a61a 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/CollapseMenuContent.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.shared.ui.table; +package com.vaadin.v7.shared.ui.table; /** * Defines whether only collapsible columns should be shown to the user in the diff --git a/shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableConstants.java index f440b08f5d..3fb5a4de44 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableConstants.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.table; +package com.vaadin.v7.shared.ui.table; import java.io.Serializable; diff --git a/shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableServerRpc.java index 0811669511..18ba4e69e9 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableServerRpc.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.table; +package com.vaadin.v7.shared.ui.table; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.table.TableConstants.Section; +import com.vaadin.v7.shared.ui.table.TableConstants.Section; /** * Client-to-server RPC interface for the Table component diff --git a/shared/src/main/java/com/vaadin/shared/ui/table/TableState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableState.java index 82a58b7f7d..979a5e2591 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/table/TableState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/table/TableState.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.table; +package com.vaadin.v7.shared.ui.table; -import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; /** * Shared state for the Table component. diff --git a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeConstants.java index 1c3902c180..7fe3779e8c 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeConstants.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.tree; +package com.vaadin.v7.shared.ui.tree; import java.io.Serializable; diff --git a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeServerRpc.java index 4a20366bbc..23587a43e8 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeServerRpc.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.tree; +package com.vaadin.v7.shared.ui.tree; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.communication.ServerRpc; diff --git a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeState.java index f7f3ce2a98..bc99ae642e 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/tree/TreeState.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.tree; +package com.vaadin.v7.shared.ui.tree; -import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; /** * Shared state for the Table component. diff --git a/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableConstants.java index b85492469d..3b2b68d9e2 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableConstants.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.treetable; +package com.vaadin.v7.shared.ui.treetable; import java.io.Serializable; diff --git a/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableState.java index 3cf834c437..6bb4ee528d 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/treetable/TreeTableState.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.treetable; +package com.vaadin.v7.shared.ui.treetable; -import com.vaadin.shared.ui.table.TableState; +import com.vaadin.v7.shared.ui.table.TableState; public class TreeTableState extends TableState { { diff --git a/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectConstants.java index 4d0e677e73..439334fcb7 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectConstants.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.twincolselect; +package com.vaadin.v7.shared.ui.twincolselect; import java.io.Serializable; diff --git a/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectState.java index 7a6c8e8c03..83a3c9667b 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/twincolselect/TwinColSelectState.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.twincolselect; +package com.vaadin.v7.shared.ui.twincolselect; -import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.v7.shared.ui.select.AbstractSelectState; /** * Shared state for the TwinColSelect component. diff --git a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java index ac24814e9c..eb021b9661 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java +++ b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java @@ -24,9 +24,9 @@ import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; import com.vaadin.server.VaadinSession; -import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Link; +import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc; import com.vaadin.v7.ui.ProgressIndicator; public class NavigateWithOngoingXHR extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java index 4c264d42f6..f23e145ec3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc; import com.vaadin.v7.ui.ProgressIndicator; import com.vaadin.v7.ui.RichTextArea; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java index 34ec27ea8e..2377049b47 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java @@ -9,12 +9,12 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.server.Resource; import com.vaadin.shared.ui.MultiSelectMode; -import com.vaadin.shared.ui.table.CollapseMenuContent; -import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.tests.components.select.AbstractSelectTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; +import com.vaadin.v7.shared.ui.table.CollapseMenuContent; +import com.vaadin.v7.shared.ui.table.TableConstants; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.Align; diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java index 94f4268fc4..3a73b41074 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java @@ -15,12 +15,12 @@ */ package com.vaadin.tests.contextclick; -import com.vaadin.shared.ui.table.TableConstants.Section; import com.vaadin.tests.util.PersonContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.data.Item; +import com.vaadin.v7.shared.ui.table.TableConstants.Section; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.TableContextClickEvent; diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java index 07cd5e34dd..1ab7a9567a 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java @@ -15,12 +15,12 @@ */ package com.vaadin.tests.contextclick; -import com.vaadin.shared.ui.table.TableConstants.Section; import com.vaadin.tests.util.PersonContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.data.Item; +import com.vaadin.v7.shared.ui.table.TableConstants.Section; import com.vaadin.v7.ui.Table.TableContextClickEvent; import com.vaadin.v7.ui.TreeTable; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java index 7e2fd588df..7cca83be62 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java @@ -18,8 +18,8 @@ package com.vaadin.tests.components.table; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.table.CollapseMenuContent; import com.vaadin.tests.tb3.SingleBrowserTest; +import com.vaadin.v7.shared.ui.table.CollapseMenuContent; import com.vaadin.v7.testbench.customelements.TableElement; public class OnlyCollapsibleInMenu extends SingleBrowserTest { |