From 781997fd376a3e0558fbc56798e74a22614b7036 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Wed, 25 Dec 2019 17:05:08 +0300
Subject: [PATCH] Export wizards fix

Former-commit-id: f62663364b533d355143c0fe15e2c40a5ad98454
---
 .../tools/PostgreBackupWizardPageObjects.java          | 10 ++++++++--
 .../tasks/ui/nativetool/NativeToolConfigPanel.java     |  8 +++++++-
 .../tasks/nativetool/AbstractImportExportSettings.java |  4 ++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageObjects.java b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageObjects.java
index 172d4133f2..7aef396868 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageObjects.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageObjects.java
@@ -45,8 +45,8 @@ import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.CustomSashForm;
 import org.jkiss.utils.CommonUtils;
 
-import java.util.*;
 import java.util.List;
+import java.util.*;
 
 
 class PostgreBackupWizardPageObjects extends AbstractToolWizardPage<PostgreBackupWizard>
@@ -138,9 +138,15 @@ class PostgreBackupWizardPageObjects extends AbstractToolWizardPage<PostgreBacku
             createCheckButtons(buttonsPanel, tablesTable);
         }
 
+        setControl(composite);
+    }
+
+    @Override
+    public void activatePage() {
+        super.activatePage();
         loadSettings();
+
         updateState();
-        setControl(composite);
     }
 
     private void loadSettings() {
diff --git a/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolConfigPanel.java b/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolConfigPanel.java
index 85f7987f42..2b9e84f90f 100644
--- a/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolConfigPanel.java
+++ b/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolConfigPanel.java
@@ -29,6 +29,8 @@ import org.jkiss.dbeaver.model.struct.DBSWrapper;
 import org.jkiss.dbeaver.model.task.DBTTaskConfigPanel;
 import org.jkiss.dbeaver.model.task.DBTTaskType;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.dbeaver.tasks.nativetool.AbstractImportExportSettings;
+import org.jkiss.dbeaver.tasks.nativetool.AbstractNativeToolSettings;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.connection.ClientHomesSelector;
 import org.jkiss.dbeaver.ui.navigator.database.DatabaseObjectsSelectorPanel;
@@ -87,11 +89,15 @@ public abstract class NativeToolConfigPanel<OBJECT_TYPE extends DBSObject> imple
                 protected void onSelectionChange(Object element) {
                     selectedObject = element instanceof DBSWrapper && objectClass.isInstance(((DBSWrapper) element).getObject()) ?
                         objectClass.cast(((DBSWrapper) element).getObject()) : null;
-                    List databaseObjects = ieWizard.getSettings().getDatabaseObjects();
+                    AbstractNativeToolSettings settings = ieWizard.getSettings();
+                    List databaseObjects = settings.getDatabaseObjects();
                     databaseObjects.clear();
                     if (selectedObject != null) {
                         databaseObjects.add(selectedObject);
                     }
+                    if (settings instanceof AbstractImportExportSettings) {
+                        ((AbstractImportExportSettings) settings).fillExportObjectsFromInput();
+                    }
                     updateHomeSelector();
                     propertyChangeListener.run();
                 }
diff --git a/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractImportExportSettings.java b/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractImportExportSettings.java
index 28070b49dd..b11f0a4b05 100644
--- a/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractImportExportSettings.java
+++ b/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractImportExportSettings.java
@@ -46,6 +46,10 @@ public abstract class AbstractImportExportSettings<BASE_OBJECT extends DBSObject
         this.outputFilePattern = outputFilePattern;
     }
 
+    public void fillExportObjectsFromInput() {
+
+    }
+
     @Override
     public void loadSettings(DBRRunnableContext runnableContext, DBPPreferenceStore store) {
         super.loadSettings(runnableContext, store);
-- 
GitLab