Bladeren bron

Add HasHierarchicalDataProvider#setTreeData

Additionally removes TreeData constructors from Tree and TreeGrid.
tags/8.1.0.beta1
Aleksi Hietanen 7 jaren geleden
bovenliggende
commit
7d7f41bc2a

+ 12
- 1
server/src/main/java/com/vaadin/data/HasHierarchicalDataProvider.java Bestand weergeven

@@ -37,6 +37,16 @@ import com.vaadin.data.provider.TreeDataProvider;
*/
public interface HasHierarchicalDataProvider<T> extends HasDataProvider<T> {

/**
* Sets a new {@link TreeDataProvider} wrapping the given {@link TreeData}.
*
* @param treeData
* the tree data to set
*/
public default void setTreeData(TreeData<T> treeData) {
setDataProvider(new TreeDataProvider<>(treeData));
}

/**
* Gets the backing {@link TreeData} instance of the data provider, if the
* data provider is a {@link TreeDataProvider}.
@@ -51,7 +61,8 @@ public interface HasHierarchicalDataProvider<T> extends HasDataProvider<T> {
if (getDataProvider() instanceof TreeDataProvider) {
return ((TreeDataProvider<T>) getDataProvider()).getTreeData();
} else {
throw new IllegalStateException("");
throw new IllegalStateException(
"Data provider is not an instance of TreeDataProvider");
}
}


+ 0
- 10
server/src/main/java/com/vaadin/ui/Tree.java Bestand weergeven

@@ -260,16 +260,6 @@ public class Tree<T> extends Composite
treeGrid.setDataProvider(dataProvider);
}

/**
* Constructs a new Tree Component with given {@code TreeData}.
*
* @param treeData
* the tree data for component
*/
public Tree(TreeData<T> treeData) {
this(null, new TreeDataProvider<>(treeData));
}

/**
* Constructs a new Tree Component with given
* {@code HierarchicalDataProvider}.

+ 1
- 18
server/src/main/java/com/vaadin/ui/TreeGrid.java Bestand weergeven

@@ -106,23 +106,6 @@ public class TreeGrid<T> extends Grid<T>
setDataProvider(dataProvider);
}

/**
* Creates a {@code TreeGrid} using the given in-memory data, without
* support for creating columns based on property names. Use an alternative
* constructor, such as {@link TreeGrid#TreeGrid(Class)}, to create a
* {@code TreeGrid} that automatically sets up columns based on the type of
* presented data.
*
* @see TreeData
*
* @param data
* the data to use, not {@code null}
*/
public TreeGrid(TreeData<T> data) {
this();
setDataProvider(new TreeDataProvider<>(data));
}

/**
* Creates a {@code TreeGrid} using a custom {@link PropertySet}
* implementation and custom data communicator.
@@ -551,7 +534,7 @@ public class TreeGrid<T> extends Grid<T>

/**
* Gets the item collapse allowed provider.
*
*
* @return the item collapse allowed provider
*/
public ItemCollapseAllowedProvider<T> getItemCollapseAllowedProvider() {

Laden…
Annuleren
Opslaan