From a25c694b52640cb3f8ebed2e4be8e266e99b7c1c Mon Sep 17 00:00:00 2001
From: Arseni Bulatski <ancarseni@gmail.com>
Date: Mon, 3 Dec 2018 12:48:02 +0300
Subject: [PATCH] Modeler bug fix

---
 .../org/apache/cayenne/modeler/ProjectTreeView.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index 3cca6e95aa..5503bbdb26 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -644,6 +644,8 @@ public void dataMapAdded(DataMapEvent e) {
                 .getDataDomainChildrenComparator());
         if(!Application.getInstance().getFrameController().getDbImportController().isGlobalImport()) {
             showNode(newMapNode);
+        } else {
+            setSelected(newMapNode);
         }
     }
 
@@ -818,6 +820,14 @@ protected void showNode(DefaultMutableTreeNode node) {
         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);
+        }
+    }
+
     protected void showNode(Object[] path) {
         if (path == null) {
             return;