Data transfer: check container node

shaoxh · Feb 10, 2020 · 34baf60 · 34baf60
1 parent 6f9bd0b
commit 34baf60
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/...i/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseConsumerPageMapping.java b/...i/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseConsumerPageMapping.java
@@ -146,6 +146,7 @@ protected void setSelectedNode(DBNDatabaseNode node) {
                     }
                     mappingViewer.refresh();
                     updatePageCompletion();
+                    setMessage(null);
                 }
 
             };
@@ -753,7 +754,12 @@ public void activatePage()
         settings.loadNode(getWizard().getRunnableContext(), producerContainer);
         DBNDatabaseNode containerNode = settings.getContainerNode();
         if (containerNode != null) {
-            containerPanel.setContainerInfo(containerNode);
+            try {
+                containerPanel.checkValidContainerNode(containerNode);
+                containerPanel.setContainerInfo(containerNode);
+            } catch (DBException e) {
+                setErrorMessage(e.getMessage());
+            }
         }
 
         {

diff --git a/.../org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/ObjectContainerSelectorPanel.java b/.../org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/ObjectContainerSelectorPanel.java
@@ -135,27 +135,13 @@ public void widgetSelected(SelectionEvent e) {
                     new Class[]{DBSObjectContainer.class},
                     new Class[] { DBSObjectContainer.class },
                     new Class[]{ DBSSchema.class });
-                if (node instanceof DBNDatabaseNode) {
-                    DBPObject nodeObject = DBUtils.getPublicObject(((DBNDatabaseNode) node).getObject());
-                    if (nodeObject instanceof DBSObjectContainer) {
-                        try {
-                            Class<?> childrenClass = ((DBSObjectContainer) nodeObject).getChildType(new VoidProgressMonitor());
-                            if (childrenClass != null) {
-                                if (!DBSEntity.class.isAssignableFrom(childrenClass)) {
-                                    // Upper level of container
-                                    UIUtils.showMessageBox(getShell(),"Bad container node", "You can select only table container (e.g. schema).", SWT.ICON_ERROR);
-                                } else {
-                                    setSelectedNode((DBNDatabaseNode) node);
-                                    addNodeToHistory((DBNDatabaseNode) node);
-                                    saveHistory();
-                                }
-                            } else {
-                                throw new DBException("Can't determine container child objects");
-                            }
-                        } catch (DBException e) {
-                            DBWorkbench.getPlatformUI().showError("Bad container node", "Error determining container elements type", e);
-                        }
-                    }
+                try {
+                    checkValidContainerNode(node);
+                    setSelectedNode((DBNDatabaseNode) node);
+                    addNodeToHistory((DBNDatabaseNode) node);
+                    saveHistory();
+                } catch (DBException e) {
+                    DBWorkbench.getPlatformUI().showError("Bad container node", "Node '" + node.getName() + "' cannot be selected as table container", e);
                 }
             }
         };
@@ -175,6 +161,30 @@ public void mouseDoubleClick(MouseEvent e) {
         loadHistory();
     }
 
+    public void checkValidContainerNode(DBNNode node) throws DBException
+    {
+        if (node instanceof DBNDatabaseNode) {
+            DBPObject nodeObject = DBUtils.getPublicObject(((DBNDatabaseNode) node).getObject());
+            if (nodeObject instanceof DBSObjectContainer) {
+                try {
+                    Class<?> childrenClass = ((DBSObjectContainer) nodeObject).getChildType(new VoidProgressMonitor());
+                    if (childrenClass != null) {
+                        if (!DBSEntity.class.isAssignableFrom(childrenClass)) {
+                            // Upper level of container
+                            throw new DBException("You can select only table container (e.g. schema).");
+                        }
+                    } else {
+                        throw new DBException("Can't determine container child objects for " + nodeObject);
+                    }
+                } catch (DBException e) {
+                    throw new DBException("Error determining container elements type", e);
+                }
+            }
+        } else {
+            throw new DBException("Non-databse node " + node);
+        }
+    }
+
     private HistoryItem addNodeToHistory(DBNDatabaseNode node) {
         for (int i = 0; i < historyItems.size(); i++) {
             HistoryItem item = historyItems.get(i);