From c8c8a8336b6f92d866f87655b21eb17ed5709737 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 4 Oct 2019 17:57:52 +0300
Subject: [PATCH] #6883 Enable Finish button only in the very end

---
 .../ui/pages/stream/StreamProducerPagePreview.java   | 12 +++++++++++-
 .../transfer/ui/wizard/DataTransferPageFinal.java    |  1 +
 .../tools/transfer/ui/wizard/DataTransferWizard.java |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPagePreview.java b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPagePreview.java
index 6f81147c75..ffa32409eb 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPagePreview.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPagePreview.java
@@ -74,11 +74,13 @@ public class StreamProducerPagePreview extends ActiveWizardPage<DataTransferWiza
     private Table previewTable;
 
     private DBSObject currentObject;
+    private boolean activated;
 
     public StreamProducerPagePreview() {
         super(DTMessages.data_transfer_wizard_page_preview_name);
         setTitle(DTMessages.data_transfer_wizard_page_preview_title);
         setDescription(DTMessages.data_transfer_wizard_page_preview_description);
+        setPageComplete(false);
     }
 
     private StreamProducerSettings getProducerSettings() {
@@ -279,6 +281,7 @@ public class StreamProducerPagePreview extends ActiveWizardPage<DataTransferWiza
 
     @Override
     public void activatePage() {
+        activated = true;
         tableList.removeAll();
         pipeList.clear();
         for (DataTransferPipe pipe : getWizard().getSettings().getDataPipes()) {
@@ -554,8 +557,15 @@ public class StreamProducerPagePreview extends ActiveWizardPage<DataTransferWiza
     @Override
     protected boolean determinePageCompletion()
     {
+        if (!activated) {
+            return false;
+        }
         final StreamProducerSettings settings = getProducerSettings();
-        for (DataTransferPipe pipe : getWizard().getSettings().getDataPipes()) {
+        List<DataTransferPipe> dataPipes = getWizard().getSettings().getDataPipes();
+        if (dataPipes.isEmpty()) {
+            return false;
+        }
+        for (DataTransferPipe pipe : dataPipes) {
             DBSObject databaseObject = pipe.getConsumer().getDatabaseObject();
             if (!(databaseObject instanceof DBSEntity)) {
                 return false;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferPageFinal.java b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferPageFinal.java
index b9b930d255..cad7a9d11c 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferPageFinal.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferPageFinal.java
@@ -53,6 +53,7 @@ class DataTransferPageFinal extends ActiveWizardPage<DataTransferWizard> {
         super(DTMessages.data_transfer_wizard_final_name);
         setTitle(DTMessages.data_transfer_wizard_final_title);
         setDescription(DTMessages.data_transfer_wizard_final_description);
+        setPageComplete(false);
     }
 
     @Override
diff --git a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferWizard.java b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferWizard.java
index e1e746a48e..c30022ba7d 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferWizard.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferWizard.java
@@ -344,6 +344,7 @@ public class DataTransferWizard extends TaskConfigurationWizard implements IExpo
     protected boolean isPageValid(IWizardPage page) {
         return page instanceof DataTransferPagePipes ||
             page instanceof DataTransferPageSettings ||
+            page instanceof DataTransferPageFinal ||
             isPageValid(page, settings.getProducer()) ||
             isPageValid(page, settings.getConsumer());
     }
-- 
GitLab