#9223 Data transfer wizard: first page UI updated

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseConsumerPageLoadSettings.java

@@ -17,11 +17,9 @@
 package org.jkiss.dbeaver.tools.transfer.ui.pages.database;
 
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.jkiss.dbeaver.tools.transfer.database.DatabaseConsumerSettings;
 import org.jkiss.dbeaver.tools.transfer.internal.DTMessages;
@@ -47,12 +45,7 @@ public class DatabaseConsumerPageLoadSettings extends ActiveWizardPage<DataTrans
     public void createControl(Composite parent) {
         initializeDialogUnits(parent);
 
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout gl = new GridLayout();
-        gl.marginHeight = 0;
-        gl.marginWidth = 0;
-        composite.setLayout(gl);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        Composite composite = UIUtils.createComposite(parent, 1);
 
         final DatabaseConsumerSettings settings = getSettings();
 

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseConsumerPageMapping.java

@@ -102,7 +102,6 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
         final DatabaseConsumerSettings settings = getDatabaseConsumerSettings();
 
         Composite composite = UIUtils.createComposite(parent, 1);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 
         {
             // Target container

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseProducerPageExtractSettings.java

@@ -21,7 +21,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.jkiss.dbeaver.model.data.DBDCellValue;
 import org.jkiss.dbeaver.tools.transfer.database.DatabaseProducerSettings;
@@ -59,12 +58,7 @@ public class DatabaseProducerPageExtractSettings extends ActiveWizardPage<DataTr
     public void createControl(Composite parent) {
         initializeDialogUnits(parent);
 
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout gl = new GridLayout();
-        gl.marginHeight = 0;
-        gl.marginWidth = 0;
-        composite.setLayout(gl);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        Composite composite = UIUtils.createComposite(parent, 1);
 
         final DatabaseProducerSettings settings = getWizard().getPageSettings(this, DatabaseProducerSettings.class);
 

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseProducerPageInputObjects.java

@@ -21,7 +21,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPEvaluationContext;
@@ -69,9 +68,7 @@ public class DatabaseProducerPageInputObjects extends ActiveWizardPage<DataTrans
     public void createControl(Composite parent) {
         initializeDialogUnits(parent);
 
-        Composite composite = new Composite(parent, SWT.NULL);
-        composite.setLayout(new GridLayout());
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        Composite composite = UIUtils.createComposite(parent, 1);
 
         DataTransferSettings settings = getWizard().getSettings();
 

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageOutput.java

@@ -20,7 +20,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.jkiss.dbeaver.tools.transfer.internal.DTMessages;
 import org.jkiss.dbeaver.tools.transfer.stream.StreamConsumerSettings;
@@ -67,12 +66,7 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
     public void createControl(Composite parent) {
         initializeDialogUnits(parent);
 
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout gl = new GridLayout();
-        gl.marginHeight = 0;
-        gl.marginWidth = 0;
-        composite.setLayout(gl);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        Composite composite = UIUtils.createComposite(parent, 1);
 
         final StreamConsumerSettings settings = getWizard().getPageSettings(this, StreamConsumerSettings.class);
 

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageSettings.java

@@ -72,7 +72,6 @@ public class StreamConsumerPageSettings extends ActiveWizardPage<DataTransferWiz
         initializeDialogUnits(parent);
         final StreamConsumerSettings settings = getWizard().getPageSettings(this, StreamConsumerSettings.class);
         Composite composite = UIUtils.createComposite(parent, 1);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 
         {
             Composite generalSettings = UIUtils.createControlGroup(composite, DTMessages.data_transfer_wizard_settings_group_general, 5, GridData.FILL_HORIZONTAL, 0);

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamProducerPageSettings.java

@@ -77,7 +77,6 @@ public class StreamProducerPageSettings extends ActiveWizardPage<DataTransferWiz
         initializeDialogUnits(parent);
 
         SashForm settingsDivider = new SashForm(parent, SWT.VERTICAL);
-        settingsDivider.setLayoutData(new GridData(GridData.FILL_BOTH));
 
         {
             Composite inputFilesGroup = UIUtils.createControlGroup(settingsDivider, DTMessages.data_transfer_wizard_settings_group_input_files, 1, GridData.FILL_BOTH, 0);

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferPageFinal.java

@@ -20,7 +20,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
@@ -60,12 +59,7 @@ class DataTransferPageFinal extends ActiveWizardPage<DataTransferWizard> {
     public void createControl(Composite parent) {
         initializeDialogUnits(parent);
 
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout gl = new GridLayout(1, true);
-        gl.marginHeight = 0;
-        gl.marginWidth = 0;
-        composite.setLayout(gl);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        Composite composite = UIUtils.createComposite(parent, 1);
 
         SashForm sash = new SashForm(composite, SWT.VERTICAL);
         sash.setLayoutData(new GridData(GridData.FILL_BOTH));

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferPagePipes.java

@@ -36,7 +36,6 @@ import org.jkiss.dbeaver.tools.transfer.internal.DTMessages;
 import org.jkiss.dbeaver.tools.transfer.registry.DataTransferNodeDescriptor;
 import org.jkiss.dbeaver.tools.transfer.registry.DataTransferProcessorDescriptor;
 import org.jkiss.dbeaver.tools.transfer.registry.DataTransferRegistry;
-import org.jkiss.dbeaver.tools.transfer.ui.internal.DTUIMessages;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.ListContentProvider;
@@ -72,7 +71,6 @@ class DataTransferPagePipes extends ActiveWizardPage<DataTransferWizard> {
         initializeDialogUnits(parent);
 
         Composite composite = UIUtils.createComposite(parent, 1);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 
         SashForm sash = new SashForm(composite, SWT.HORIZONTAL);
         sash.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -86,9 +84,8 @@ class DataTransferPagePipes extends ActiveWizardPage<DataTransferWizard> {
 
     private void createNodesTable(Composite composite) {
         Composite panel = UIUtils.createComposite(composite, 1);
-        panel.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-        UIUtils.createControlLabel(panel, DTUIMessages.data_transfer_wizard_final_column_target);
+        //UIUtils.createControlLabel(panel, DTUIMessages.data_transfer_wizard_final_column_target);
 
         nodesTable = new TableViewer(panel, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION);
         nodesTable.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -183,20 +180,8 @@ class DataTransferPagePipes extends ActiveWizardPage<DataTransferWizard> {
 
     private void createInputsTable(Composite composite) {
         Composite panel = UIUtils.createComposite(composite, 1);
-        panel.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-/*
-        Text inputsText = new Text(panel, SWT.READ_ONLY | SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
-        inputsText.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-        StringBuilder txt = new StringBuilder();
-        for (DBSObject input : getWizard().getSettings().getSourceObjects()) {
-            if (txt.length() > 0) txt.append(", ");
-            txt.append(DBUtils.getObjectFullName(input, DBPEvaluationContext.UI));
-        }
-        inputsText.setText(txt.toString());
-*/
-        UIUtils.createControlLabel(panel, DTUIMessages.data_transfer_wizard_final_group_objects);
+        //UIUtils.createControlLabel(panel, DTUIMessages.data_transfer_wizard_final_group_objects);
 
         inputsTable = new TableViewer(panel, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION);
         inputsTable.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -251,7 +236,7 @@ class DataTransferPagePipes extends ActiveWizardPage<DataTransferWizard> {
             Collection<TransferTarget> targets = (Collection<TransferTarget>) nodesTable.getInput();
             for (TransferTarget target : targets) {
                 if ((target.node == consumer || target.node == producer) && target.processor == processor) {
-                    nodesTable.setSelection(new StructuredSelection(target));
+                    UIUtils.asyncExec(() -> nodesTable.setSelection(new StructuredSelection(target)));
                     break;
                 }
             }

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/wizard/DataTransferPageSettings.java

@@ -19,8 +19,8 @@ package org.jkiss.dbeaver.tools.transfer.ui.wizard;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.jkiss.dbeaver.tools.transfer.DataTransferPipe;
 import org.jkiss.dbeaver.tools.transfer.DataTransferSettings;
@@ -47,12 +47,7 @@ class DataTransferPageSettings extends ActiveWizardPage<DataTransferWizard> {
     public void createControl(Composite parent) {
         initializeDialogUnits(parent);
 
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout gl = new GridLayout(1, true);
-        gl.marginHeight = 0;
-        gl.marginWidth = 0;
-        composite.setLayout(gl);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        Composite composite = UIUtils.createComposite(parent, 1);
 
         setControl(composite);
     }
@@ -88,7 +83,10 @@ class DataTransferPageSettings extends ActiveWizardPage<DataTransferWizard> {
             producerSettingsPage.setWizard(getWizard());
             Composite producerGroup = UIUtils.createPlaceholder(settingsComposite, 1);
             UIUtils.createInfoLabel(producerGroup, producerSettingsPage.getTitle());
-            producerSettingsPage.createControl(producerGroup);
+            Composite settingPanel = new Composite(producerGroup, SWT.NONE);
+            settingPanel.setLayoutData(new GridData(GridData.FILL_BOTH));
+            settingPanel.setLayout(new FillLayout());
+            producerSettingsPage.createControl(settingPanel);
             if (producerSettingsPage instanceof ActiveWizardPage) {
                 ((ActiveWizardPage) producerSettingsPage).activatePage();
             }
@@ -98,7 +96,10 @@ class DataTransferPageSettings extends ActiveWizardPage<DataTransferWizard> {
             consumerSettingsPage.setWizard(getWizard());
             Composite consumerGroup = UIUtils.createPlaceholder(settingsComposite, 1);
             UIUtils.createInfoLabel(consumerGroup, consumerSettingsPage.getTitle());
-            consumerSettingsPage.createControl(consumerGroup);
+            Composite settingPanel = new Composite(consumerGroup, SWT.NONE);
+            settingPanel.setLayoutData(new GridData(GridData.FILL_BOTH));
+            settingPanel.setLayout(new FillLayout());
+            consumerSettingsPage.createControl(settingPanel);
             if (consumerSettingsPage instanceof ActiveWizardPage) {
                 ((ActiveWizardPage) consumerSettingsPage).activatePage();
             }