diff options
author | Ilia Motornyi <elmot@vaadin.com> | 2017-03-15 21:08:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-15 21:08:47 +0200 |
commit | e5488dff791afe585bf7ab42e268c3e1f342c142 (patch) | |
tree | 93d5e972f7d2daaba4495b26554fdbec928c9529 | |
parent | a3e4931d3a301ead6d9c918974d3df8423157960 (diff) | |
download | vaadin-framework-e5488dff791afe585bf7ab42e268c3e1f342c142.tar.gz vaadin-framework-e5488dff791afe585bf7ab42e268c3e1f342c142.zip |
Replacement guide javadocs for deprecated classes
Fixes #8682
103 files changed, 374 insertions, 34 deletions
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java index 438376923e..2bb4065921 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java @@ -18,6 +18,7 @@ package com.vaadin.v7.data; import java.io.Serializable; +import com.vaadin.data.Binder; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.ErrorMessage; import com.vaadin.server.ErrorMessage.ErrorLevel; @@ -45,6 +46,8 @@ import com.vaadin.v7.data.Validator.InvalidValueException; * * @author Vaadin Ltd. * @since 3.0 + * @deprecated As of 8.0, no replacement available, see {@link Binder#writeBean(Object)}, {@link Binder#clearFields()} + * */ @Deprecated public interface Buffered extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java b/compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java index bbae982d1a..2fce51b8fd 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java @@ -16,6 +16,8 @@ package com.vaadin.v7.data; +import com.vaadin.data.Binder; + import java.io.Serializable; /** @@ -27,6 +29,7 @@ import java.io.Serializable; * * @author Vaadin Ltd. * @since 3.0 + * @deprecated As of 8.0, no direct replacement available. See {@link Binder}, {@link com.vaadin.data.Validator}. */ @Deprecated public interface BufferedValidatable diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java index d48e8344c9..61588e017d 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java @@ -36,6 +36,8 @@ import com.vaadin.v7.data.Container.Ordered; * collapsed subtrees don't exist. * <p> * + * @deprecated As of 8.0, no replacement available yet. A new hierarchical data API is planned in an upcoming + * version of Vaadin Framework 8. */ @Deprecated public interface Collapsible extends Hierarchical, Ordered { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Container.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Container.java index 918ab722b2..d8a9792353 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Container.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Container.java @@ -20,6 +20,11 @@ import java.io.Serializable; import java.util.Collection; import java.util.List; +import com.vaadin.data.provider.AbstractBackEndDataProvider; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; +import com.vaadin.server.SerializableComparator; import com.vaadin.v7.data.util.filter.SimpleStringFilter; import com.vaadin.v7.data.util.filter.UnsupportedFilterException; @@ -79,6 +84,8 @@ import com.vaadin.v7.data.util.filter.UnsupportedFilterException; * * @author Vaadin Ltd * @since 3.0 + * + * @deprecated As of 8.0, replaced by {@link DataProvider} */ @Deprecated public interface Container extends Serializable { @@ -425,6 +432,10 @@ public interface Container extends Serializable { * Depending on the container type, sorting a container may permanently * change the internal order of items in the container. * </p> + * + * @deprecated As of 8.0, sorting is integrated into {@link DataProvider} and {@link Query#getSortOrders()}. + * For in-memory case, you can use also {@link ListDataProvider#setSortComparator(SerializableComparator)}. + * For back-end DataProviders, see {@link AbstractBackEndDataProvider#setSortOrders(List)}. */ @Deprecated public interface Sortable extends Ordered { @@ -660,6 +671,9 @@ public interface Container extends Serializable { * <li>The Items in the hierarchy can be declared explicitly to be able or * unable to have children. * </ul> + * + * @deprecated As of 8.0, no replacement available yet. A new hierarchical data API is planned in an upcoming + * version of Vaadin Framework 8. */ @Deprecated public interface Hierarchical extends Container { @@ -921,6 +935,10 @@ public interface Container extends Serializable { * @see Filterable * * @since 6.6 + * + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public interface Filter extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/ContainerHelpers.java b/compatibility-server/src/main/java/com/vaadin/v7/data/ContainerHelpers.java index bc5927318f..1b80737546 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/ContainerHelpers.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/ContainerHelpers.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.vaadin.data.provider.DataProvider; import com.vaadin.v7.data.Container.Indexed; /** @@ -27,6 +28,8 @@ import com.vaadin.v7.data.Container.Indexed; * of containers in Vaadin. * * @since 7.0 + * + * @deprecated As of 8.0, no direct replacement available, see {@link DataProvider} */ @Deprecated public class ContainerHelpers implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java index b8c0b0c347..aecd1bd21d 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java @@ -16,6 +16,9 @@ package com.vaadin.v7.data; +import com.vaadin.data.Binder; +import com.vaadin.data.provider.DataProvider; + import java.io.Serializable; import java.util.Collection; @@ -28,6 +31,7 @@ import java.util.Collection; * * @author Vaadin Ltd * @since 3.0 + * @deprecated As of 8.0, no direct replacement available, see {@link Binder}, {@link DataProvider} */ @Deprecated public interface Item extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Property.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Property.java index d99f1dd844..855713de0c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Property.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Property.java @@ -16,6 +16,11 @@ package com.vaadin.v7.data; +import com.vaadin.data.Binder; +import com.vaadin.data.HasValue; +import com.vaadin.data.ValueProvider; +import com.vaadin.server.Setter; + import java.io.Serializable; /** @@ -42,10 +47,11 @@ import java.io.Serializable; * needs to be changed through the implementing class. * </p> * - * @param T + * @param <T> * type of values of the property * * @author Vaadin Ltd + * @deprecated As of 8.0, replaced by {@link HasValue}, {@link ValueProvider}, {@link Setter}, see {@link Binder} * @since 3.0 */ @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java index d01b71bf79..b770ac8889 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java @@ -16,6 +16,8 @@ package com.vaadin.v7.data; +import com.vaadin.data.Binder; + import java.io.Serializable; import java.util.Collection; @@ -29,6 +31,7 @@ import java.util.Collection; * @author Vaadin Ltd. * @since 3.0 * @see Validator + * @deprecated As of 8.0, no direct replacement available. See {@link Binder}, {@link com.vaadin.data.Validator}. */ @Deprecated public interface Validatable extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java index 9167dd2c67..00fb4b86fa 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java @@ -18,6 +18,7 @@ package com.vaadin.v7.data; import java.io.Serializable; +import com.vaadin.data.Binder; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.AbstractErrorMessage.ContentMode; import com.vaadin.server.ErrorMessage; @@ -51,6 +52,8 @@ import com.vaadin.server.VaadinServlet; * * @author Vaadin Ltd. * @since 3.0 + * @deprecated As of 8.0, replaced by {@link com.vaadin.data.Validator}. The validation is performed + * outside components, see {@link Binder}.{@code withValidator(...)} */ @Deprecated public interface Validator extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java index 986515ced8..d607d37f93 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java @@ -20,12 +20,18 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import com.vaadin.data.BeanValidationBinder; +import com.vaadin.data.Binder; import com.vaadin.data.util.BeanUtil; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.data.validator.BeanValidator; import com.vaadin.v7.ui.Field; +/** + * + * @deprecated As of 8.0, replaced by {@link Binder} and {@link BeanValidationBinder} + */ @Deprecated public class BeanFieldGroup<T> extends FieldGroup { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java index a2512de33b..fba8a7186f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java @@ -15,11 +15,16 @@ */ package com.vaadin.v7.data.fieldgroup; +import com.vaadin.ui.Component; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @deprecated As of 8.0, no replacement available, use {@link Component#setCaption}. + */ @Target({ ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) @Deprecated 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 3a2d5cd526..33635004ef 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 @@ -18,6 +18,8 @@ package com.vaadin.v7.data.fieldgroup; import java.util.Date; import java.util.EnumSet; +import com.vaadin.data.Binder; +import com.vaadin.data.HasValue; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.fieldgroup.FieldGroup.BindException; import com.vaadin.v7.ui.AbstractField; @@ -42,6 +44,8 @@ import com.vaadin.v7.ui.TextField; * instance. * * @author Vaadin Ltd + * @deprecated As of 8.0, no direct replacement available. {@link Binder#forMemberField(HasValue)} and + * {@link Binder#bindInstanceFields(Object)} should be used instead. */ @Deprecated public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java index 40802512cb..452f011f0a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import com.vaadin.annotations.PropertyId; +import com.vaadin.data.Binder; import com.vaadin.util.ReflectTools; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; @@ -53,6 +54,7 @@ import com.vaadin.v7.ui.Field; * * @author Vaadin Ltd * @since 7.0 + * @deprecated As of 8.0, replaced by {@link Binder} */ @Deprecated public class FieldGroup implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java index 4a62a19aaa..93a48b8ad1 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java @@ -17,6 +17,8 @@ package com.vaadin.v7.data.fieldgroup; import java.io.Serializable; +import com.vaadin.data.Binder; +import com.vaadin.data.HasValue; import com.vaadin.v7.ui.Field; /** @@ -25,6 +27,8 @@ import com.vaadin.v7.ui.Field; * * @author Vaadin Ltd. * @since 7.0 + * @deprecated As of 8.0, no direct replacement available. {@link Binder#forMemberField(HasValue)} and + * {@link Binder#bindInstanceFields(Object)} should be used instead. */ @Deprecated public interface FieldGroupFieldFactory extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java index 1ec6bad129..2e93c2249f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java @@ -23,6 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import com.vaadin.data.provider.DataProvider; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Container.Filterable; import com.vaadin.v7.data.Container.PropertySetChangeNotifier; @@ -59,6 +60,9 @@ import com.vaadin.v7.data.util.filter.UnsupportedFilterException; * The type of the Bean * * @since 6.5 + * + * + * @deprecated As of 8.0, replaced by {@link DataProvider} */ @Deprecated public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java index dbb27a22ed..ec5138d063 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.EventObject; import java.util.LinkedList; +import com.vaadin.data.provider.DataProvider; import com.vaadin.v7.data.Container; /** @@ -36,6 +37,8 @@ import com.vaadin.v7.data.Container; * make them public. * * @since 6.6 + * + * @deprecated As of 8.0, replaced by {@link DataProvider} */ @Deprecated public abstract class AbstractContainer implements Container { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java index ea7b1ca570..100a8df49b 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java @@ -25,6 +25,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; +import com.vaadin.data.provider.DataProvider; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Container.ItemSetChangeNotifier; import com.vaadin.v7.data.Item; @@ -91,6 +92,8 @@ import com.vaadin.v7.data.util.filter.UnsupportedFilterException; * {@link Item} if unknown * * @since 6.6 + * + * @deprecated As of 8.0, replaced by {@link DataProvider} */ @Deprecated public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITEMCLASS extends Item> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java index 9c084f4bbb..98af2cdf17 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java @@ -20,6 +20,9 @@ import java.util.Collections; import java.util.LinkedList; import java.util.logging.Logger; +import com.vaadin.data.Binder; +import com.vaadin.data.ValueProvider; +import com.vaadin.server.Setter; import com.vaadin.v7.data.Property; /** @@ -29,6 +32,8 @@ import com.vaadin.v7.data.Property; * {@link ReadOnlyStatusChangeListener}s. * * @since 6.6 + * + * @deprecated As of 8.0, replaced by {@link ValueProvider}, {@link Setter}, see {@link Binder} */ @Deprecated public abstract class AbstractProperty<T> implements Property<T>, diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java index 434caebb9a..346088d3ac 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java @@ -15,8 +15,11 @@ */ package com.vaadin.v7.data.util; +import com.vaadin.data.provider.DataProvider; + import java.util.Collection; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container; /** @@ -69,6 +72,8 @@ import com.vaadin.v7.data.Container; * @see BeanItemContainer * * @since 6.5 + * + * @deprecated As of 8.0, replaced by {@link ListDataProvider} */ @Deprecated public class BeanContainer<IDTYPE, BEANTYPE> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java index 3a175ac9ee..5ed6f9f7b2 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java @@ -26,6 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.vaadin.data.Binder; +import com.vaadin.data.provider.DataProvider; import com.vaadin.data.util.BeanUtil; import com.vaadin.v7.data.Property; @@ -34,6 +36,10 @@ import com.vaadin.v7.data.Property; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, no direct replacement available. You can use any bean directly as an item for {@link Binder} + * or {@link DataProvider} and access the item properties with lambdas like {@code binder.forField(component).bind(...)} or + * {@code new Grid<Bean>(dataProvider).addColumn(bean->bean.getSomething())}. */ @SuppressWarnings("serial") @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java index 375cfa0595..eee7f8a321 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java @@ -15,6 +15,8 @@ */ package com.vaadin.v7.data.util; +import com.vaadin.data.provider.ListDataProvider; + import java.util.Collection; /** @@ -50,6 +52,7 @@ import java.util.Collection; * The type of the Bean * * @since 5.4 + * @deprecated As of 8.0, replaced by {@link ListDataProvider} */ @Deprecated @SuppressWarnings("serial") diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java index df0fd774a3..a04378d02e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java @@ -46,6 +46,9 @@ import com.vaadin.v7.data.Property; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, no replacement available yet. A new hierarchical data API is planned in an upcoming + * version of Vaadin Framework 8. */ @Deprecated @SuppressWarnings("serial") diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java index 442dbbd233..9ce4947586 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import com.vaadin.data.provider.DataProvider; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; @@ -42,6 +43,8 @@ import com.vaadin.v7.data.Property; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, replaced by {@link DataProvider} */ @Deprecated @SuppressWarnings("serial") 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 d3d587456e..bf4dcc1a06 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 @@ -21,6 +21,11 @@ import java.util.Collection; import java.util.Comparator; import java.util.List; +import com.vaadin.data.provider.AbstractBackEndDataProvider; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; +import com.vaadin.server.SerializableComparator; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Container.Sortable; import com.vaadin.v7.data.Item; @@ -37,6 +42,10 @@ import com.vaadin.v7.data.Property; * values. The comparator can be set using the constructor. If no comparator is * provided a default comparator is used. * + * + * @deprecated As of 8.0, sorting is integrated into {@link DataProvider} and {@link Query#getSortOrders()}. + * For in-memory case, you can use also {@link ListDataProvider#setSortComparator(SerializableComparator)}. + * For back-end DataProviders, see {@link AbstractBackEndDataProvider#setSortOrders(List)}. */ @Deprecated public class DefaultItemSorter implements ItemSorter { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java index 97c10eaed1..f646df23e4 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java @@ -30,6 +30,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import com.vaadin.data.provider.DataProvider; import com.vaadin.server.Resource; import com.vaadin.util.FileTypeResolver; import com.vaadin.v7.data.Container; @@ -41,6 +42,9 @@ import com.vaadin.v7.data.Property; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, no replacement available yet. A new hierarchical data API is planned in an upcoming + * version of Vaadin Framework 8. */ @Deprecated @SuppressWarnings("serial") diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java index b66240175a..93cad4b57b 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import com.vaadin.data.provider.DataProvider; import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Item; @@ -58,6 +59,8 @@ import com.vaadin.v7.data.util.filter.UnsupportedFilterException; * * @since 7.4 * @author Vaadin Ltd + * + * @deprecated As of 8.0, replaced by {@link DataProvider} */ @Deprecated public class GeneratedPropertyContainer extends AbstractContainer diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java index 8e33aee66e..adc075a527 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java @@ -35,6 +35,9 @@ import com.vaadin.v7.data.Item; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, no replacement available yet. A new hierarchical data API is planned in an upcoming + * version of Vaadin Framework 8. */ @Deprecated @SuppressWarnings("serial") diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java index 8c959a6f6f..437881e4d6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java @@ -26,6 +26,9 @@ import com.vaadin.v7.data.Container.Hierarchical; * features. * * @see ContainerOrderedWrapper + * + * @deprecated As of 8.0, no replacement available yet. A new hierarchical data API is planned in an upcoming + * version of Vaadin Framework 8. */ @Deprecated @SuppressWarnings({ "serial" }) diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java index 3fada79577..cf34938dac 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java @@ -29,6 +29,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; @@ -54,6 +55,8 @@ import com.vaadin.v7.data.util.filter.UnsupportedFilterException; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, replaced by {@link ListDataProvider} */ @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ItemSorter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ItemSorter.java index 8c541473e4..15901538ca 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ItemSorter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ItemSorter.java @@ -17,7 +17,13 @@ package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.Comparator; +import java.util.List; +import com.vaadin.data.provider.AbstractBackEndDataProvider; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; +import com.vaadin.data.provider.Query; +import com.vaadin.server.SerializableComparator; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Container.Sortable; @@ -25,6 +31,10 @@ import com.vaadin.v7.data.Container.Sortable; * An item comparator which is compatible with the {@link Sortable} interface. * The <code>ItemSorter</code> interface can be used in <code>Sortable</code> * implementations to provide a custom sorting method. + * + * @deprecated As of 8.0, sorting is integrated into {@link DataProvider} and {@link Query#getSortOrders()}. + * For in-memory case, you can use also {@link ListDataProvider#setSortComparator(SerializableComparator)}. + * For back-end DataProviders, see {@link AbstractBackEndDataProvider#setSortOrders(List)}. */ @Deprecated public interface ItemSorter diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java index 4a6de4529b..7b7a4b7782 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java @@ -31,6 +31,8 @@ import java.util.Iterator; * works. * * This class is subject to change and should not be used outside Vaadin core. + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class ListSet<E> extends ArrayList<E> { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java index 87d56bb4c9..9d225c831a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java @@ -25,6 +25,9 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; +import com.vaadin.data.Binder; +import com.vaadin.data.ValueProvider; +import com.vaadin.server.Setter; import com.vaadin.shared.util.SharedUtil; import com.vaadin.v7.data.Property; import com.vaadin.v7.util.SerializerHelper; @@ -58,6 +61,8 @@ import com.vaadin.v7.util.SerializerHelper; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, replaced by {@link ValueProvider}, {@link Setter}, see {@link Binder} */ @Deprecated @SuppressWarnings("serial") diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java index 9f0584962f..06a23b5d86 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java @@ -32,6 +32,8 @@ import com.vaadin.v7.util.SerializerHelper; * bean type * * @since 6.6 + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class MethodPropertyDescriptor<BT> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java index 3657a70266..42764b90ae 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java @@ -24,6 +24,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.vaadin.data.Binder; +import com.vaadin.data.ValueProvider; +import com.vaadin.server.Setter; import com.vaadin.shared.util.SharedUtil; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.util.MethodProperty.MethodException; @@ -41,6 +44,8 @@ import com.vaadin.v7.data.util.MethodProperty.MethodException; * @see MethodProperty * * @since 6.6 + * + * @deprecated As of 8.0, replaced by {@link ValueProvider}, {@link Setter}, see {@link Binder} */ @Deprecated public class NestedMethodProperty<T> extends AbstractProperty<T> { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java index cd41d887ed..ba7fffc4c1 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java @@ -28,6 +28,8 @@ import com.vaadin.v7.data.Property; * bean type * * @since 6.6 + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class NestedPropertyDescriptor<BT> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java index 7d51cb9e4f..cae390c4be 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java @@ -16,6 +16,9 @@ package com.vaadin.v7.data.util; +import com.vaadin.data.Binder; +import com.vaadin.data.ValueProvider; +import com.vaadin.server.Setter; import com.vaadin.v7.data.Property; /** @@ -24,6 +27,8 @@ import com.vaadin.v7.data.Property; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, replaced by {@link ValueProvider}, {@link Setter}, see {@link Binder} */ @Deprecated @SuppressWarnings("serial") 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 ce5e6738e9..70572c8e65 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 @@ -16,7 +16,10 @@ package com.vaadin.v7.data.util; import java.io.Serializable; +import java.util.Map; +import com.vaadin.data.Binder; +import com.vaadin.data.provider.DataProvider; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.sort.SortOrder; import com.vaadin.v7.data.Item; @@ -30,6 +33,10 @@ import com.vaadin.v7.data.util.filter.UnsupportedFilterException; * Property data type * @since 7.4 * @author Vaadin Ltd + * + * @deprecated As of 8.0, no direct replacement available. You can use any bean directly as an item for {@link Binder} + * or {@link DataProvider} and access item properties with lambdas like {@code binder.forField(component).bind(...)} or + * {@code new Grid<Bean>(dataProvider).addColumn(bean->bean.getSomething())}. */ @Deprecated public abstract class PropertyValueGenerator<T> implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java index b60b0ed98b..2c7fbcb200 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java @@ -22,7 +22,10 @@ import java.util.EventObject; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; +import java.util.Map; +import com.vaadin.data.Binder; +import com.vaadin.data.provider.DataProvider; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; @@ -34,6 +37,10 @@ import com.vaadin.v7.data.Property; * * @author Vaadin Ltd. * @since 3.0 + * + * @deprecated As of 8.0, no direct replacement available. You can use {@link Map} directly as an item for {@link Binder} + * or {@link DataProvider} and access item properties with lambdas like {@code binder.forField(component).bind(...)} or + * {@code new Grid<Map<...>>(dataProvider).addColumn(map->map.get(...))}. */ @Deprecated @SuppressWarnings("serial") diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java index 031e557164..b808357066 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java @@ -36,6 +36,7 @@ import java.nio.charset.Charset; * setValue(Object) is explicitly called. {@link ReadOnlyStatusChangeListener}s * are supported but only fire when setReadOnly(boolean) is explicitly called. * + * @deprecated As of 8.0, no replacement available. */ @Deprecated @SuppressWarnings("serial") diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java index 482567b912..16ff8052cf 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java @@ -40,7 +40,10 @@ import com.vaadin.v7.data.Property.ValueChangeNotifier; * @since 7.0 * * @param <T> + * + * @deprecated As of 8.0, no replacement available. */ + @Deprecated public class TransactionalPropertyWrapper<T> extends AbstractProperty<T> implements ValueChangeNotifier, Property.Transactional<T> { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java index 5eb7df4c00..2a2d64f3e9 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java @@ -29,6 +29,8 @@ import com.vaadin.v7.data.Property; * bean type * * @since 6.6 + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public interface VaadinPropertyDescriptor<BT> extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java index cc1bc8b67f..c563861900 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java @@ -19,7 +19,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container.Filter; /** @@ -30,7 +31,9 @@ import com.vaadin.v7.data.Container.Filter; * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public abstract class AbstractJunctionFilter implements Filter { 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 85634c6ae1..9fee890b75 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,7 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; @@ -32,7 +33,9 @@ import com.vaadin.v7.data.Item; * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public final class And extends AbstractJunctionFilter { 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 4f8e65550f..4bd903fe2f 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 @@ -17,13 +17,16 @@ package com.vaadin.v7.data.util.filter; import java.util.Arrays; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.shared.util.SharedUtil; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; /** - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated 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 e57c710dad..1a93902d63 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,7 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; @@ -34,7 +35,9 @@ import com.vaadin.v7.data.Property; * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public abstract class Compare implements Filter { @@ -59,7 +62,9 @@ public abstract class Compare implements Filter { * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public static final class Equal extends Compare { @@ -94,7 +99,9 @@ public abstract class Compare implements Filter { * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public static final class Greater extends Compare { @@ -130,7 +137,9 @@ public abstract class Compare implements Filter { * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public static final class Less extends Compare { @@ -166,7 +175,9 @@ public abstract class Compare implements Filter { * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public static final class GreaterOrEqual extends Compare { @@ -202,7 +213,9 @@ public abstract class Compare implements Filter { * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public static final class LessOrEqual extends Compare { 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 3c94b88e10..b8e6865be3 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,7 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; @@ -27,7 +28,9 @@ import com.vaadin.v7.data.Property; * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public final class IsNull implements Filter { 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 a091c9a664..3c60f83f78 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,12 +15,15 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; /** - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public class Like implements Filter { 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 42fad8ff5d..e0c70e8c43 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,7 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; @@ -27,7 +28,9 @@ import com.vaadin.v7.data.Item; * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public final class Not implements 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 0eeed77727..c5ca4c1828 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,7 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; @@ -32,7 +33,9 @@ import com.vaadin.v7.data.Item; * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public final class Or extends AbstractJunctionFilter { 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 ab2014ae02..025437659e 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,7 +15,8 @@ */ package com.vaadin.v7.data.util.filter; -import com.vaadin.data.provider.Query; +import com.vaadin.data.provider.DataProvider; +import com.vaadin.data.provider.ListDataProvider; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; @@ -36,7 +37,9 @@ import com.vaadin.v7.data.Property; * * @since 6.6 * - * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()} + * @deprecated As of 8.0, the whole filtering feature is integrated into {@link DataProvider}. + * For in-memory case ({@link ListDataProvider}), use predicates as filters. For back-end DataProviders, + * filters are specific to the implementation. */ @Deprecated public final class SimpleStringFilter implements Filter { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java index 4013915aa7..45ef2cd57e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java @@ -30,6 +30,7 @@ import com.vaadin.v7.data.util.converter.Converter.ConversionException; * * Note that depending on the QueryDelegate in use this does not necessarily map * into an actual column in a database table. + * @deprecated As of 8.0, no replacement available. */ @Deprecated final public class ColumnProperty implements Property { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java index 59f6739bc6..8b433bd782 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java @@ -29,6 +29,7 @@ import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; * @see TableQuery#setVersionColumn(String) * * @author Jonatan Kronqvist / Vaadin Ltd + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class OptimisticLockException extends RuntimeException { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java index 1091d44fb2..7ceda31964 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java @@ -15,6 +15,9 @@ */ package com.vaadin.v7.data.util.sqlcontainer; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class ReadOnlyRowId extends RowId { private static final long serialVersionUID = -2626764781642012467L; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java index 81179fe62b..ccc010924b 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java @@ -24,6 +24,8 @@ import java.util.Arrays; * The data structure of a RowId is an Object array which contains the values of * the primary key columns of the identified row. This allows easy equals() * -comparison of RowItems. + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class RowId implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java index a0e7b7d993..9030202638 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java @@ -27,6 +27,8 @@ import com.vaadin.v7.data.Property; * * Note that depending on the QueryDelegate in use this does not necessarily map * into an actual row in a database table. + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public final class RowItem implements Item { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java index 38542272ee..0dc34f1e7a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import com.vaadin.data.provider.DataProvider; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.ContainerHelpers; import com.vaadin.v7.data.Item; @@ -46,6 +47,9 @@ import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator; import com.vaadin.v7.data.util.sqlcontainer.query.generator.OracleGenerator; +/** + * @deprecated As of 8.0, no replacement available, see {@link DataProvider}. + */ @Deprecated public class SQLContainer implements Container, Container.Filterable, Container.Indexed, Container.Sortable, Container.ItemSetChangeNotifier { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java index 12e46ef2f7..4d75f5ecf7 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java @@ -17,6 +17,9 @@ package com.vaadin.v7.data.util.sqlcontainer; import java.io.Serializable; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class SQLUtil implements Serializable { /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java index ad0e9efebb..63d1a78f29 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java @@ -15,6 +15,9 @@ */ package com.vaadin.v7.data.util.sqlcontainer; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class TemporaryRowId extends RowId { private static final long serialVersionUID = -641983830469018329L; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java index 51997d96d8..b4d0b3a5d1 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java @@ -24,6 +24,9 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import javax.sql.DataSource; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class J2EEConnectionPool implements JDBCConnectionPool { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java index ba091a5a0e..ef0db54def 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java @@ -21,6 +21,7 @@ import java.sql.SQLException; /** * Interface for implementing connection pools to be used with SQLContainer. + * @deprecated As of 8.0, no replacement available. */ @Deprecated public interface JDBCConnectionPool extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java index b9f46fec94..096ecd5494 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java @@ -27,6 +27,8 @@ import java.util.Set; * Simple implementation of the JDBCConnectionPool interface. Handles loading * the JDBC driver, setting up the connections and ensuring they are still * usable upon release. + * + * @deprecated As of 8.0, no replacement available. */ @SuppressWarnings("serial") @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java index cd58275d04..de02c4b43a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java @@ -30,6 +30,8 @@ import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; * * @author Vaadin Ltd * @since 6.8.9 + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public abstract class AbstractTransactionalQuery implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java index caa4c9f6bd..45f33eefbe 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java @@ -33,6 +33,9 @@ import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +/** + * @deprecated As of 8.0, no replacement available. + */ @SuppressWarnings("serial") @Deprecated public class FreeformQuery extends AbstractTransactionalQuery diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java index 9a6a37f710..360a0ae89a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java @@ -23,6 +23,9 @@ import java.util.List; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.sqlcontainer.RowItem; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public interface FreeformQueryDelegate extends Serializable { /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java index 2c9117a51b..3266a135e8 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java @@ -26,6 +26,8 @@ import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; * Due to the injection protection and other benefits of prepared statements, it * is advisable to implement this interface instead of the FreeformQueryDelegate * whenever possible. + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public interface FreeformStatementDelegate extends FreeformQueryDelegate { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java index 8e600f8ae0..2579329ed3 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java @@ -23,6 +23,8 @@ import java.io.Serializable; * * The sorting rule is simple and contains only the affected column's name and * the direction of the sort. + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class OrderBy implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java index 626169d42f..e9e0d066f9 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java @@ -24,6 +24,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.sqlcontainer.RowId; import com.vaadin.v7.data.util.sqlcontainer.RowItem; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public interface QueryDelegate extends Serializable { /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java index 7356801550..065f16c029 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java @@ -46,6 +46,9 @@ import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator; import com.vaadin.v7.data.util.sqlcontainer.query.generator.SQLGenerator; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @SuppressWarnings("serial") @Deprecated public class TableQuery extends AbstractTransactionalQuery diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java index 37b0b15b27..2c8ff8b126 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java @@ -32,6 +32,8 @@ import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.StringDecorat * Generates generic SQL that is supported by HSQLDB, MySQL and PostgreSQL. * * @author Jonatan Kronqvist / Vaadin Ltd + * + * @deprecated As of 8.0, no replacement available. */ @SuppressWarnings("serial") @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java index 211031084b..fa607aeb5a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java @@ -21,6 +21,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +/** + * @deprecated As of 8.0, no replacement available. + */ @SuppressWarnings("serial") @Deprecated public class MSSQLGenerator extends DefaultSQLGenerator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java index ca6f584b35..bc7c659f07 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java @@ -21,6 +21,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +/** + * @deprecated As of 8.0, no replacement available. + */ @SuppressWarnings("serial") @Deprecated public class OracleGenerator extends DefaultSQLGenerator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java index ea153c0eeb..a99ac570b4 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java @@ -28,6 +28,8 @@ import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; * HSQLDB, MySQL, PostgreSQL, MSSQL and Oracle syntaxes. * * @author Jonatan Kronqvist / Vaadin Ltd + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public interface SQLGenerator extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java index ad54208fa5..7d6e0388c8 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java @@ -36,6 +36,8 @@ import java.util.Map; * * This class will also fill the values with correct setters into the * PreparedStatement on request. + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class StatementHelper implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java index 507bc640d5..355b78ba3c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java @@ -19,6 +19,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.filter.And; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class AndTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java index cb96ef7586..35e7653faf 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java @@ -19,6 +19,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.filter.Between; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class BetweenTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java index 2ac709f1ec..256d3bc9d6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java @@ -19,6 +19,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.filter.Compare; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class CompareTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java index 9bb083a63d..f54574eaf6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java @@ -20,6 +20,9 @@ import java.io.Serializable; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public interface FilterTranslator extends Serializable { public boolean translatesFilter(Filter filter); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java index fdaef1c287..00deef359b 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java @@ -19,6 +19,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.filter.IsNull; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class IsNullTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java index 644350a9d8..292187beec 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java @@ -19,6 +19,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.filter.Like; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class LikeTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java index 53d50d8acd..33199f1c00 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java @@ -20,6 +20,9 @@ import com.vaadin.v7.data.util.filter.IsNull; import com.vaadin.v7.data.util.filter.Not; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class NotTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java index 1d429ee8c5..66d906fcf8 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java @@ -19,6 +19,9 @@ import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.filter.Or; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class OrTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java index 26effae012..d1c884c360 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java @@ -23,6 +23,9 @@ import java.util.List; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class QueryBuilder implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java index b161c02215..050277a9d3 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java @@ -20,6 +20,9 @@ import com.vaadin.v7.data.util.filter.Like; import com.vaadin.v7.data.util.filter.SimpleStringFilter; import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +/** + * @deprecated As of 8.0, no replacement available. + */ @Deprecated public class SimpleStringTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java index e0305bda19..047856d9d8 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java @@ -26,6 +26,8 @@ import java.io.Serializable; * (parenthesis). * * @author Vaadin Ltd + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class StringDecorator implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java b/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java index 8d55c7f98f..fae1c48146 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java @@ -34,6 +34,8 @@ import com.vaadin.v7.data.Container; * instead of its concrete subclasses. * * @since 6.3 + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public abstract class DataBoundTransferable extends TransferableImpl { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java index 7a745fa464..dac491bc27 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java @@ -22,6 +22,7 @@ import java.lang.reflect.Method; import com.vaadin.event.ConnectorEventListener; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; +import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.ui.Component; import com.vaadin.util.ReflectTools; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java index 2f694655b0..0b524f2fe5 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java @@ -34,6 +34,7 @@ import com.vaadin.v7.data.Property; * * @since 5.3 * + * @deprecated As of 8.0, see component-specific click events. */ @SuppressWarnings("serial") @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java index b0c1b5ed21..4fed8fd605 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java @@ -54,13 +54,15 @@ import elemental.json.JsonObject; /** * Provides Vaadin server-side container data source to a - * {@link com.vaadin.client.ui.grid.GridConnector}. This is currently + * {@link com.vaadin.v7.client.connectors.GridConnector}. This is currently * implemented as an Extension hardcoded to support a specific connector type. * This will be changed once framework support for something more flexible has * been implemented. * * @since 7.4 * @author Vaadin Ltd + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public class RpcDataProviderExtension extends AbstractExtension { 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 02ab06cb53..2b27ea4eb4 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 @@ -78,8 +78,7 @@ import com.vaadin.v7.shared.ui.select.AbstractSelectState; * * @author Vaadin Ltd. * @since 5.0 - * - * @deprecated As of 8.0, no replacement available. See {@link AbstractListing} + * @deprecated As of 8.0, replaced by {@link AbstractListing} */ @SuppressWarnings("serial") @Deprecated 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 1f3feb99ed..dc3f32774f 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,6 +17,7 @@ package com.vaadin.v7.ui; import com.vaadin.shared.communication.PushMode; +import com.vaadin.ui.PushConfiguration; import com.vaadin.ui.UI; import com.vaadin.v7.data.Property; import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc; @@ -27,13 +28,13 @@ import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorState; * <p> * Polling in this way is generally not recommended since there is no * centralized management of when messages are sent to the server. Furthermore, - * polling might not be needed at all if {@link UI#setPushMode(PushMode)} or + * polling might not be needed at all if {@link PushConfiguration#setPushMode(PushMode)} or * {@link UI#setPollInterval(int)} is used. * * @author Vaadin Ltd. * @since 4 - * @deprecated as of 7.1, use {@link ProgressBar} combined with - * {@link UI#setPushMode(PushMode)} or + * @deprecated as of 7.1, use {@link com.vaadin.ui.ProgressBar} combined with + * {@link PushConfiguration#setPushMode(PushMode)} or * {@link UI#setPollInterval(int)} instead. */ @Deprecated 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 e18af39fb8..301194fc0c 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 @@ -81,6 +81,8 @@ 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.ui.Grid; + /** * <p> * <code>Table</code> is used for representing data or components in a pageable @@ -102,7 +104,7 @@ import com.vaadin.v7.shared.ui.table.TableState; * @author Vaadin Ltd. * @since 3.0 * - * @deprecated As of 8.0, use {@link com.vaadin.ui.Grid} instead + * @deprecated As of 8.0, use {@link Grid} instead */ @Deprecated @SuppressWarnings({ "deprecation" }) 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 5f114c06cb..b126fa8f0e 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 @@ -76,7 +76,7 @@ import com.vaadin.v7.shared.ui.tree.TreeState; * @author Vaadin Ltd. * @since 3.0 * - * @deprecated As of 8.0. Replacement planned for 8.1 + * @deprecated As of 8.0. New hierarchical components are planned in an upcoming version of Vaadin Framework 8. */ @SuppressWarnings({ "serial", "deprecation" }) @Deprecated 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 8efdbed66c..a6ad1ce613 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 @@ -67,7 +67,7 @@ import com.vaadin.v7.ui.Tree.ExpandListener; * {@link Collapsible} containers can not be shared among several users as they * share UI state in the container. * - * @deprecated As of 8.0. Replacement planned for 8.1 + * @deprecated As of 8.0. New hierarchical components are planned in an upcoming version of Vaadin Framework 8. */ @SuppressWarnings({ "serial" }) @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java index e3f1bce837..a4b9901f22 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java @@ -24,6 +24,7 @@ import com.vaadin.v7.ui.Calendar; * @since 7.1 * @author Vaadin Ltd. * + * @deprecated As of 8.0, no replacement available. */ @SuppressWarnings("serial") @Deprecated 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 a272b1444f..0359c72272 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 @@ -30,6 +30,8 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; * * @since 7.1.0 * @author Vaadin Ltd. + * + * @deprecated As of 8.0, no replacement available. */ @Deprecated public interface CalendarComponentEvents extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java index bc8fa4e32c..ff93a84c35 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java @@ -25,6 +25,8 @@ import java.util.TimeZone; * @since 7.1.0 * @author Vaadin Ltd. * + * + * @deprecated As of 8.0, no replacement available. */ @SuppressWarnings("serial") @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java index f054b8c0ab..2f81ae3246 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java @@ -30,6 +30,8 @@ import com.vaadin.v7.ui.Calendar; * * @since 7.1 * @author Vaadin Ltd. + * + * @deprecated As of 8.0, no replacement available. */ @SuppressWarnings("serial") @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java index a559b09bac..ccaf1f60d5 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java @@ -47,6 +47,8 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSet * * @since 7.1.0 * @author Vaadin Ltd. + * + * @deprecated As of 8.0, no replacement available. */ @SuppressWarnings("serial") @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/BaseTheme.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/BaseTheme.java index 237682ba3c..bd55795107 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/BaseTheme.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/BaseTheme.java @@ -15,6 +15,8 @@ */ package com.vaadin.v7.ui.themes; +import com.vaadin.ui.themes.ValoTheme; + /** * <p> * The Base theme is the foundation for all Vaadin themes. Although it is not @@ -32,7 +34,7 @@ package com.vaadin.v7.ui.themes; * name as a string constant <code>THEME_NAME</code>. * * @since 6.3.0 - * + * @deprecated As of 8.0, no replacement available, only {@link ValoTheme} is supported. */ @Deprecated public class BaseTheme { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/ChameleonTheme.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/ChameleonTheme.java index 2523612bb2..fabba1a6f9 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/ChameleonTheme.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/ChameleonTheme.java @@ -15,6 +15,11 @@ */ package com.vaadin.v7.ui.themes; +import com.vaadin.ui.themes.ValoTheme; + +/** + * @deprecated As of 8.0, no replacement available, only {@link ValoTheme} is supported. +*/ @Deprecated public class ChameleonTheme extends BaseTheme { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java index cb22bcae3f..3b4a0bb27a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java @@ -21,7 +21,11 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; +import com.vaadin.ui.themes.ValoTheme; +/** + * @deprecated As of 8.0, no replacement available, only {@link ValoTheme} is supported. + */ @Deprecated public class Reindeer extends BaseTheme { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Runo.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Runo.java index d01e1184b8..1ab1d3b7fe 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Runo.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Runo.java @@ -15,6 +15,11 @@ */ package com.vaadin.v7.ui.themes; +import com.vaadin.ui.themes.ValoTheme; + +/** + * @deprecated As of 8.0, no replacement available, only {@link ValoTheme} is supported. + */ @Deprecated public class Runo extends BaseTheme { diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java index fc457b4ff9..3d75c48006 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java @@ -15,6 +15,9 @@ */ package com.vaadin.v7.shared.ui.datefield; +import com.vaadin.shared.ui.datefield.DateResolution; +import com.vaadin.shared.ui.datefield.DateTimeResolution; + import java.util.ArrayList; import java.util.List; @@ -23,6 +26,9 @@ import java.util.List; * * @author Vaadin Ltd. * @since 7.0 + * + * @deprecated As of 8.0, replaced by {@link DateResolution} and {@link DateTimeResolution}, + * used by new {@code com.vaadin.ui.DateField} and {@code com.vaadin.ui.DateTimeField} */ public enum Resolution { // Values from Calendar.SECOND etc. Set as ints to avoid Calendar dependency |