You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/04/24 21:31:14 UTC

(cayenne) 02/08: Modeler refactoring

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit a39af66aadf9d7386350392399a1a0cd5e65862c
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:56:39 2026 -0400

    Modeler refactoring
---
 .../cayenne/modeler/ui/project/ProjectView.java    |    5 +-
 ...ectTreeView.java => ProjectTreeController.java} |  625 +++++-------
 .../modeler/ui/project/tree/ProjectTreeView.java   | 1000 +-------------------
 3 files changed, 266 insertions(+), 1364 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
index 58df011db..1a9b20ea6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.modeler.action.CollapseTreeAction;
 import org.apache.cayenne.modeler.action.FilterAction;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
 import org.apache.cayenne.modeler.ui.project.editor.EditorPanelView;
+import org.apache.cayenne.modeler.ui.project.tree.ProjectTreeController;
 import org.apache.cayenne.modeler.ui.project.tree.ProjectTreeView;
 import org.apache.cayenne.modeler.ui.project.tree.treefilter.TreeFilterController;
 import org.slf4j.LoggerFactory;
@@ -36,6 +37,7 @@ import java.awt.*;
  */
 public class ProjectView extends JPanel {
 
+    private final ProjectTreeController treeController;
     private final ProjectTreeView treePanel;
     private final EditorPanelView editorPanel;
     private final TreeFilterController filterController;
@@ -61,7 +63,8 @@ public class ProjectView extends JPanel {
         barPanel.add(filterButton);
         barPanel.add(collapseButton);
 
-        treePanel = new ProjectTreeView(controller);
+        treeController = new ProjectTreeController(controller);
+        treePanel = treeController.getView();
         treePanel.setMinimumSize(new Dimension(75, 180));
 
         JPanel treeNavigatePanel = new JPanel();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
similarity index 68%
copy from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
copy to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
index bde68b899..977cadb98 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
@@ -22,28 +22,19 @@ package org.apache.cayenne.modeler.ui.project.tree;
 import org.apache.cayenne.configuration.ConfigurationNode;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.event.model.DataMapEvent;
-import org.apache.cayenne.modeler.event.model.DataMapListener;
-import org.apache.cayenne.modeler.event.model.DataNodeEvent;
-import org.apache.cayenne.modeler.event.model.DataNodeListener;
-import org.apache.cayenne.modeler.event.model.DomainEvent;
-import org.apache.cayenne.modeler.event.model.DomainListener;
-import org.apache.cayenne.modeler.event.model.ProcedureEvent;
-import org.apache.cayenne.modeler.event.model.ProcedureListener;
-import org.apache.cayenne.modeler.event.model.QueryEvent;
-import org.apache.cayenne.modeler.event.model.QueryListener;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.Embeddable;
 import org.apache.cayenne.map.Entity;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.Procedure;
+import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.map.event.DbEntityListener;
 import org.apache.cayenne.map.event.EmbeddableEvent;
 import org.apache.cayenne.map.event.EmbeddableListener;
 import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.map.event.ObjEntityListener;
+import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.action.CopyAction;
 import org.apache.cayenne.modeler.action.CreateDataMapAction;
 import org.apache.cayenne.modeler.action.CreateDbEntityAction;
@@ -75,25 +66,26 @@ import org.apache.cayenne.modeler.event.display.ProcedureDisplayEvent;
 import org.apache.cayenne.modeler.event.display.ProcedureDisplayListener;
 import org.apache.cayenne.modeler.event.display.QueryDisplayEvent;
 import org.apache.cayenne.modeler.event.display.QueryDisplayListener;
+import org.apache.cayenne.modeler.event.model.DataMapEvent;
+import org.apache.cayenne.modeler.event.model.DataMapListener;
+import org.apache.cayenne.modeler.event.model.DataNodeEvent;
+import org.apache.cayenne.modeler.event.model.DataNodeListener;
+import org.apache.cayenne.modeler.event.model.DomainEvent;
+import org.apache.cayenne.modeler.event.model.DomainListener;
+import org.apache.cayenne.modeler.event.model.ProcedureEvent;
+import org.apache.cayenne.modeler.event.model.ProcedureListener;
+import org.apache.cayenne.modeler.event.model.QueryEvent;
+import org.apache.cayenne.modeler.event.model.QueryListener;
+import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.Comparators;
-import org.apache.cayenne.project.Project;
-import org.apache.cayenne.map.QueryDescriptor;
-import org.apache.cayenne.reflect.PropertyUtils;
-import org.apache.cayenne.resource.Resource;
-import org.apache.cayenne.swing.components.TopBorder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.swing.Action;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 import javax.swing.MenuElement;
+import javax.swing.SwingUtilities;
 import javax.swing.event.TreeExpansionEvent;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
@@ -101,8 +93,8 @@ import javax.swing.event.TreeWillExpandListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
-import javax.swing.tree.TreeSelectionModel;
-import java.awt.*;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.dnd.DnDConstants;
 import java.awt.dnd.DragSource;
 import java.awt.dnd.MouseDragGestureRecognizer;
@@ -113,73 +105,76 @@ import java.util.Comparator;
 import java.util.List;
 
 /**
- * Panel displaying Cayenne project as a tree.
+ * Controller for the project navigation tree. Owns the {@link ProjectTreeView} and translates
+ * between project events and tree state.
  */
-public class ProjectTreeView extends JTree implements DomainDisplayListener,
-        DomainListener, DataMapDisplayListener, DataMapListener, DataNodeDisplayListener,
-        DataNodeListener, ObjEntityListener, ObjEntityDisplayListener, DbEntityListener,
-        DbEntityDisplayListener, QueryListener, QueryDisplayListener, ProcedureListener,
-        ProcedureDisplayListener, MultipleObjectsDisplayListener,
-        EmbeddableDisplayListener, EmbeddableListener {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProjectTreeView.class);
-
-    private static final Color SELECTION_COLOR = UIManager.getColor("Tree.selectionBackground");
-
-    private final ProjectController controller;
+public class ProjectTreeController extends ChildController<ProjectController>
+        implements DomainDisplayListener, DomainListener, DataMapDisplayListener,
+        DataMapListener, DataNodeDisplayListener, DataNodeListener, ObjEntityListener,
+        ObjEntityDisplayListener, DbEntityListener, DbEntityDisplayListener, QueryListener,
+        QueryDisplayListener, ProcedureListener, ProcedureDisplayListener,
+        MultipleObjectsDisplayListener, EmbeddableDisplayListener, EmbeddableListener {
+
+    private final ProjectTreeView view;
     private final TreeSelectionListener treeSelectionListener;
     private JPopupMenu popup;
 
-    public ProjectTreeView(ProjectController controller) {
-        this.controller = controller;
+    public ProjectTreeController(ProjectController parent) {
+        super(parent);
+
+        this.view = new ProjectTreeView();
 
-        setCellRenderer(CellRenderers.treeRenderer());
-        setOpaque(false);
-        setBorder(TopBorder.create());
+        // install the tree model from the currently open project
+        view.setModel(new ProjectTreeModel(parent.getProject()));
 
         this.treeSelectionListener = createTreeSelectionListener();
-        addTreeSelectionListener(treeSelectionListener);
-        addTreeWillExpandListener(createTreeExpandListener());
-        addMouseListener(new MouseClickHandler());
-
-        controller.addDomainListener(this);
-        controller.addDomainDisplayListener(this);
-        controller.addDataNodeListener(this);
-        controller.addDataNodeDisplayListener(this);
-        controller.addDataMapListener(this);
-        controller.addDataMapDisplayListener(this);
-        controller.addObjEntityListener(this);
-        controller.addObjEntityDisplayListener(this);
-        controller.addDbEntityListener(this);
-        controller.addDbEntityDisplayListener(this);
-        controller.addEmbeddableDisplayListener(this);
-        controller.addEmbeddableListener(this);
-        controller.addProcedureListener(this);
-        controller.addProcedureDisplayListener(this);
-        controller.addQueryListener(this);
-        controller.addQueryDisplayListener(this);
-        controller.addMultipleObjectsDisplayListener(this);
-        controller.getApplication().getActionManager().setupCutCopyPaste(
-                this,
+        view.addTreeSelectionListener(treeSelectionListener);
+        view.addTreeWillExpandListener(createTreeExpandListener());
+        view.addMouseListener(new MouseClickHandler());
+
+        parent.addDomainListener(this);
+        parent.addDomainDisplayListener(this);
+        parent.addDataNodeListener(this);
+        parent.addDataNodeDisplayListener(this);
+        parent.addDataMapListener(this);
+        parent.addDataMapDisplayListener(this);
+        parent.addObjEntityListener(this);
+        parent.addObjEntityDisplayListener(this);
+        parent.addDbEntityListener(this);
+        parent.addDbEntityDisplayListener(this);
+        parent.addEmbeddableDisplayListener(this);
+        parent.addEmbeddableListener(this);
+        parent.addProcedureListener(this);
+        parent.addProcedureDisplayListener(this);
+        parent.addQueryListener(this);
+        parent.addQueryDisplayListener(this);
+        parent.addMultipleObjectsDisplayListener(this);
+
+        parent.getApplication().getActionManager().setupCutCopyPaste(
+                view,
                 CutAction.class,
                 CopyAction.class);
 
-        initFromModel(controller.getProject());
-
         DragSource dragSource = new DragSource();
         Toolkit.getDefaultToolkit().createDragGestureRecognizer(
                 MouseDragGestureRecognizer.class,
                 dragSource,
-                this,
+                view,
                 DnDConstants.ACTION_COPY,
-                new TreeDragSource(dragSource, this, controller));
+                new TreeDragSource(dragSource, view, parent));
+    }
+
+    @Override
+    public ProjectTreeView getView() {
+        return view;
     }
 
     private TreeSelectionListener createTreeSelectionListener() {
         return new TreeSelectionListener() {
 
+            @Override
             public void valueChanged(TreeSelectionEvent e) {
-                TreePath[] paths = getSelectionPaths();
+                TreePath[] paths = view.getSelectionPaths();
 
                 if (paths != null) {
                     if (paths.length > 1) {
@@ -201,7 +196,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
                             projectParentPath = createProjectPath(parentPath);
                         }
 
-                        controller.displayMultipleObjects(new MultipleObjectsDisplayEvent(
+                        parent.displayMultipleObjects(new MultipleObjectsDisplayEvent(
                                 this,
                                 projectPaths, projectParentPath));
                     } else if (paths.length == 1) {
@@ -226,82 +221,27 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
             @Override
             public void treeWillExpand(TreeExpansionEvent e) {
                 TreePath path = e.getPath();
-                if (!isPathSelected(path) && !isSelectionEmpty()) {
-                    setSelectionPath(path);
+                if (!view.isPathSelected(path) && !view.isSelectionEmpty()) {
+                    view.setSelectionPath(path);
                 }
             }
 
             @Override
             public void treeWillCollapse(TreeExpansionEvent e) {
                 TreePath path = e.getPath();
-                if (!isPathSelected(path) && !isSelectionEmpty()) {
-                    setSelectionPath(path);
+                if (!view.isPathSelected(path) && !view.isSelectionEmpty()) {
+                    view.setSelectionPath(path);
                 }
             }
         };
     }
 
-    private void initFromModel(Project project) {
-
-        // build model
-        ProjectTreeModel model = new ProjectTreeModel(project);
-        setRootVisible(true);
-        setModel(model);
-        getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
-    }
-
-    /**
-     * Returns tree model cast to ProjectTreeModel.
-     */
-    public ProjectTreeModel getProjectModel() {
-        return (ProjectTreeModel) getModel();
-    }
-
-    /**
-     * Returns a "name" property of the tree node.
-     */
     @Override
-    public String convertValueToText(
-            Object value,
-            boolean selected,
-            boolean expanded,
-            boolean leaf,
-            int row,
-            boolean hasFocus) {
-
-        // unwrap
-        while (value instanceof DefaultMutableTreeNode) {
-            value = ((DefaultMutableTreeNode) value).getUserObject();
-        }
-
-        // String - just return it
-        if (value instanceof String) {
-            return value.toString();
-        }
-
-        // Project - return the name of top file
-        if (value instanceof Project) {
-            Resource resource = ((Project) value).getConfigurationResource();
-            return (resource != null) ? resource.getURL().getPath() : "";
-        }
-
-        // read name property
-        try {
-            if (value instanceof Embeddable) {
-                return String.valueOf(PropertyUtils.getProperty(value, "className"));
-            }
-
-            return (value != null) ? String.valueOf(PropertyUtils.getProperty(value, "name")) : "";
-        } catch (Exception e) {
-            LOGGER.warn("Exception reading property 'name', class " + value.getClass().getName(), e);
-            return "";
-        }
-    }
-
     public void domainSelected(DomainDisplayEvent e) {
         navigateTo(e.getDomain());
     }
 
+    @Override
     public void dataNodeSlected(DataNodeDisplayEvent e) {
         navigateTo(e.getDomain(), e.getDataNode());
     }
@@ -341,34 +281,39 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         TreePath[] treePaths = new TreePath[nodes.length];
 
         for (int i = 0; i < nodes.length; i++) {
-            DefaultMutableTreeNode treeNode = getProjectModel().getNodeForObjectPath(new Object[]{e.getParentNode(), nodes[i]});
+            DefaultMutableTreeNode treeNode = view.getProjectModel().getNodeForObjectPath(new Object[]{e.getParentNode(), nodes[i]});
             if (treeNode != null) {
                 treePaths[i] = new TreePath(treeNode.getPath());
             } else if (e.getParentNode() == nodes[i]) {
-                treeNode = getProjectModel().getNodeForObjectPath(new Object[]{e.getParentNode()});
+                treeNode = view.getProjectModel().getNodeForObjectPath(new Object[]{e.getParentNode()});
                 treePaths[i] = new TreePath(treeNode.getPath());
             }
         }
 
-        if (!isVisible(treePaths[0])) {
-            makeVisible(treePaths[0]);
+        if (!view.isVisible(treePaths[0])) {
+            view.makeVisible(treePaths[0]);
 
-            Rectangle bounds = getPathBounds(treePaths[0]);
+            Rectangle bounds = view.getPathBounds(treePaths[0]);
             if (bounds != null) {
-                bounds.height = getVisibleRect().height;
-                scrollRectToVisible(bounds);
+                bounds.height = view.getVisibleRect().height;
+                view.scrollRectToVisible(bounds);
             }
         }
 
-        setSelectionPaths(treePaths);
+        view.setSelectionPaths(treePaths);
+    }
+
+    @Override
+    public void embeddableSelected(EmbeddableDisplayEvent e) {
+        navigateTo(e.getDomain(), e.getDataMap(), e.getEmbeddable());
     }
 
     @Override
     public void procedureAdded(ProcedureEvent e) {
 
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
+        DefaultMutableTreeNode node = view.getProjectModel().getNodeForObjectPath(
                 new Object[]{
-                        controller.getProject().getRootNode(),
+                        parent.getProject().getRootNode(),
                         e.getProcedure().getDataMap()
                 });
 
@@ -379,14 +324,14 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         Procedure procedure = e.getProcedure();
         DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(procedure, false);
         positionNode(node, currentNode, Comparators.getDataMapChildrenComparator());
-        navigateTo(currentNode);
+        view.navigateTo(currentNode);
     }
 
     @Override
     public void procedureChanged(ProcedureEvent e) {
         if (e.isNameChange()) {
             Object[] path = new Object[]{
-                    controller.getProject().getRootNode(),
+                    parent.getProject().getRootNode(),
                     e.getProcedure().getDataMap(), e.getProcedure()
             };
 
@@ -398,9 +343,8 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
 
     @Override
     public void procedureRemoved(ProcedureEvent e) {
-
         removeNode(new Object[]{
-                controller.getProject().getRootNode(),
+                parent.getProject().getRootNode(),
                 e.getProcedure().getDataMap(), e.getProcedure()
         });
     }
@@ -408,11 +352,11 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
     @Override
     public void queryAdded(QueryEvent e) {
 
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
+        DefaultMutableTreeNode node = view.getProjectModel().getNodeForObjectPath(
                 new Object[]{
                         e.getDomain() != null
                                 ? e.getDomain()
-                                : (DataChannelDescriptor) controller
+                                : (DataChannelDescriptor) parent
                                 .getProject()
                                 .getRootNode(), e.getDataMap()
                 });
@@ -424,7 +368,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         QueryDescriptor query = e.getQuery();
         DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(query, false);
         positionNode(node, currentNode, Comparators.getDataMapChildrenComparator());
-        navigateTo(currentNode);
+        view.navigateTo(currentNode);
     }
 
     @Override
@@ -434,7 +378,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
             Object[] path = new Object[]{
                     e.getDomain() != null
                             ? e.getDomain()
-                            : (DataChannelDescriptor) controller.getProject().getRootNode(),
+                            : (DataChannelDescriptor) parent.getProject().getRootNode(),
                     e.getQuery().getDataMap(), e.getQuery()
             };
 
@@ -447,7 +391,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
     @Override
     public void queryRemoved(QueryEvent e) {
         removeNode(new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
+                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) parent
                         .getProject()
                         .getRootNode(), e.getDataMap(), e.getQuery()
         });
@@ -463,7 +407,6 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         updateNode(path);
 
         if (e.isNameChange()) {
-
             positionNode(path, Comparators.getNamedObjectComparator());
             navigateTo(path);
         }
@@ -472,11 +415,11 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
     @Override
     public void dataNodeChanged(DataNodeEvent e) {
 
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
+        DefaultMutableTreeNode node = view.getProjectModel().getNodeForObjectPath(
                 new Object[]{
                         e.getDomain() != null
                                 ? e.getDomain()
-                                : (DataChannelDescriptor) controller
+                                : (DataChannelDescriptor) parent
                                 .getProject()
                                 .getRootNode(), e.getDataNode()
                 });
@@ -486,12 +429,12 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
             if (e.isNameChange()) {
                 positionNode((DefaultMutableTreeNode) node.getParent(), node,
                         Comparators.getDataDomainChildrenComparator());
-                navigateTo(node);
+                view.navigateTo(node);
             } else {
 
-                getProjectModel().nodeChanged(node);
+                view.getProjectModel().nodeChanged(node);
 
-                DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
+                DataChannelDescriptor domain = (DataChannelDescriptor) parent.getProject().getRootNode();
 
                 // check for DataMap additions/removals...
                 String[] mapsName = e.getDataNode().getDataMapNames().toArray(new String[0]);
@@ -532,7 +475,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
                             }
                         }
                         if (!found) {
-                            removeNode(child);
+                            view.removeNode(child);
                         }
                     }
                 }
@@ -546,11 +489,11 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
             return;
         }
 
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
+        DefaultMutableTreeNode node = view.getProjectModel().getNodeForObjectPath(
                 new Object[]{
                         e.getDomain() != null
                                 ? e.getDomain()
-                                : (DataChannelDescriptor) controller.getProject().getRootNode()
+                                : (DataChannelDescriptor) parent.getProject().getRootNode()
                 });
 
         if (node == null) {
@@ -560,7 +503,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         DataNodeDescriptor dataNode = e.getDataNode();
         DefaultMutableTreeNode currentNode = ProjectTreeFactory.wrapProjectNode(dataNode);
         positionNode(node, currentNode, Comparators.getDataDomainChildrenComparator());
-        navigateTo(currentNode);
+        view.navigateTo(currentNode);
     }
 
     @Override
@@ -570,7 +513,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         }
 
         removeNode(new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
+                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) parent
                         .getProject()
                         .getRootNode(), e.getDataNode()
         });
@@ -580,7 +523,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
     public void dataMapChanged(DataMapEvent e) {
 
         Object[] path = new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
+                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) parent
                         .getProject()
                         .getRootNode(), e.getDataMap()
         };
@@ -588,7 +531,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         updateNode(path);
 
         if (e.isNameChange()) {
-            controller.updateEntityResolver();
+            parent.updateEntityResolver();
             positionNode(path, Comparators.getDataDomainChildrenComparator());
             navigateTo(path);
         }
@@ -597,8 +540,8 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
     @Override
     public void dataMapAdded(DataMapEvent e) {
         DataChannelDescriptor dataChannelDescriptor = e.getDomain() != null ? e.getDomain() :
-                (DataChannelDescriptor) controller.getProject().getRootNode();
-        DefaultMutableTreeNode domainNode = getProjectModel().getNodeForObjectPath(
+                (DataChannelDescriptor) parent.getProject().getRootNode();
+        DefaultMutableTreeNode domainNode = view.getProjectModel().getNodeForObjectPath(
                 new Object[]{
                         dataChannelDescriptor
                 });
@@ -606,19 +549,19 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         DefaultMutableTreeNode newMapNode = ProjectTreeFactory.wrapProjectNode(e
                 .getDataMap());
 
-        controller.getEntityResolver().addDataMap(e.getDataMap());
+        parent.getEntityResolver().addDataMap(e.getDataMap());
 
         positionNode(domainNode, newMapNode, Comparators.getDataDomainChildrenComparator());
         if (Application.getInstance().getFrameController().getDbImportController().isGlobalImport()) {
-            setSelected(newMapNode);
+            view.setSelected(newMapNode);
         } else {
-            navigateTo(newMapNode);
+            view.navigateTo(newMapNode);
         }
 
         for (DataNodeDescriptor dataNode : new ArrayList<>(dataChannelDescriptor.getNodeDescriptors())) {
             for (String dataMapName : dataNode.getDataMapNames()) {
                 if (e.getDataMap().getName().equals(dataMapName)) {
-                    controller.fireDataNodeEvent(new DataNodeEvent(this, dataNode));
+                    parent.fireDataNodeEvent(new DataNodeEvent(this, dataNode));
                 }
             }
         }
@@ -635,7 +578,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
                 dataChannelDescriptor, map
         });
 
-        controller.getEntityResolver().removeDataMap(e.getDataMap());
+        parent.getEntityResolver().removeDataMap(e.getDataMap());
 
         // Clean up map from the nodes
         for (DataNodeDescriptor dataNode : new ArrayList<>(dataChannelDescriptor.getNodeDescriptors())) {
@@ -688,7 +631,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
             Object[] path = new Object[]{
                     e.getDomain() != null
                             ? e.getDomain()
-                            : (DataChannelDescriptor) controller.getProject().getRootNode(),
+                            : (DataChannelDescriptor) parent.getProject().getRootNode(),
                     e.getEntity().getDataMap(), e.getEntity()
             };
 
@@ -706,11 +649,11 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
 
         Entity<?, ?, ?> entity = e.getEntity();
 
-        DefaultMutableTreeNode mapNode = getProjectModel().getNodeForObjectPath(
+        DefaultMutableTreeNode mapNode = view.getProjectModel().getNodeForObjectPath(
                 new Object[]{
                         e.getDomain() != null
                                 ? e.getDomain()
-                                : (DataChannelDescriptor) controller
+                                : (DataChannelDescriptor) parent
                                 .getProject()
                                 .getRootNode(), e.getEntity().getDataMap()
                 });
@@ -721,7 +664,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
 
         DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(entity, false);
         positionNode(mapNode, currentNode, Comparators.getDataMapChildrenComparator());
-        navigateTo(currentNode);
+        view.navigateTo(currentNode);
     }
 
     /**
@@ -735,118 +678,62 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
 
         // remove from DataMap tree
         removeNode(new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
+                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) parent
                         .getProject()
                         .getRootNode(), e.getEntity().getDataMap(), e.getEntity()
         });
     }
 
-    /**
-     * Removes current node from the tree. Selects a new node adjacent to the currently
-     * selected node instead.
-     */
-    private void removeNode(DefaultMutableTreeNode toBeRemoved) {
-
-        // lookup for the new selected node
-        Object selectedNode = null;
-
-        TreePath selectionPath = getSelectionPath();
-        if (selectionPath != null) {
-            selectedNode = selectionPath.getLastPathComponent();
-        }
-
-        if (toBeRemoved == selectedNode) {
-
-            // first search siblings
-            DefaultMutableTreeNode newSelection = toBeRemoved.getNextSibling();
-            if (newSelection == null) {
-                newSelection = toBeRemoved.getPreviousSibling();
-
-                // try parent
-                if (newSelection == null) {
-                    newSelection = (DefaultMutableTreeNode) toBeRemoved.getParent();
-
-                    // search the whole tree
-                    if (newSelection == null) {
-
-                        newSelection = toBeRemoved.getNextNode();
-                        if (newSelection == null) {
-
-                            newSelection = toBeRemoved.getPreviousNode();
-                        }
-                    }
-                }
-            }
-
-            navigateTo(newSelection);
-        }
-
-        getProjectModel().removeNodeFromParent(toBeRemoved);
-    }
-
-    /**
-     * Makes node current, visible and selected.
-     */
-    private void navigateTo(DefaultMutableTreeNode node) {
-        TreePath path = new TreePath(node.getPath());
-
-        if (!isVisible(path)) {
-            makeVisible(path);
-
-            Rectangle bounds = getPathBounds(path);
-            if (bounds != null) {
-                bounds.height = getVisibleRect().height;
-                scrollRectToVisible(bounds);
-            }
-        }
-
-        setSelectionPath(path);
-    }
-
-    /**
-     * Makes node current, visible but not selected.
-     */
-    private void setSelected(DefaultMutableTreeNode node) {
-        TreePath path = new TreePath(node.getPath());
-        if (!isVisible(path)) {
-            makeVisible(path);
-        }
-    }
-
-    private void navigateTo(Object... path) {
-        if (path == null) {
-            return;
-        }
+    @Override
+    public void embeddableAdded(EmbeddableEvent e, DataMap map) {
+        Embeddable embeddable = e.getEmbeddable();
 
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(path);
+        DefaultMutableTreeNode mapNode = view.getProjectModel().getNodeForObjectPath(
+                new Object[]{
+                        e.getDomain() != null
+                                ? e.getDomain()
+                                : (DataChannelDescriptor) parent
+                                .getProject()
+                                .getRootNode(), map
+                });
 
-        if (node == null) {
+        if (mapNode == null) {
             return;
         }
 
-        navigateTo(node);
+        DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(embeddable, false);
+        positionNode(mapNode, currentNode, Comparators.getDataMapChildrenComparator());
+        view.navigateTo(currentNode);
     }
 
-    private void updateNode(Object[] path) {
-        if (path == null) {
-            return;
-        }
+    @Override
+    public void embeddableChanged(EmbeddableEvent e, DataMap map) {
+        if (e.isNameChange()) {
+            Object[] path = new Object[]{
+                    e.getDomain() != null
+                            ? e.getDomain()
+                            : (DataChannelDescriptor) parent.getProject().getRootNode(),
+                    map, e.getEmbeddable()
+            };
 
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(path);
-        if (node != null) {
-            getProjectModel().nodeChanged(node);
+            updateNode(path);
+            positionNode(path, Comparators.getDataMapChildrenComparator());
+            navigateTo(path);
         }
     }
 
-    private void removeNode(Object[] path) {
-        if (path == null) {
+    @Override
+    public void embeddableRemoved(EmbeddableEvent e, DataMap map) {
+        if (e.getSource() == this) {
             return;
         }
 
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(path);
-        if (node != null) {
-            removeNode(node);
-        }
+        // remove from DataMap tree
+        removeNode(new Object[]{
+                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) parent
+                        .getProject()
+                        .getRootNode(), map, e.getEmbeddable()
+        });
     }
 
     /**
@@ -864,36 +751,36 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         Object[] data = getUserObjects(currentNode);
         if (data.length == 0) {
             // this should clear the right-side panel
-            controller.displayDomain(new DomainDisplayEvent(
+            parent.displayDomain(new DomainDisplayEvent(
                     this,
-                    (DataChannelDescriptor) controller.getProject().getRootNode()));
+                    (DataChannelDescriptor) parent.getProject().getRootNode()));
 
             return;
         }
 
         Object obj = data[data.length - 1];
         if (obj instanceof DataChannelDescriptor) {
-            controller.displayDomain(new DomainDisplayEvent(
+            parent.displayDomain(new DomainDisplayEvent(
                     this,
                     (DataChannelDescriptor) obj));
         } else if (obj instanceof DataMap) {
             if (data.length == 2) {
-                controller.displayDataMap(new DataMapDisplayEvent(
+                parent.displayDataMap(new DataMapDisplayEvent(
                         this,
                         (DataMap) obj,
-                        (DataChannelDescriptor) controller.getProject().getRootNode(),
+                        (DataChannelDescriptor) parent.getProject().getRootNode(),
                         (DataNodeDescriptor) data[data.length - 2]));
             } else if (data.length == 1) {
-                controller.displayDataMap(new DataMapDisplayEvent(
+                parent.displayDataMap(new DataMapDisplayEvent(
                         this,
                         (DataMap) obj,
-                        (DataChannelDescriptor) controller.getProject().getRootNode()));
+                        (DataChannelDescriptor) parent.getProject().getRootNode()));
             }
         } else if (obj instanceof DataNodeDescriptor) {
             if (data.length == 1) {
-                controller.displayDataNode(new DataNodeDisplayEvent(
+                parent.displayDataNode(new DataNodeDisplayEvent(
                         this,
-                        (DataChannelDescriptor) controller.getProject().getRootNode(),
+                        (DataChannelDescriptor) parent.getProject().getRootNode(),
                         (DataNodeDescriptor) obj));
             }
         } else if (obj instanceof Entity) {
@@ -904,45 +791,45 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
                     this,
                     (Entity) obj, (DataMap) data[data.length - 2],
                     (DataNodeDescriptor) data[data.length - 3],
-                    (DataChannelDescriptor) controller.getProject().getRootNode())
+                    (DataChannelDescriptor) parent.getProject().getRootNode())
 
                     : new EntityDisplayEvent(
                     this,
                     (Entity) obj, (DataMap) data[data.length - 2],
-                    (DataChannelDescriptor) controller.getProject().getRootNode());
+                    (DataChannelDescriptor) parent.getProject().getRootNode());
 
 
             e.setUnselectAttributes(true);
 
             if (obj instanceof ObjEntity) {
-                controller.displayObjEntity(e);
+                parent.displayObjEntity(e);
             } else if (obj instanceof DbEntity) {
-                controller.displayDbEntity(e);
+                parent.displayDbEntity(e);
             }
         } else if (obj instanceof Embeddable) {
             EmbeddableDisplayEvent e = new EmbeddableDisplayEvent(
                     this,
                     (Embeddable) obj,
                     (DataMap) data[data.length - 2],
-                    (DataChannelDescriptor) controller.getProject().getRootNode());
-            controller.displayEmbeddable(e);
+                    (DataChannelDescriptor) parent.getProject().getRootNode());
+            parent.displayEmbeddable(e);
         } else if (obj instanceof Procedure) {
             ProcedureDisplayEvent e = new ProcedureDisplayEvent(
                     this,
                     (Procedure) obj,
                     (DataMap) data[data.length - 2],
-                    (DataChannelDescriptor) controller.getProject().getRootNode());
-            controller.displayProcedure(e);
+                    (DataChannelDescriptor) parent.getProject().getRootNode());
+            parent.displayProcedure(e);
         } else if (obj instanceof QueryDescriptor) {
             QueryDisplayEvent e = new QueryDisplayEvent(
                     this,
                     (QueryDescriptor) obj,
                     (DataMap) data[data.length - 2],
-                    (DataChannelDescriptor) controller.getProject().getRootNode());
-            controller.displayQuery(e);
+                    (DataChannelDescriptor) parent.getProject().getRootNode());
+            parent.displayQuery(e);
         }
 
-        this.scrollPathToVisible(path);
+        view.scrollPathToVisible(path);
     }
 
     /**
@@ -958,12 +845,48 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         return list.toArray();
     }
 
+    private void navigateTo(Object... path) {
+        if (path == null) {
+            return;
+        }
+
+        DefaultMutableTreeNode node = view.getProjectModel().getNodeForObjectPath(path);
+
+        if (node == null) {
+            return;
+        }
+
+        view.navigateTo(node);
+    }
+
+    private void updateNode(Object[] path) {
+        if (path == null) {
+            return;
+        }
+
+        DefaultMutableTreeNode node = view.getProjectModel().getNodeForObjectPath(path);
+        if (node != null) {
+            view.updateNode(node);
+        }
+    }
+
+    private void removeNode(Object[] path) {
+        if (path == null) {
+            return;
+        }
+
+        DefaultMutableTreeNode node = view.getProjectModel().getNodeForObjectPath(path);
+        if (node != null) {
+            view.removeNode(node);
+        }
+    }
+
     private void positionNode(Object[] path, Comparator<ConfigurationNode> comparator) {
         if (path == null) {
             return;
         }
 
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(path);
+        DefaultMutableTreeNode node = view.getProjectModel().getNodeForObjectPath(path);
         if (node == null) {
             return;
         }
@@ -976,11 +899,11 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
             DefaultMutableTreeNode treeNode,
             Comparator<ConfigurationNode> comparator) {
 
-        removeTreeSelectionListener(treeSelectionListener);
+        view.removeTreeSelectionListener(treeSelectionListener);
         try {
-            getProjectModel().positionNode(parent, treeNode, comparator);
+            view.getProjectModel().positionNode(parent, treeNode, comparator);
         } finally {
-            addTreeSelectionListener(treeSelectionListener);
+            view.addTreeSelectionListener(treeSelectionListener);
         }
     }
 
@@ -1012,32 +935,42 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
     }
 
     /**
-     * Creates and returns an menu item associated with the key.
-     *
-     * @param actionType action type
+     * Creates and returns a menu item associated with the given action type.
      */
     private JMenuItem buildMenu(Class<? extends Action> actionType) {
-        CayenneAction action = (CayenneAction) controller
+        CayenneAction action = (CayenneAction) parent
                 .getApplication()
                 .getActionManager()
                 .getAction(actionType);
         return action.buildMenu();
     }
 
+    // Filter all disabled actions in popupMenu, but skip Cut-Copy-Paste block. It should always exist.
+    private void popupMenuFilter() {
+        Action cutAction = parent.getApplication().getActionManager().getAction(CutAction.class);
+        for (MenuElement element : popup.getSubElements()) {
+            JMenuItem item = (JMenuItem) element;
+            if (!item.getAction().equals(cutAction)) {
+                item.setVisible(item.isEnabled());
+            } else {
+                break;
+            }
+        }
+    }
+
     /**
-     * Class to handle:
-     * - right-click and show popup for selected tree row
-     * - left click row selection based on full row length (instead of default selection based on label size)
+     * Handles right-click for popup display and left-click row selection based on the full
+     * row length (instead of the default selection based on label bounds).
      */
-    class MouseClickHandler extends MouseAdapter {
+    private class MouseClickHandler extends MouseAdapter {
 
         void selectRowForEvent(MouseEvent e) {
-            int closestRow = getClosestRowForLocation(e.getX(), e.getY());
-            Rectangle closestRowBounds = getRowBounds(closestRow);
+            int closestRow = view.getClosestRowForLocation(e.getX(), e.getY());
+            Rectangle closestRowBounds = view.getRowBounds(closestRow);
             if (e.getY() >= closestRowBounds.getY()
                     && e.getY() < closestRowBounds.getY() + closestRowBounds.getHeight()
-                    && !isRowSelected(closestRow)) {
-                setSelectionRow(closestRow);
+                    && !view.isRowSelected(closestRow)) {
+                view.setSelectionRow(closestRow);
             }
         }
 
@@ -1059,92 +992,8 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
                     popup = createJPopupMenu();
                 }
                 popupMenuFilter();
-                popup.show(ProjectTreeView.this, e.getX(), e.getY());
-            }
-        }
-    }
-
-    public void embeddableAdded(EmbeddableEvent e, DataMap map) {
-        Embeddable embeddable = e.getEmbeddable();
-
-        DefaultMutableTreeNode mapNode = getProjectModel().getNodeForObjectPath(
-                new Object[]{
-                        e.getDomain() != null
-                                ? e.getDomain()
-                                : (DataChannelDescriptor) controller
-                                .getProject()
-                                .getRootNode(), map
-                });
-
-        if (mapNode == null) {
-            return;
-        }
-
-        DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(embeddable, false);
-        positionNode(mapNode, currentNode, Comparators.getDataMapChildrenComparator());
-        navigateTo(currentNode);
-    }
-
-    public void embeddableChanged(EmbeddableEvent e, DataMap map) {
-        if (e.isNameChange()) {
-            Object[] path = new Object[]{
-                    e.getDomain() != null
-                            ? e.getDomain()
-                            : (DataChannelDescriptor) controller.getProject().getRootNode(),
-                    map, e.getEmbeddable()
-            };
-
-            updateNode(path);
-            positionNode(path, Comparators.getDataMapChildrenComparator());
-            navigateTo(path);
-        }
-    }
-
-    public void embeddableRemoved(EmbeddableEvent e, DataMap map) {
-        if (e.getSource() == this) {
-            return;
-        }
-
-        // remove from DataMap tree
-        removeNode(new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
-                        .getProject()
-                        .getRootNode(), map, e.getEmbeddable()
-        });
-    }
-
-    public void embeddableSelected(EmbeddableDisplayEvent e) {
-        navigateTo(e.getDomain(), e.getDataMap(), e.getEmbeddable());
-
-    }
-
-    // Filter all disabled actions in popupMenu, but skip Cut-Copy-Paste block. It should always exist.
-    public void popupMenuFilter() {
-        Action cutAction = controller.getApplication().getActionManager().getAction(CutAction.class);
-        for (MenuElement element : popup.getSubElements()) {
-            JMenuItem item = (JMenuItem) element;
-            if (!item.getAction().equals(cutAction)) {
-                item.setVisible(item.isEnabled());
-            } else {
-                break;
-            }
-        }
-    }
-
-    @Override
-    public void paintComponent(Graphics g) {
-        g.setColor(Color.white);
-        g.fillRect(0, 0, getWidth(), getHeight());
-        if (getSelectionCount() > 0) {
-            g.setColor(SELECTION_COLOR);
-            int[] rows = getSelectionRows();
-            if (rows != null) {
-                for (int i : rows) {
-                    Rectangle r = getRowBounds(i);
-                    g.fillRect(0, r.y, getWidth(), r.height);
-                }
+                popup.show(view, e.getX(), e.getY());
             }
         }
-        super.paintComponent(g);
     }
 }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
index bde68b899..1dd98681d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
@@ -19,234 +19,39 @@
 
 package org.apache.cayenne.modeler.ui.project.tree;
 
-import org.apache.cayenne.configuration.ConfigurationNode;
-import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.event.model.DataMapEvent;
-import org.apache.cayenne.modeler.event.model.DataMapListener;
-import org.apache.cayenne.modeler.event.model.DataNodeEvent;
-import org.apache.cayenne.modeler.event.model.DataNodeListener;
-import org.apache.cayenne.modeler.event.model.DomainEvent;
-import org.apache.cayenne.modeler.event.model.DomainListener;
-import org.apache.cayenne.modeler.event.model.ProcedureEvent;
-import org.apache.cayenne.modeler.event.model.ProcedureListener;
-import org.apache.cayenne.modeler.event.model.QueryEvent;
-import org.apache.cayenne.modeler.event.model.QueryListener;
-import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.Embeddable;
-import org.apache.cayenne.map.Entity;
-import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.map.event.DbEntityListener;
-import org.apache.cayenne.map.event.EmbeddableEvent;
-import org.apache.cayenne.map.event.EmbeddableListener;
-import org.apache.cayenne.map.event.EntityEvent;
-import org.apache.cayenne.map.event.ObjEntityListener;
-import org.apache.cayenne.modeler.action.CopyAction;
-import org.apache.cayenne.modeler.action.CreateDataMapAction;
-import org.apache.cayenne.modeler.action.CreateDbEntityAction;
-import org.apache.cayenne.modeler.action.CreateEmbeddableAction;
-import org.apache.cayenne.modeler.action.CreateNodeAction;
-import org.apache.cayenne.modeler.action.CreateObjEntityAction;
-import org.apache.cayenne.modeler.action.CreateProcedureAction;
-import org.apache.cayenne.modeler.action.CreateQueryAction;
-import org.apache.cayenne.modeler.action.CutAction;
-import org.apache.cayenne.modeler.action.DbEntitySyncAction;
-import org.apache.cayenne.modeler.action.LinkDataMapsAction;
-import org.apache.cayenne.modeler.action.ObjEntitySyncAction;
-import org.apache.cayenne.modeler.action.PasteAction;
-import org.apache.cayenne.modeler.action.RemoveAction;
-import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
-import org.apache.cayenne.modeler.event.display.DataMapDisplayListener;
-import org.apache.cayenne.modeler.event.display.DataNodeDisplayEvent;
-import org.apache.cayenne.modeler.event.display.DataNodeDisplayListener;
-import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
-import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
-import org.apache.cayenne.modeler.event.display.DomainDisplayListener;
-import org.apache.cayenne.modeler.event.display.EmbeddableDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EmbeddableDisplayListener;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
-import org.apache.cayenne.modeler.event.display.MultipleObjectsDisplayEvent;
-import org.apache.cayenne.modeler.event.display.MultipleObjectsDisplayListener;
-import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
-import org.apache.cayenne.modeler.event.display.ProcedureDisplayEvent;
-import org.apache.cayenne.modeler.event.display.ProcedureDisplayListener;
-import org.apache.cayenne.modeler.event.display.QueryDisplayEvent;
-import org.apache.cayenne.modeler.event.display.QueryDisplayListener;
-import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.CellRenderers;
-import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.project.Project;
-import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.reflect.PropertyUtils;
 import org.apache.cayenne.resource.Resource;
 import org.apache.cayenne.swing.components.TopBorder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.Action;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
 import javax.swing.JTree;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-import javax.swing.MenuElement;
-import javax.swing.event.TreeExpansionEvent;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.event.TreeWillExpandListener;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
-import java.awt.*;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DragSource;
-import java.awt.dnd.MouseDragGestureRecognizer;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Rectangle;
 
 /**
- * Panel displaying Cayenne project as a tree.
+ * Panel displaying a Cayenne project as a tree. Passive view driven by
+ * {@link ProjectTreeController}.
  */
-public class ProjectTreeView extends JTree implements DomainDisplayListener,
-        DomainListener, DataMapDisplayListener, DataMapListener, DataNodeDisplayListener,
-        DataNodeListener, ObjEntityListener, ObjEntityDisplayListener, DbEntityListener,
-        DbEntityDisplayListener, QueryListener, QueryDisplayListener, ProcedureListener,
-        ProcedureDisplayListener, MultipleObjectsDisplayListener,
-        EmbeddableDisplayListener, EmbeddableListener {
+public class ProjectTreeView extends JTree {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ProjectTreeView.class);
 
     private static final Color SELECTION_COLOR = UIManager.getColor("Tree.selectionBackground");
 
-    private final ProjectController controller;
-    private final TreeSelectionListener treeSelectionListener;
-    private JPopupMenu popup;
-
-    public ProjectTreeView(ProjectController controller) {
-        this.controller = controller;
-
+    ProjectTreeView() {
         setCellRenderer(CellRenderers.treeRenderer());
         setOpaque(false);
         setBorder(TopBorder.create());
-
-        this.treeSelectionListener = createTreeSelectionListener();
-        addTreeSelectionListener(treeSelectionListener);
-        addTreeWillExpandListener(createTreeExpandListener());
-        addMouseListener(new MouseClickHandler());
-
-        controller.addDomainListener(this);
-        controller.addDomainDisplayListener(this);
-        controller.addDataNodeListener(this);
-        controller.addDataNodeDisplayListener(this);
-        controller.addDataMapListener(this);
-        controller.addDataMapDisplayListener(this);
-        controller.addObjEntityListener(this);
-        controller.addObjEntityDisplayListener(this);
-        controller.addDbEntityListener(this);
-        controller.addDbEntityDisplayListener(this);
-        controller.addEmbeddableDisplayListener(this);
-        controller.addEmbeddableListener(this);
-        controller.addProcedureListener(this);
-        controller.addProcedureDisplayListener(this);
-        controller.addQueryListener(this);
-        controller.addQueryDisplayListener(this);
-        controller.addMultipleObjectsDisplayListener(this);
-        controller.getApplication().getActionManager().setupCutCopyPaste(
-                this,
-                CutAction.class,
-                CopyAction.class);
-
-        initFromModel(controller.getProject());
-
-        DragSource dragSource = new DragSource();
-        Toolkit.getDefaultToolkit().createDragGestureRecognizer(
-                MouseDragGestureRecognizer.class,
-                dragSource,
-                this,
-                DnDConstants.ACTION_COPY,
-                new TreeDragSource(dragSource, this, controller));
-    }
-
-    private TreeSelectionListener createTreeSelectionListener() {
-        return new TreeSelectionListener() {
-
-            public void valueChanged(TreeSelectionEvent e) {
-                TreePath[] paths = getSelectionPaths();
-
-                if (paths != null) {
-                    if (paths.length > 1) {
-                        ConfigurationNode projectParentPath = null;
-                        ConfigurationNode[] projectPaths = new ConfigurationNode[paths.length];
-                        boolean commonParentPath = true;
-
-                        for (int i = 0; i < paths.length; i++) {
-                            projectPaths[i] = createProjectPath(paths[i]);
-
-                            TreePath parentPath = paths[i].getParentPath();
-                            if (i > 0 && parentPath != null && !parentPath.equals(paths[i - 1].getParentPath())) {
-                                commonParentPath = false;
-                            }
-                        }
-
-                        if (commonParentPath) {
-                            TreePath parentPath = paths[0].getParentPath();
-                            projectParentPath = createProjectPath(parentPath);
-                        }
-
-                        controller.displayMultipleObjects(new MultipleObjectsDisplayEvent(
-                                this,
-                                projectPaths, projectParentPath));
-                    } else if (paths.length == 1) {
-                        processSelection(paths[0]);
-                    }
-                }
-            }
-
-            /**
-             * Converts TreePath to Object
-             */
-            private ConfigurationNode createProjectPath(TreePath treePath) {
-                Object[] path = treePath.getPath();
-                DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) path[path.length - 1];
-                return (ConfigurationNode) treeNode.getUserObject();
-            }
-        };
-    }
-
-    private TreeWillExpandListener createTreeExpandListener() {
-        return new TreeWillExpandListener() {
-            @Override
-            public void treeWillExpand(TreeExpansionEvent e) {
-                TreePath path = e.getPath();
-                if (!isPathSelected(path) && !isSelectionEmpty()) {
-                    setSelectionPath(path);
-                }
-            }
-
-            @Override
-            public void treeWillCollapse(TreeExpansionEvent e) {
-                TreePath path = e.getPath();
-                if (!isPathSelected(path) && !isSelectionEmpty()) {
-                    setSelectionPath(path);
-                }
-            }
-        };
-    }
-
-    private void initFromModel(Project project) {
-
-        // build model
-        ProjectTreeModel model = new ProjectTreeModel(project);
         setRootVisible(true);
-        setModel(model);
         getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
     }
 
@@ -298,454 +103,46 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         }
     }
 
-    public void domainSelected(DomainDisplayEvent e) {
-        navigateTo(e.getDomain());
-    }
-
-    public void dataNodeSlected(DataNodeDisplayEvent e) {
-        navigateTo(e.getDomain(), e.getDataNode());
-    }
-
-    @Override
-    public void dataMapSelected(DataMapDisplayEvent e) {
-        navigateTo(e.getDomain(), e.getDataMap());
-    }
-
-    @Override
-    public void objEntitySelected(EntityDisplayEvent e) {
-        navigateTo(e.getDomain(), e.getDataMap(), e.getEntity());
-    }
-
-    @Override
-    public void dbEntitySelected(EntityDisplayEvent e) {
-        navigateTo(e.getDomain(), e.getDataMap(), e.getEntity());
-    }
-
-    @Override
-    public void procedureSelected(ProcedureDisplayEvent e) {
-        navigateTo(e.getDomain(), e.getDataMap(), e.getProcedure());
-    }
-
-    @Override
-    public void querySelected(QueryDisplayEvent e) {
-        navigateTo(e.getDomain(), e.getDataMap(), e.getQuery());
-    }
-
-    @Override
-    public void multipleObjectsSelected(MultipleObjectsDisplayEvent e) {
-        if (e.getSource() == this || e.getParentNode() == null) {
-            return;
-        }
-
-        ConfigurationNode[] nodes = e.getNodes();
-        TreePath[] treePaths = new TreePath[nodes.length];
-
-        for (int i = 0; i < nodes.length; i++) {
-            DefaultMutableTreeNode treeNode = getProjectModel().getNodeForObjectPath(new Object[]{e.getParentNode(), nodes[i]});
-            if (treeNode != null) {
-                treePaths[i] = new TreePath(treeNode.getPath());
-            } else if (e.getParentNode() == nodes[i]) {
-                treeNode = getProjectModel().getNodeForObjectPath(new Object[]{e.getParentNode()});
-                treePaths[i] = new TreePath(treeNode.getPath());
-            }
-        }
+    /**
+     * Makes node current, visible and selected.
+     */
+    void navigateTo(DefaultMutableTreeNode node) {
+        TreePath path = new TreePath(node.getPath());
 
-        if (!isVisible(treePaths[0])) {
-            makeVisible(treePaths[0]);
+        if (!isVisible(path)) {
+            makeVisible(path);
 
-            Rectangle bounds = getPathBounds(treePaths[0]);
+            Rectangle bounds = getPathBounds(path);
             if (bounds != null) {
                 bounds.height = getVisibleRect().height;
                 scrollRectToVisible(bounds);
             }
         }
 
-        setSelectionPaths(treePaths);
-    }
-
-    @Override
-    public void procedureAdded(ProcedureEvent e) {
-
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
-                new Object[]{
-                        controller.getProject().getRootNode(),
-                        e.getProcedure().getDataMap()
-                });
-
-        if (node == null) {
-            return;
-        }
-
-        Procedure procedure = e.getProcedure();
-        DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(procedure, false);
-        positionNode(node, currentNode, Comparators.getDataMapChildrenComparator());
-        navigateTo(currentNode);
-    }
-
-    @Override
-    public void procedureChanged(ProcedureEvent e) {
-        if (e.isNameChange()) {
-            Object[] path = new Object[]{
-                    controller.getProject().getRootNode(),
-                    e.getProcedure().getDataMap(), e.getProcedure()
-            };
-
-            updateNode(path);
-            positionNode(path, Comparators.getDataMapChildrenComparator());
-            navigateTo(path);
-        }
-    }
-
-    @Override
-    public void procedureRemoved(ProcedureEvent e) {
-
-        removeNode(new Object[]{
-                controller.getProject().getRootNode(),
-                e.getProcedure().getDataMap(), e.getProcedure()
-        });
-    }
-
-    @Override
-    public void queryAdded(QueryEvent e) {
-
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
-                new Object[]{
-                        e.getDomain() != null
-                                ? e.getDomain()
-                                : (DataChannelDescriptor) controller
-                                .getProject()
-                                .getRootNode(), e.getDataMap()
-                });
-
-        if (node == null) {
-            return;
-        }
-
-        QueryDescriptor query = e.getQuery();
-        DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(query, false);
-        positionNode(node, currentNode, Comparators.getDataMapChildrenComparator());
-        navigateTo(currentNode);
-    }
-
-    @Override
-    public void queryChanged(QueryEvent e) {
-
-        if (e.isNameChange()) {
-            Object[] path = new Object[]{
-                    e.getDomain() != null
-                            ? e.getDomain()
-                            : (DataChannelDescriptor) controller.getProject().getRootNode(),
-                    e.getQuery().getDataMap(), e.getQuery()
-            };
-
-            updateNode(path);
-            positionNode(path, Comparators.getDataMapChildrenComparator());
-            navigateTo(path);
-        }
-    }
-
-    @Override
-    public void queryRemoved(QueryEvent e) {
-        removeNode(new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
-                        .getProject()
-                        .getRootNode(), e.getDataMap(), e.getQuery()
-        });
-    }
-
-    @Override
-    public void domainChanged(DomainEvent e) {
-
-        Object[] path = new Object[]{
-                e.getDomain()
-        };
-
-        updateNode(path);
-
-        if (e.isNameChange()) {
-
-            positionNode(path, Comparators.getNamedObjectComparator());
-            navigateTo(path);
-        }
-    }
-
-    @Override
-    public void dataNodeChanged(DataNodeEvent e) {
-
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
-                new Object[]{
-                        e.getDomain() != null
-                                ? e.getDomain()
-                                : (DataChannelDescriptor) controller
-                                .getProject()
-                                .getRootNode(), e.getDataNode()
-                });
-
-        if (node != null) {
-
-            if (e.isNameChange()) {
-                positionNode((DefaultMutableTreeNode) node.getParent(), node,
-                        Comparators.getDataDomainChildrenComparator());
-                navigateTo(node);
-            } else {
-
-                getProjectModel().nodeChanged(node);
-
-                DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
-
-                // check for DataMap additions/removals...
-                String[] mapsName = e.getDataNode().getDataMapNames().toArray(new String[0]);
-                int mapCount = mapsName.length;
-
-                // DataMap was linked
-                if (mapCount > node.getChildCount()) {
-
-                    for (String aMapsName : mapsName) {
-                        boolean found = false;
-                        for (int j = 0; j < node.getChildCount(); j++) {
-                            DefaultMutableTreeNode child = (DefaultMutableTreeNode) node.getChildAt(j);
-                            if (domain.getDataMap(aMapsName) == child.getUserObject()) {
-                                found = true;
-                                break;
-                            }
-                        }
-
-                        if (!found) {
-                            DefaultMutableTreeNode newMapNode =
-                                    new DefaultMutableTreeNode(domain.getDataMap(aMapsName), false);
-                            positionNode(node, newMapNode, Comparators.getNamedObjectComparator());
-                            break;
-                        }
-                    }
-                } else if (mapCount < node.getChildCount()) {
-                    // DataMap was unlinked
-                    int j = 0;
-                    while (j < node.getChildCount()) {
-                        boolean found = false;
-                        DefaultMutableTreeNode child;
-                        child = (DefaultMutableTreeNode) node.getChildAt(j);
-                        Object obj = child.getUserObject();
-                        for (Object aMapsName : mapsName) {
-                            if (domain.getDataMap(aMapsName.toString()) == obj) {
-                                found = true;
-                                j++;
-                            }
-                        }
-                        if (!found) {
-                            removeNode(child);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void dataNodeAdded(DataNodeEvent e) {
-        if (e.getSource() == this) {
-            return;
-        }
-
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
-                new Object[]{
-                        e.getDomain() != null
-                                ? e.getDomain()
-                                : (DataChannelDescriptor) controller.getProject().getRootNode()
-                });
-
-        if (node == null) {
-            return;
-        }
-
-        DataNodeDescriptor dataNode = e.getDataNode();
-        DefaultMutableTreeNode currentNode = ProjectTreeFactory.wrapProjectNode(dataNode);
-        positionNode(node, currentNode, Comparators.getDataDomainChildrenComparator());
-        navigateTo(currentNode);
-    }
-
-    @Override
-    public void dataNodeRemoved(DataNodeEvent e) {
-        if (e.getSource() == this) {
-            return;
-        }
-
-        removeNode(new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
-                        .getProject()
-                        .getRootNode(), e.getDataNode()
-        });
-    }
-
-    @Override
-    public void dataMapChanged(DataMapEvent e) {
-
-        Object[] path = new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
-                        .getProject()
-                        .getRootNode(), e.getDataMap()
-        };
-
-        updateNode(path);
-
-        if (e.isNameChange()) {
-            controller.updateEntityResolver();
-            positionNode(path, Comparators.getDataDomainChildrenComparator());
-            navigateTo(path);
-        }
-    }
-
-    @Override
-    public void dataMapAdded(DataMapEvent e) {
-        DataChannelDescriptor dataChannelDescriptor = e.getDomain() != null ? e.getDomain() :
-                (DataChannelDescriptor) controller.getProject().getRootNode();
-        DefaultMutableTreeNode domainNode = getProjectModel().getNodeForObjectPath(
-                new Object[]{
-                        dataChannelDescriptor
-                });
-
-        DefaultMutableTreeNode newMapNode = ProjectTreeFactory.wrapProjectNode(e
-                .getDataMap());
-
-        controller.getEntityResolver().addDataMap(e.getDataMap());
-
-        positionNode(domainNode, newMapNode, Comparators.getDataDomainChildrenComparator());
-        if (Application.getInstance().getFrameController().getDbImportController().isGlobalImport()) {
-            setSelected(newMapNode);
-        } else {
-            navigateTo(newMapNode);
-        }
-
-        for (DataNodeDescriptor dataNode : new ArrayList<>(dataChannelDescriptor.getNodeDescriptors())) {
-            for (String dataMapName : dataNode.getDataMapNames()) {
-                if (e.getDataMap().getName().equals(dataMapName)) {
-                    controller.fireDataNodeEvent(new DataNodeEvent(this, dataNode));
-                }
-            }
-        }
-    }
-
-    @Override
-    public void dataMapRemoved(DataMapEvent e) {
-        DataMap map = e.getDataMap();
-        DataChannelDescriptor dataChannelDescriptor = (DataChannelDescriptor) Application
-                .getInstance()
-                .getProject()
-                .getRootNode();
-        removeNode(new Object[]{
-                dataChannelDescriptor, map
-        });
-
-        controller.getEntityResolver().removeDataMap(e.getDataMap());
-
-        // Clean up map from the nodes
-        for (DataNodeDescriptor dataNode : new ArrayList<>(dataChannelDescriptor.getNodeDescriptors())) {
-            removeNode(new Object[]{
-                    dataChannelDescriptor, dataNode, map
-            });
-        }
-    }
-
-    @Override
-    public void objEntityChanged(EntityEvent e) {
-        entityChanged(e);
-    }
-
-    @Override
-    public void objEntityAdded(EntityEvent e) {
-        entityAdded(e);
-    }
-
-    @Override
-    public void objEntityRemoved(EntityEvent e) {
-        entityRemoved(e);
-    }
-
-    @Override
-    public void dbEntityChanged(EntityEvent e) {
-        entityChanged(e);
-    }
-
-    @Override
-    public void dbEntityAdded(EntityEvent e) {
-        entityAdded(e);
-    }
-
-    @Override
-    public void dbEntityRemoved(EntityEvent e) {
-        entityRemoved(e);
-    }
-
-    /**
-     * Makes Entity visible and selected.
-     * <ul>
-     * <li>If entity is from the current node, refreshes the node making sure changes in
-     * the entity name are reflected.</li>
-     * <li>If entity is in a different node, makes that node visible and selected.</li>
-     * </ul>
-     */
-    private void entityChanged(EntityEvent e) {
-        if (e.isNameChange()) {
-            Object[] path = new Object[]{
-                    e.getDomain() != null
-                            ? e.getDomain()
-                            : (DataChannelDescriptor) controller.getProject().getRootNode(),
-                    e.getEntity().getDataMap(), e.getEntity()
-            };
-
-            updateNode(path);
-            positionNode(path, Comparators.getDataMapChildrenComparator());
-            navigateTo(path);
-        }
+        setSelectionPath(path);
     }
 
     /**
-     * Event handler for ObjEntity and DbEntity additions. Adds a tree node for the entity
-     * and make it selected.
+     * Makes node current, visible but not selected.
      */
-    private void entityAdded(EntityEvent e) {
-
-        Entity<?, ?, ?> entity = e.getEntity();
-
-        DefaultMutableTreeNode mapNode = getProjectModel().getNodeForObjectPath(
-                new Object[]{
-                        e.getDomain() != null
-                                ? e.getDomain()
-                                : (DataChannelDescriptor) controller
-                                .getProject()
-                                .getRootNode(), e.getEntity().getDataMap()
-                });
-
-        if (mapNode == null) {
-            return;
+    void setSelected(DefaultMutableTreeNode node) {
+        TreePath path = new TreePath(node.getPath());
+        if (!isVisible(path)) {
+            makeVisible(path);
         }
-
-        DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(entity, false);
-        positionNode(mapNode, currentNode, Comparators.getDataMapChildrenComparator());
-        navigateTo(currentNode);
     }
 
-    /**
-     * Event handler for ObjEntity and DbEntity removals. Removes a tree node for the
-     * entity and selects its sibling.
-     */
-    private void entityRemoved(EntityEvent e) {
-        if (e.getSource() == this) {
-            return;
+    void updateNode(DefaultMutableTreeNode node) {
+        if (node != null) {
+            getProjectModel().nodeChanged(node);
         }
-
-        // remove from DataMap tree
-        removeNode(new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
-                        .getProject()
-                        .getRootNode(), e.getEntity().getDataMap(), e.getEntity()
-        });
     }
 
     /**
      * Removes current node from the tree. Selects a new node adjacent to the currently
      * selected node instead.
      */
-    private void removeNode(DefaultMutableTreeNode toBeRemoved) {
+    void removeNode(DefaultMutableTreeNode toBeRemoved) {
 
         // lookup for the new selected node
         Object selectedNode = null;
@@ -784,353 +181,6 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         getProjectModel().removeNodeFromParent(toBeRemoved);
     }
 
-    /**
-     * Makes node current, visible and selected.
-     */
-    private void navigateTo(DefaultMutableTreeNode node) {
-        TreePath path = new TreePath(node.getPath());
-
-        if (!isVisible(path)) {
-            makeVisible(path);
-
-            Rectangle bounds = getPathBounds(path);
-            if (bounds != null) {
-                bounds.height = getVisibleRect().height;
-                scrollRectToVisible(bounds);
-            }
-        }
-
-        setSelectionPath(path);
-    }
-
-    /**
-     * Makes node current, visible but not selected.
-     */
-    private void setSelected(DefaultMutableTreeNode node) {
-        TreePath path = new TreePath(node.getPath());
-        if (!isVisible(path)) {
-            makeVisible(path);
-        }
-    }
-
-    private void navigateTo(Object... path) {
-        if (path == null) {
-            return;
-        }
-
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(path);
-
-        if (node == null) {
-            return;
-        }
-
-        navigateTo(node);
-    }
-
-    private void updateNode(Object[] path) {
-        if (path == null) {
-            return;
-        }
-
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(path);
-        if (node != null) {
-            getProjectModel().nodeChanged(node);
-        }
-    }
-
-    private void removeNode(Object[] path) {
-        if (path == null) {
-            return;
-        }
-
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(path);
-        if (node != null) {
-            removeNode(node);
-        }
-    }
-
-    /**
-     * Processes node selection regardless of whether a new node was selected, or an
-     * already selected node was clicked again. Normally called from event listener
-     * methods.
-     */
-    private void processSelection(TreePath path) {
-        if (path == null) {
-            return;
-        }
-
-        DefaultMutableTreeNode currentNode = (DefaultMutableTreeNode) path.getLastPathComponent();
-
-        Object[] data = getUserObjects(currentNode);
-        if (data.length == 0) {
-            // this should clear the right-side panel
-            controller.displayDomain(new DomainDisplayEvent(
-                    this,
-                    (DataChannelDescriptor) controller.getProject().getRootNode()));
-
-            return;
-        }
-
-        Object obj = data[data.length - 1];
-        if (obj instanceof DataChannelDescriptor) {
-            controller.displayDomain(new DomainDisplayEvent(
-                    this,
-                    (DataChannelDescriptor) obj));
-        } else if (obj instanceof DataMap) {
-            if (data.length == 2) {
-                controller.displayDataMap(new DataMapDisplayEvent(
-                        this,
-                        (DataMap) obj,
-                        (DataChannelDescriptor) controller.getProject().getRootNode(),
-                        (DataNodeDescriptor) data[data.length - 2]));
-            } else if (data.length == 1) {
-                controller.displayDataMap(new DataMapDisplayEvent(
-                        this,
-                        (DataMap) obj,
-                        (DataChannelDescriptor) controller.getProject().getRootNode()));
-            }
-        } else if (obj instanceof DataNodeDescriptor) {
-            if (data.length == 1) {
-                controller.displayDataNode(new DataNodeDisplayEvent(
-                        this,
-                        (DataChannelDescriptor) controller.getProject().getRootNode(),
-                        (DataNodeDescriptor) obj));
-            }
-        } else if (obj instanceof Entity) {
-
-            EntityDisplayEvent e = (data.length == 3)
-
-                    ? new EntityDisplayEvent(
-                    this,
-                    (Entity) obj, (DataMap) data[data.length - 2],
-                    (DataNodeDescriptor) data[data.length - 3],
-                    (DataChannelDescriptor) controller.getProject().getRootNode())
-
-                    : new EntityDisplayEvent(
-                    this,
-                    (Entity) obj, (DataMap) data[data.length - 2],
-                    (DataChannelDescriptor) controller.getProject().getRootNode());
-
-
-            e.setUnselectAttributes(true);
-
-            if (obj instanceof ObjEntity) {
-                controller.displayObjEntity(e);
-            } else if (obj instanceof DbEntity) {
-                controller.displayDbEntity(e);
-            }
-        } else if (obj instanceof Embeddable) {
-            EmbeddableDisplayEvent e = new EmbeddableDisplayEvent(
-                    this,
-                    (Embeddable) obj,
-                    (DataMap) data[data.length - 2],
-                    (DataChannelDescriptor) controller.getProject().getRootNode());
-            controller.displayEmbeddable(e);
-        } else if (obj instanceof Procedure) {
-            ProcedureDisplayEvent e = new ProcedureDisplayEvent(
-                    this,
-                    (Procedure) obj,
-                    (DataMap) data[data.length - 2],
-                    (DataChannelDescriptor) controller.getProject().getRootNode());
-            controller.displayProcedure(e);
-        } else if (obj instanceof QueryDescriptor) {
-            QueryDisplayEvent e = new QueryDisplayEvent(
-                    this,
-                    (QueryDescriptor) obj,
-                    (DataMap) data[data.length - 2],
-                    (DataChannelDescriptor) controller.getProject().getRootNode());
-            controller.displayQuery(e);
-        }
-
-        this.scrollPathToVisible(path);
-    }
-
-    /**
-     * Returns array of the user objects ending with this and starting with one under
-     * root. That is the array of actual objects rather than wrappers.
-     */
-    private Object[] getUserObjects(DefaultMutableTreeNode node) {
-        List<Object> list = new ArrayList<>();
-        while (!node.isRoot()) {
-            list.add(0, node.getUserObject());
-            node = (DefaultMutableTreeNode) node.getParent();
-        }
-        return list.toArray();
-    }
-
-    private void positionNode(Object[] path, Comparator<ConfigurationNode> comparator) {
-        if (path == null) {
-            return;
-        }
-
-        DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(path);
-        if (node == null) {
-            return;
-        }
-
-        positionNode(null, node, comparator);
-    }
-
-    private void positionNode(
-            MutableTreeNode parent,
-            DefaultMutableTreeNode treeNode,
-            Comparator<ConfigurationNode> comparator) {
-
-        removeTreeSelectionListener(treeSelectionListener);
-        try {
-            getProjectModel().positionNode(parent, treeNode, comparator);
-        } finally {
-            addTreeSelectionListener(treeSelectionListener);
-        }
-    }
-
-    /**
-     * Creates JPopupMenu containing main functions
-     */
-    private JPopupMenu createJPopupMenu() {
-        JPopupMenu popup = new JPopupMenu();
-
-        popup.add(buildMenu(CreateNodeAction.class));
-        popup.add(buildMenu(CreateDataMapAction.class));
-
-        popup.add(buildMenu(CreateObjEntityAction.class));
-        popup.add(buildMenu(CreateEmbeddableAction.class));
-        popup.add(buildMenu(CreateDbEntityAction.class));
-
-        popup.add(buildMenu(CreateProcedureAction.class));
-        popup.add(buildMenu(CreateQueryAction.class));
-        popup.addSeparator();
-        popup.add(buildMenu(ObjEntitySyncAction.class));
-        popup.add(buildMenu(DbEntitySyncAction.class));
-        popup.add(buildMenu(LinkDataMapsAction.class));
-        popup.add(buildMenu(RemoveAction.class));
-        popup.add(buildMenu(CutAction.class));
-        popup.add(buildMenu(CopyAction.class));
-        popup.add(buildMenu(PasteAction.class));
-
-        return popup;
-    }
-
-    /**
-     * Creates and returns an menu item associated with the key.
-     *
-     * @param actionType action type
-     */
-    private JMenuItem buildMenu(Class<? extends Action> actionType) {
-        CayenneAction action = (CayenneAction) controller
-                .getApplication()
-                .getActionManager()
-                .getAction(actionType);
-        return action.buildMenu();
-    }
-
-    /**
-     * Class to handle:
-     * - right-click and show popup for selected tree row
-     * - left click row selection based on full row length (instead of default selection based on label size)
-     */
-    class MouseClickHandler extends MouseAdapter {
-
-        void selectRowForEvent(MouseEvent e) {
-            int closestRow = getClosestRowForLocation(e.getX(), e.getY());
-            Rectangle closestRowBounds = getRowBounds(closestRow);
-            if (e.getY() >= closestRowBounds.getY()
-                    && e.getY() < closestRowBounds.getY() + closestRowBounds.getHeight()
-                    && !isRowSelected(closestRow)) {
-                setSelectionRow(closestRow);
-            }
-        }
-
-        @Override
-        public void mousePressed(MouseEvent e) {
-            if (SwingUtilities.isLeftMouseButton(e)) {
-                selectRowForEvent(e);
-            }
-
-            mouseReleased(e);
-        }
-
-        @Override
-        public void mouseReleased(MouseEvent e) {
-            if (e.isPopupTrigger()) {
-                // Selecting specified row
-                selectRowForEvent(e);
-                if (popup == null) {
-                    popup = createJPopupMenu();
-                }
-                popupMenuFilter();
-                popup.show(ProjectTreeView.this, e.getX(), e.getY());
-            }
-        }
-    }
-
-    public void embeddableAdded(EmbeddableEvent e, DataMap map) {
-        Embeddable embeddable = e.getEmbeddable();
-
-        DefaultMutableTreeNode mapNode = getProjectModel().getNodeForObjectPath(
-                new Object[]{
-                        e.getDomain() != null
-                                ? e.getDomain()
-                                : (DataChannelDescriptor) controller
-                                .getProject()
-                                .getRootNode(), map
-                });
-
-        if (mapNode == null) {
-            return;
-        }
-
-        DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(embeddable, false);
-        positionNode(mapNode, currentNode, Comparators.getDataMapChildrenComparator());
-        navigateTo(currentNode);
-    }
-
-    public void embeddableChanged(EmbeddableEvent e, DataMap map) {
-        if (e.isNameChange()) {
-            Object[] path = new Object[]{
-                    e.getDomain() != null
-                            ? e.getDomain()
-                            : (DataChannelDescriptor) controller.getProject().getRootNode(),
-                    map, e.getEmbeddable()
-            };
-
-            updateNode(path);
-            positionNode(path, Comparators.getDataMapChildrenComparator());
-            navigateTo(path);
-        }
-    }
-
-    public void embeddableRemoved(EmbeddableEvent e, DataMap map) {
-        if (e.getSource() == this) {
-            return;
-        }
-
-        // remove from DataMap tree
-        removeNode(new Object[]{
-                e.getDomain() != null ? e.getDomain() : (DataChannelDescriptor) controller
-                        .getProject()
-                        .getRootNode(), map, e.getEmbeddable()
-        });
-    }
-
-    public void embeddableSelected(EmbeddableDisplayEvent e) {
-        navigateTo(e.getDomain(), e.getDataMap(), e.getEmbeddable());
-
-    }
-
-    // Filter all disabled actions in popupMenu, but skip Cut-Copy-Paste block. It should always exist.
-    public void popupMenuFilter() {
-        Action cutAction = controller.getApplication().getActionManager().getAction(CutAction.class);
-        for (MenuElement element : popup.getSubElements()) {
-            JMenuItem item = (JMenuItem) element;
-            if (!item.getAction().equals(cutAction)) {
-                item.setVisible(item.isEnabled());
-            } else {
-                break;
-            }
-        }
-    }
-
     @Override
     public void paintComponent(Graphics g) {
         g.setColor(Color.white);