diff options
Diffstat (limited to 'compatibility-server')
23 files changed, 26 insertions, 27 deletions
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java index 8b0b6cfcaa..f488a03747 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java @@ -25,13 +25,13 @@ import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.AbstractTextField; import com.vaadin.v7.ui.CheckBox; import com.vaadin.v7.ui.ComboBox; -import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.DateField; +import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.InlineDateField; -import com.vaadin.v7.ui.PopupDateField; import com.vaadin.v7.ui.ListSelect; import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.OptionGroup; +import com.vaadin.v7.ui.PopupDateField; import com.vaadin.v7.ui.RichTextArea; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java index 345d50614f..446c2b50ce 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java @@ -22,9 +22,9 @@ import java.util.Comparator; import java.util.List; import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Sortable; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; -import com.vaadin.v7.data.Container.Sortable; /** * Provides a default implementation of an ItemSorter. The diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java index 8cc4e7ac10..45fc33ebba 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java @@ -18,9 +18,9 @@ package com.vaadin.v7.data.util; import java.io.Serializable; import com.vaadin.data.sort.SortOrder; +import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; -import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.filter.UnsupportedFilterException; /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java index b7b5a18f3d..53d9e03cb5 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java @@ -15,8 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; /** * A compound {@link Filter} that accepts an item if all of its filters accept diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java index ec0e468554..3599b017ff 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java @@ -18,8 +18,8 @@ package com.vaadin.v7.data.util.filter; import java.util.Arrays; import com.vaadin.shared.util.SharedUtil; -import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; public class Between implements Filter { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java index 5b945ff411..9724dc24b0 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java @@ -15,9 +15,9 @@ */ package com.vaadin.v7.data.util.filter; +import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; -import com.vaadin.v7.data.Container.Filter; /** * Simple container filter comparing an item property value against a given diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java index 0a7e115255..e9c6fbce97 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java @@ -15,9 +15,9 @@ */ package com.vaadin.v7.data.util.filter; +import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; -import com.vaadin.v7.data.Container.Filter; /** * Simple container filter checking whether an item property value is null. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java index 5d92271afe..97aa4d1a4d 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java @@ -15,8 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; public class Like implements Filter { private final Object propertyId; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java index d0680eb481..a5bb000a3f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java @@ -15,8 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; /** * Negating filter that accepts the items rejected by another filter. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java index 5062e6d987..4782d85052 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java @@ -15,8 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; /** * A compound {@link Filter} that accepts an item if any of its filters accept diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java index b3f7d032e1..c4681f37c9 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java @@ -15,9 +15,9 @@ */ package com.vaadin.v7.data.util.filter; +import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; -import com.vaadin.v7.data.Container.Filter; /** * Simple string filter for matching items that start with or contain a 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 f522cef77a..35cbfee405 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 @@ -57,10 +57,10 @@ import com.vaadin.v7.data.Validator.InvalidValueException; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.data.util.converter.Converter; import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.data.util.converter.ConverterUtil; 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; /** * <p> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java index fe4d20c571..8777d8fc48 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java @@ -34,6 +34,7 @@ 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.datefield.Resolution; import com.vaadin.ui.Component; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; @@ -44,7 +45,6 @@ import com.vaadin.v7.data.Validator.InvalidValueException; import com.vaadin.v7.data.util.converter.Converter; import com.vaadin.v7.data.validator.DateRangeValidator; import com.vaadin.v7.shared.ui.datefield.DateFieldConstants; -import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.v7.shared.ui.datefield.TextualDateFieldState; /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java index 6c7de83fc2..5544520be5 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java @@ -101,15 +101,15 @@ import com.vaadin.v7.shared.ui.grid.EditorServerRpc; import com.vaadin.v7.shared.ui.grid.GridClientRpc; import com.vaadin.v7.shared.ui.grid.GridColumnState; import com.vaadin.v7.shared.ui.grid.GridConstants; +import com.vaadin.v7.shared.ui.grid.GridConstants.Section; import com.vaadin.v7.shared.ui.grid.GridServerRpc; import com.vaadin.v7.shared.ui.grid.GridState; import com.vaadin.v7.shared.ui.grid.GridStaticCellType; import com.vaadin.v7.shared.ui.grid.GridStaticSectionState; -import com.vaadin.v7.shared.ui.grid.HeightMode; -import com.vaadin.v7.shared.ui.grid.ScrollDestination; -import com.vaadin.v7.shared.ui.grid.GridConstants.Section; import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.CellState; import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.RowState; +import com.vaadin.v7.shared.ui.grid.HeightMode; +import com.vaadin.v7.shared.ui.grid.ScrollDestination; import com.vaadin.v7.shared.ui.grid.selection.MultiSelectionModelServerRpc; import com.vaadin.v7.shared.ui.grid.selection.MultiSelectionModelState; import com.vaadin.v7.shared.ui.grid.selection.SingleSelectionModelServerRpc; 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 62074a69db..be730af130 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 @@ -22,7 +22,6 @@ 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; /** * Shows the current progress of a long running task. 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 33b74df857..7dcfdff641 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 @@ -77,9 +77,9 @@ 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.TableConstants.Section; 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/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java index 7cd4cfb90e..6606d84b5f 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java @@ -24,11 +24,11 @@ import org.junit.Test; import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.ComboBox; -import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.DateField; +import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.InlineDateField; -import com.vaadin.v7.ui.PopupDateField; import com.vaadin.v7.ui.ListSelect; +import com.vaadin.v7.ui.PopupDateField; import com.vaadin.v7.ui.TextField; public class DefaultFieldGroupFieldFactoryTest { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java index 76cf54b5e9..225f344045 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java @@ -11,8 +11,8 @@ import java.util.TimeZone; import org.junit.Before; import org.junit.Test; -import com.vaadin.v7.data.validator.DateRangeValidator; import com.vaadin.shared.ui.datefield.Resolution; +import com.vaadin.v7.data.validator.DateRangeValidator; public class DateRangeValidatorTest { Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"), diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java index 4def8caca7..12ac5ccca7 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java @@ -10,8 +10,8 @@ import com.vaadin.tests.data.bean.Country; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.data.bean.Sex; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.data.util.converter.Converter.ConversionException; import com.vaadin.v7.data.util.MethodProperty; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; import com.vaadin.v7.data.util.converter.StringToIntegerConverter; import com.vaadin.v7.ui.TextField; diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java index 73a13cef65..a5166f9373 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java @@ -22,10 +22,10 @@ import java.util.Locale; import org.junit.Before; import org.junit.Test; +import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.util.ObjectProperty; import com.vaadin.v7.data.util.converter.Converter; -import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.v7.ui.DateField; public class DateFieldConverterTest { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java index cbfd2e1be7..e001a3327f 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java @@ -21,8 +21,8 @@ import java.util.TimeZone; import org.junit.Test; -import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.shared.ui.datefield.Resolution; +import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.v7.ui.DateField; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java index 99f76cc746..e6316cec3f 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java @@ -19,8 +19,8 @@ import java.util.Date; import org.junit.Test; -import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.shared.ui.datefield.Resolution; +import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.v7.ui.PopupDateField; /** 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 08e77db859..a0e0cc6c16 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.v7.ui.Table.RowHeaderMode; import com.vaadin.v7.shared.ui.treetable.TreeTableState; +import com.vaadin.v7.ui.Table.RowHeaderMode; import com.vaadin.v7.ui.TreeTable; /** |