#6972 Tool wizards refactoring

Former-commit-id: 831decd7

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizard.java

@@ -19,7 +19,6 @@ package org.jkiss.dbeaver.ui.dialogs.tools;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -40,6 +39,7 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.ProgressStreamReader;
 import org.jkiss.dbeaver.ui.UIUtils;
+import org.jkiss.dbeaver.ui.task.TaskConfigurationWizard;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.IOUtils;
 
@@ -55,7 +55,7 @@ import java.util.List;
  * Abstract wizard
  */
 public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject, PROCESS_ARG>
-        extends Wizard implements DBRRunnableWithProgress {
+        extends TaskConfigurationWizard implements DBRRunnableWithProgress {
 
     private static final Log log = Log.getLog(AbstractToolWizard.class);
 
@@ -99,6 +99,11 @@ public abstract class AbstractToolWizard<BASE_OBJECT extends DBSObject, PROCESS_
         extraCommandArgs = store.getString(PROP_NAME_EXTRA_ARGS);
     }
 
+    @Override
+    protected String getDefaultWindowTitle() {
+        return task;
+    }
+
     @Override
     public boolean canFinish()
     {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/ToolWizardDialog.java

@@ -19,7 +19,6 @@
 package org.jkiss.dbeaver.ui.dialogs.tools;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -29,20 +28,21 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
 import org.jkiss.dbeaver.ui.dialogs.BaseDialog;
 import org.jkiss.dbeaver.ui.dialogs.connection.ClientHomesSelector;
 import org.jkiss.dbeaver.ui.internal.UIMessages;
+import org.jkiss.dbeaver.ui.task.TaskConfigurationWizard;
+import org.jkiss.dbeaver.ui.task.TaskConfigurationWizardDialog;
 
 /**
  * Tool wizard dialog
  */
-public class ToolWizardDialog extends ActiveWizardDialog
+public class ToolWizardDialog extends TaskConfigurationWizardDialog
 {
 
     public static final int CLIENT_CONFIG_ID = 1000;
 
-    public ToolWizardDialog(IWorkbenchWindow window, IWizard wizard)
+    public ToolWizardDialog(IWorkbenchWindow window, TaskConfigurationWizard wizard)
     {
         super(window, wizard);
         setShellStyle(SWT.CLOSE | SWT.MAX | SWT.MIN | SWT.TITLE | SWT.BORDER | SWT.RESIZE | getDefaultOrientation());

plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLExportWizard.java

@@ -43,10 +43,7 @@ import org.jkiss.utils.CommonUtils;
 
 import java.io.*;
 import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -101,6 +98,16 @@ class MySQLExportWizard extends AbstractImportExportWizard<MySQLDatabaseExportIn
         }
     }
 
+    @Override
+    public String getTaskTypeId() {
+        return "mysqlDatabaseBackup";
+    }
+
+    @Override
+    public void saveTaskState(DBRProgressMonitor monitor, Map<String, Object> state) {
+        // TODO: implement
+    }
+
     @Override
     public void init(IWorkbench workbench, IStructuredSelection selection) {
         super.init(workbench, selection);

plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizard.java

@@ -20,9 +20,9 @@ package org.jkiss.dbeaver.ext.mysql.tools;
 
 import org.jkiss.dbeaver.ext.mysql.MySQLConstants;
 import org.jkiss.dbeaver.ext.mysql.MySQLDataSourceProvider;
-import org.jkiss.dbeaver.ext.mysql.ui.internal.MySQLUIMessages;
 import org.jkiss.dbeaver.ext.mysql.MySQLServerHome;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
+import org.jkiss.dbeaver.ext.mysql.ui.internal.MySQLUIMessages;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.ui.dialogs.tools.AbstractScriptExecuteWizard;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
@@ -32,6 +32,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLCatalog, MySQLCatalog> {
 
@@ -56,6 +57,16 @@ class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLCatalog,
         this.mainPage = new MySQLScriptExecuteWizardPageSettings(this);
     }
 
+    @Override
+    public String getTaskTypeId() {
+        return "mysqlScriptExecute";
+    }
+
+    @Override
+    public void saveTaskState(DBRProgressMonitor monitor, Map<String, Object> state) {
+        // TODO: implement
+    }
+
     public LogLevel getLogLevel()
     {
         return logLevel;

plugins/org.jkiss.dbeaver.ext.oracle.ui/src/org/jkiss/dbeaver/ext/oracle/ui/tools/OracleScriptExecuteWizard.java

@@ -26,15 +26,13 @@ import org.jkiss.dbeaver.ext.oracle.oci.OCIUtils;
 import org.jkiss.dbeaver.ext.oracle.oci.OracleHomeDescriptor;
 import org.jkiss.dbeaver.ext.oracle.ui.internal.OracleUIMessages;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
-import org.jkiss.dbeaver.utils.RuntimeUtils;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.ui.dialogs.tools.AbstractScriptExecuteWizard;
+import org.jkiss.dbeaver.utils.RuntimeUtils;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 class OracleScriptExecuteWizard extends AbstractScriptExecuteWizard<OracleDataSource,OracleDataSource> {
 
@@ -46,6 +44,16 @@ class OracleScriptExecuteWizard extends AbstractScriptExecuteWizard<OracleDataSo
         this.mainPage = new OracleScriptExecuteWizardPageSettings(this);
     }
 
+    @Override
+    public String getTaskTypeId() {
+        return "oracleScriptExecute";
+    }
+
+    @Override
+    public void saveTaskState(DBRProgressMonitor monitor, Map<String, Object> state) {
+        // TODO: implement
+    }
+
     @Override
     public void addPages()
     {

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizard.java

@@ -36,10 +36,7 @@ import org.jkiss.utils.CommonUtils;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 class PostgreBackupWizard extends PostgreBackupRestoreWizard<PostgreDatabaseBackupInfo> implements IExportWizard {
 
@@ -65,6 +62,16 @@ class PostgreBackupWizard extends PostgreBackupRestoreWizard<PostgreDatabaseBack
         showViews = CommonUtils.getBoolean(store.getString("Postgre.export.showViews"), false);
     }
 
+    @Override
+    public String getTaskTypeId() {
+        return "postgresDatabaseBackup";
+    }
+
+    @Override
+    public void saveTaskState(DBRProgressMonitor monitor, Map<String, Object> state) {
+        // TODO: implement
+    }
+
     @Override
     public void init(IWorkbench workbench, IStructuredSelection selection) {
         super.init(workbench, selection);

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreRestoreWizard.java

@@ -31,6 +31,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 class PostgreRestoreWizard extends PostgreBackupRestoreWizard<PostgreDatabaseRestoreInfo> implements IExportWizard {
 
@@ -45,6 +46,17 @@ class PostgreRestoreWizard extends PostgreBackupRestoreWizard<PostgreDatabaseRes
         restoreInfo = new PostgreDatabaseRestoreInfo(database);
     }
 
+
+    @Override
+    public String getTaskTypeId() {
+        return "postgresDatabaseRestore";
+    }
+
+    @Override
+    public void saveTaskState(DBRProgressMonitor monitor, Map<String, Object> state) {
+        // TODO: implement
+    }
+
     @Override
     public boolean isExportWizard() {
         return false;

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreScriptExecuteWizard.java

@@ -19,9 +19,10 @@ package org.jkiss.dbeaver.ext.postgresql.tools;
 
 import org.jkiss.dbeaver.ext.postgresql.PostgreConstants;
 import org.jkiss.dbeaver.ext.postgresql.PostgreDataSourceProvider;
-import org.jkiss.dbeaver.ext.postgresql.PostgreServerHome;
 import org.jkiss.dbeaver.ext.postgresql.PostgreMessages;
+import org.jkiss.dbeaver.ext.postgresql.PostgreServerHome;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreDatabase;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.ui.dialogs.tools.AbstractScriptExecuteWizard;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
 import org.jkiss.utils.CommonUtils;
@@ -30,6 +31,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 class PostgreScriptExecuteWizard extends AbstractScriptExecuteWizard<PostgreDatabase, PostgreDatabase> {
 
@@ -54,6 +56,16 @@ class PostgreScriptExecuteWizard extends AbstractScriptExecuteWizard<PostgreData
         return false;
     }
 
+    @Override
+    public String getTaskTypeId() {
+        return "postgresScriptExecute";
+    }
+
+    @Override
+    public void saveTaskState(DBRProgressMonitor monitor, Map<String, Object> state) {
+        // TODO: implement
+    }
+
     @Override
     public void addPages()
     {

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/fdw/PostgreFDWConfigTool.java

@@ -22,7 +22,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreDatabase;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreObject;
 import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
+import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
 import org.jkiss.dbeaver.ui.tools.IUserInterfaceTool;
 
 import java.util.Collection;
@@ -42,7 +42,7 @@ public class PostgreFDWConfigTool implements IUserInterfaceTool
             } else {
                 continue;
             }
-            ToolWizardDialog dialog = new ToolWizardDialog(
+            ActiveWizardDialog dialog = new ActiveWizardDialog(
                 window,
                 new PostgreFDWConfigWizard(database));
             dialog.setFinishButtonLabel("Install");