aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/data/Collapsible.java4
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/data/Container.java20
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java5
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java6
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java5
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java5
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java2
-rw-r--r--compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java2
8 files changed, 28 insertions, 21 deletions
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 61588e017d..8f719c8959 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,8 +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 Use {@code TreeGrid.addExpandListener()} and
+ * {@code TreeGrid.addCollapseListener()}.
*/
@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 d8a9792353..e996d306df 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
@@ -433,9 +433,12 @@ public interface Container extends Serializable {
* 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 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 {
@@ -672,8 +675,7 @@ public interface Container extends Serializable {
* 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 See {@code HierarchicalDataProvider} and its implementations.
*/
@Deprecated
public interface Hierarchical extends Container {
@@ -936,9 +938,11 @@ public interface Container extends Serializable {
*
* @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 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/util/ContainerHierarchicalWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java
index a04378d02e..a7b5f737ac 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
@@ -47,8 +47,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 No direct replacement - use an appropriate implementation of
+ * {@code HierarchicalDataProvider} such as {@code TreeDataProvider}
+ * or {@code AbstractBackEndHierarchicalDataProvider}.
*/
@Deprecated
@SuppressWarnings("serial")
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 f646df23e4..9c71af7c5c 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,7 +30,6 @@ 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;
@@ -43,8 +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 No direct replacement - use a subclass of
+ * {@code AbstractBackEndHierarchicalDataProvider}, such as the
+ * example in Vaadin Sampler for File System Explorer.
*/
@Deprecated
@SuppressWarnings("serial")
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 adc075a527..a0943bc7ce 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
@@ -36,8 +36,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 Use an appropriate implementation of
+ * {@code HierarchicalDataProvider} such as {@code TreeDataProvider}
+ * or {@code AbstractBackEndHierarchicalDataProvider}.
*/
@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 437881e4d6..880350a3b2 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
@@ -27,8 +27,9 @@ import com.vaadin.v7.data.Container.Hierarchical;
*
* @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 No direct replacement - use an appropriate implementation of
+ * {@code HierarchicalDataProvider} such as {@code TreeDataProvider}
+ * or {@code AbstractBackEndHierarchicalDataProvider}.
*/
@Deprecated
@SuppressWarnings({ "serial" })
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 b126fa8f0e..a5e272b604 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. New hierarchical components are planned in an upcoming version of Vaadin Framework 8.
+ * @deprecated See {@code com.vaadin.ui.Tree}.
*/
@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 a6ad1ce613..3c608efc70 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. New hierarchical components are planned in an upcoming version of Vaadin Framework 8.
+ * @deprecated See {@code TreeGrid}.
*/
@SuppressWarnings({ "serial" })
@Deprecated