Skip to content
Snippets Groups Projects
Commit 4b9a1311 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

JFX: Correct generics of the TreeViewer.

parent ccbab5f1
No related branches found
No related tags found
1 merge request!473482
HierarchicModelElementTreeViewer.java 8662b201c3a459f3ebe3620970652f7a3f90270e GREEN ModelElementTreeViewer.java d8443481e634347b0c533f23d0ae65e312b658f6 YELLOW
...@@ -15,20 +15,21 @@ ...@@ -15,20 +15,21 @@
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
package org.fortiss.tooling.base.ui.javafx.control.treetableview; package org.fortiss.tooling.base.ui.javafx.control.treetableview;
import javafx.embed.swt.SWTFXUtils;
import javafx.scene.Node;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.TreeView;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import org.fortiss.tooling.base.model.element.IHierarchicElement; import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.base.model.element.IModelElement;
import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeContentProviderBase; import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeContentProviderBase;
import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeUIProviderBase; import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeUIProviderBase;
import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeViewer; import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeViewer;
import org.fortiss.tooling.kernel.model.INamedCommentedElement; import org.fortiss.tooling.kernel.model.INamedCommentedElement;
import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
import javafx.embed.swt.SWTFXUtils;
import javafx.scene.Node;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.TreeView;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
/** /**
* TreeViewer that constructs a DynamicTreeViewer whose UI provider uses the methods and kernel * TreeViewer that constructs a DynamicTreeViewer whose UI provider uses the methods and kernel
* services for {@link IHierarchicElement}s and {@link INamedCommentedElement}s. * services for {@link IHierarchicElement}s and {@link INamedCommentedElement}s.
...@@ -37,13 +38,13 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; ...@@ -37,13 +38,13 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
* *
* @author diewald * @author diewald
*/ */
public class HierarchicModelElementTreeViewer<T extends IHierarchicElement & INamedCommentedElement> { public class ModelElementTreeViewer<T extends IModelElement & INamedCommentedElement> {
/** References the constructed {@link DynamicTreeViewer} "controller". */ /** References the constructed {@link DynamicTreeViewer} "controller". */
protected DynamicTreeViewer<T> dynTreeViewer; protected DynamicTreeViewer<T> dynTreeViewer;
/** Constructor. */ /** Constructor. */
public HierarchicModelElementTreeViewer(TreeView<T> treeView, T modelRoot, public ModelElementTreeViewer(TreeView<T> treeView, T modelRoot,
DynamicTreeContentProviderBase<T> contentProvider) { DynamicTreeContentProviderBase<T> contentProvider) {
DynamicTreeUIProviderBase<T> uiProvider = createContentUIProvider(); DynamicTreeUIProviderBase<T> uiProvider = createContentUIProvider();
dynTreeViewer = dynTreeViewer =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment