From 04c106ea3592a06a604155d0ad450ef2fa90e518 Mon Sep 17 00:00:00 2001 From: jurgen Date: Fri, 26 Oct 2012 08:57:28 +0000 Subject: [PATCH] Tools packages refactoring Project export fix Former-commit-id: 8aab3e9befc1ceed4c63f52f582131c7163fdaad --- .../META-INF/MANIFEST.MF | 13 +++++++------ plugins/org.jkiss.dbeaver.core/plugin.xml | 18 +++++++++--------- .../impl/resources/ScriptsHandlerImpl.java | 2 +- .../dbeaver/model/navigator/DBNResource.java | 2 -- .../registry/DataExporterDescriptor.java | 2 +- .../registry/DataSourceToolDescriptor.java | 6 +++--- .../dbeaver/registry/DriverDescriptor.java | 4 +++- .../DBPTool.java => tools/IExternalTool.java} | 8 +++++--- .../export => tools}/data/IDataExporter.java | 2 +- .../data/IDataExporterSite.java | 2 +- .../data/encoders/BinaryStreamReader.java | 2 +- .../data/handlers/DataExportHandler.java | 6 +++--- .../data/impl/DataExporterAbstract.java | 6 +++--- .../data/impl/DataExporterCSV.java | 4 ++-- .../data/impl/DataExporterHTML.java | 4 ++-- .../data/impl/DataExporterSQL.java | 4 ++-- .../data/wizard/DataExportErrorJob.java | 2 +- .../data/wizard/DataExportJob.java | 6 +++--- .../data/wizard/DataExportPageFinal.java | 2 +- .../data/wizard/DataExportPageInit.java | 2 +- .../data/wizard/DataExportPageOutput.java | 2 +- .../data/wizard/DataExportPageSettings.java | 2 +- .../data/wizard/DataExportProvider.java | 2 +- .../data/wizard/DataExportSettings.java | 2 +- .../data/wizard/DataExportWizard.java | 2 +- .../project/ExportConstants.java | 2 +- .../project/ProjectCreateData.java | 2 +- .../project/ProjectCreateWizard.java | 2 +- .../ProjectCreateWizardPageSettings.java | 2 +- .../project/ProjectExportData.java | 2 +- .../project/ProjectExportWizard.java | 7 ++++++- .../project/ProjectExportWizardPage.java | 2 +- .../project/ProjectImportData.java | 2 +- .../project/ProjectImportWizard.java | 2 +- .../project/ProjectImportWizardPageFile.java | 2 +- .../scripts/ScriptsExportData.java | 2 +- .../scripts/ScriptsExportUtils.java | 2 +- .../scripts/ScriptsExportWizard.java | 2 +- .../scripts/ScriptsExportWizardPage.java | 2 +- .../scripts/ScriptsImportData.java | 2 +- .../scripts/ScriptsImportWizard.java | 2 +- .../scripts/ScriptsImportWizardPage.java | 2 +- .../navigator/NavigatorActionExecuteTool.java | 4 ++-- .../NavigatorHandlerProjectCreate.java | 2 +- .../ui/controls/resultset/ResultSetViewer.java | 8 ++------ .../ext/mysql/tools/MySQLToolExport.java | 4 ++-- .../ext/mysql/tools/MySQLToolImport.java | 4 ++-- .../ext/mysql/tools/MySQLToolScript.java | 4 ++-- .../ext/oracle/tools/OracleToolScript.java | 4 ++-- 49 files changed, 90 insertions(+), 86 deletions(-) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{model/DBPTool.java => tools/IExternalTool.java} (79%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/IDataExporter.java (93%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/IDataExporterSite.java (94%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/encoders/BinaryStreamReader.java (93%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/handlers/DataExportHandler.java (91%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/impl/DataExporterAbstract.java (89%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/impl/DataExporterCSV.java (95%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/impl/DataExporterHTML.java (98%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/impl/DataExporterSQL.java (95%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportErrorJob.java (93%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportJob.java (96%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportPageFinal.java (98%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportPageInit.java (99%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportPageOutput.java (99%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportPageSettings.java (99%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportProvider.java (93%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportSettings.java (96%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/data/wizard/DataExportWizard.java (98%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ExportConstants.java (96%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectCreateData.java (92%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectCreateWizard.java (96%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectCreateWizardPageSettings.java (98%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectExportData.java (98%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectExportWizard.java (96%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectExportWizardPage.java (99%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectImportData.java (95%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectImportWizard.java (97%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/project/ProjectImportWizardPageFile.java (99%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/scripts/ScriptsExportData.java (97%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/scripts/ScriptsExportUtils.java (95%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/scripts/ScriptsExportWizard.java (96%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/scripts/ScriptsExportWizardPage.java (99%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/scripts/ScriptsImportData.java (94%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/scripts/ScriptsImportWizard.java (96%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ui/export => tools}/scripts/ScriptsImportWizardPage.java (99%) diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF index 69a6a0e8d0..7e162c2404 100644 --- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF @@ -58,6 +58,13 @@ Export-Package: org.apache.commons.logging, org.jkiss.dbeaver.runtime.qm, org.jkiss.dbeaver.runtime.qm.meta, org.jkiss.dbeaver.runtime.sql, + org.jkiss.dbeaver.tools, + org.jkiss.dbeaver.tools.data, + org.jkiss.dbeaver.tools.data.encoders, + org.jkiss.dbeaver.tools.data.handlers, + org.jkiss.dbeaver.tools.data.impl, + org.jkiss.dbeaver.tools.data.wizard, + org.jkiss.dbeaver.tools.project, org.jkiss.dbeaver.ui, org.jkiss.dbeaver.ui.actions, org.jkiss.dbeaver.ui.actions.common, @@ -97,12 +104,6 @@ Export-Package: org.apache.commons.logging, org.jkiss.dbeaver.ui.editors.sql.syntax, org.jkiss.dbeaver.ui.editors.sql.util, org.jkiss.dbeaver.ui.editors.text, - org.jkiss.dbeaver.ui.export.data, - org.jkiss.dbeaver.ui.export.data.encoders, - org.jkiss.dbeaver.ui.export.data.handlers, - org.jkiss.dbeaver.ui.export.data.impl, - org.jkiss.dbeaver.ui.export.data.wizard, - org.jkiss.dbeaver.ui.export.project, org.jkiss.dbeaver.ui.preferences, org.jkiss.dbeaver.ui.properties, org.jkiss.dbeaver.ui.properties.tabbed, diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml index 825a15e23c..e3a02f472f 100644 --- a/plugins/org.jkiss.dbeaver.core/plugin.xml +++ b/plugins/org.jkiss.dbeaver.core/plugin.xml @@ -356,7 +356,7 @@ - + @@ -1714,7 +1714,7 @@ @@ -1790,7 +1790,7 @@ @@ -1804,7 +1804,7 @@ @@ -1814,7 +1814,7 @@ @@ -1828,7 +1828,7 @@ diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java index cf36745db4..baa7bbf8b2 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java @@ -113,7 +113,7 @@ public class ScriptsHandlerImpl extends AbstractResourceHandler { } // Make new script file - IFile tempFile = ContentUtils.getUniqueFile(scriptsFolder, CoreMessages.model_project_Script, SCRIPT_FILE_EXTENSION); + IFile tempFile = ContentUtils.getUniqueFile(scriptsFolder, "Script", SCRIPT_FILE_EXTENSION); tempFile.create(new ByteArrayInputStream(new byte[]{}), true, progressMonitor); // Save ds container reference diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java index 4556095fb3..d8c7193499 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java @@ -40,8 +40,6 @@ import java.util.List; */ public class DBNResource extends DBNNode { - private final String PROJECT_CFG_FILE = ".project"; - private IResource resource; private DBPResourceHandler handler; private List children; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java index 5a8bcc0bd5..4f84445bf9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java @@ -22,7 +22,7 @@ package org.jkiss.dbeaver.registry; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertyDescriptor; -import org.jkiss.dbeaver.ui.export.data.IDataExporter; +import org.jkiss.dbeaver.tools.data.IDataExporter; import org.jkiss.dbeaver.ui.properties.PropertyDescriptorEx; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java index e40ecfa33e..4e2731e779 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java @@ -22,7 +22,7 @@ package org.jkiss.dbeaver.registry; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.swt.graphics.Image; import org.jkiss.dbeaver.DBException; -import org.jkiss.dbeaver.model.DBPTool; +import org.jkiss.dbeaver.tools.IExternalTool; /** * DataSourceToolDescriptor @@ -66,10 +66,10 @@ public class DataSourceToolDescriptor extends AbstractContextDescriptor return icon; } - public DBPTool createTool() + public IExternalTool createTool() throws DBException { - Class toolClass = getObjectClass(toolClassName, DBPTool.class); + Class toolClass = getObjectClass(toolClassName, IExternalTool.class); if (toolClass == null) { throw new DBException("Tool class '" + toolClassName + "' not found"); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java index 9e890740dc..0dba79773d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java @@ -1144,7 +1144,9 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver xml.addAttribute(RegistryConstants.ATTR_CUSTOM, this.isCustom()); xml.addAttribute(RegistryConstants.ATTR_NAME, this.getName()); xml.addAttribute(RegistryConstants.ATTR_CLASS, this.getDriverClassName()); - xml.addAttribute(RegistryConstants.ATTR_URL, this.getSampleURL()); + if (!CommonUtils.isEmpty(this.getSampleURL())) { + xml.addAttribute(RegistryConstants.ATTR_URL, this.getSampleURL()); + } if (this.getDefaultPort() != null) { xml.addAttribute(RegistryConstants.ATTR_PORT, this.getDefaultPort()); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPTool.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/IExternalTool.java similarity index 79% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPTool.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/IExternalTool.java index c745db9147..fbeeee1a51 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPTool.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/IExternalTool.java @@ -17,15 +17,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.model; +package org.jkiss.dbeaver.tools; import org.eclipse.ui.IWorkbenchWindow; import org.jkiss.dbeaver.DBException; +import org.jkiss.dbeaver.model.DBPObject; /** - * Database utility + * Database external utility. + * Usually utilizes external native software to perform specific database tasks. */ -public interface DBPTool { +public interface IExternalTool { void execute(IWorkbenchWindow window, DBPObject object) throws DBException; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporter.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporter.java similarity index 93% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporter.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporter.java index 06a32c5458..c9752615d6 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporter.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporter.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data; +package org.jkiss.dbeaver.tools.data; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporterSite.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporterSite.java similarity index 94% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporterSite.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporterSite.java index f5fe1a75b1..a693054600 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporterSite.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporterSite.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data; +package org.jkiss.dbeaver.tools.data; import org.jkiss.dbeaver.model.DBPNamedObject; import org.jkiss.dbeaver.model.data.DBDAttributeBinding; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/encoders/BinaryStreamReader.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/encoders/BinaryStreamReader.java similarity index 93% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/encoders/BinaryStreamReader.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/encoders/BinaryStreamReader.java index 6d8a08e542..66bd08e4e7 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/encoders/BinaryStreamReader.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/encoders/BinaryStreamReader.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.encoders; +package org.jkiss.dbeaver.tools.data.encoders; import java.io.IOException; import java.io.InputStream; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/handlers/DataExportHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/handlers/DataExportHandler.java similarity index 91% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/handlers/DataExportHandler.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/handlers/DataExportHandler.java index 4a582a8791..2783eb81ee 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/handlers/DataExportHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/handlers/DataExportHandler.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.handlers; +package org.jkiss.dbeaver.tools.data.handlers; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -28,8 +28,8 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.jkiss.dbeaver.model.struct.DBSDataContainer; import org.jkiss.dbeaver.runtime.RuntimeUtils; import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog; -import org.jkiss.dbeaver.ui.export.data.wizard.DataExportProvider; -import org.jkiss.dbeaver.ui.export.data.wizard.DataExportWizard; +import org.jkiss.dbeaver.tools.data.wizard.DataExportProvider; +import org.jkiss.dbeaver.tools.data.wizard.DataExportWizard; import java.util.ArrayList; import java.util.Iterator; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterAbstract.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterAbstract.java similarity index 89% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterAbstract.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterAbstract.java index 4698de97cb..745eb2f166 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterAbstract.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterAbstract.java @@ -16,14 +16,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.impl; +package org.jkiss.dbeaver.tools.data.impl; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.data.DBDAttributeBinding; import org.jkiss.dbeaver.model.data.DBDValueHandler; import org.jkiss.dbeaver.model.data.DBDValueHandler2; -import org.jkiss.dbeaver.ui.export.data.IDataExporter; -import org.jkiss.dbeaver.ui.export.data.IDataExporterSite; +import org.jkiss.dbeaver.tools.data.IDataExporter; +import org.jkiss.dbeaver.tools.data.IDataExporterSite; /** * Abstract Exporter diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterCSV.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterCSV.java similarity index 95% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterCSV.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterCSV.java index 827f716310..db98aba3fa 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterCSV.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterCSV.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.impl; +package org.jkiss.dbeaver.tools.data.impl; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.DBUtils; @@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding; import org.jkiss.dbeaver.model.data.DBDContent; import org.jkiss.dbeaver.model.data.DBDContentStorage; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.ui.export.data.IDataExporterSite; +import org.jkiss.dbeaver.tools.data.IDataExporterSite; import org.jkiss.dbeaver.utils.ContentUtils; import java.io.IOException; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterHTML.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterHTML.java similarity index 98% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterHTML.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterHTML.java index dde085a316..1167a95e6b 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterHTML.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterHTML.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.impl; +package org.jkiss.dbeaver.tools.data.impl; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.DBUtils; @@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding; import org.jkiss.dbeaver.model.data.DBDContent; import org.jkiss.dbeaver.model.data.DBDContentStorage; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.ui.export.data.IDataExporterSite; +import org.jkiss.dbeaver.tools.data.IDataExporterSite; import org.jkiss.dbeaver.utils.ContentUtils; import javax.imageio.ImageIO; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterSQL.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterSQL.java similarity index 95% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterSQL.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterSQL.java index b426d5b2a7..88d57b8939 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterSQL.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterSQL.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.impl; +package org.jkiss.dbeaver.tools.data.impl; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.DBPNamedObject; @@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.data.DBDContent; import org.jkiss.dbeaver.model.data.DBDContentStorage; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.rdb.DBSTable; -import org.jkiss.dbeaver.ui.export.data.IDataExporterSite; +import org.jkiss.dbeaver.tools.data.IDataExporterSite; import org.jkiss.dbeaver.utils.ContentUtils; import java.io.File; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportErrorJob.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportErrorJob.java similarity index 93% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportErrorJob.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportErrorJob.java index 8f81180ac8..2e034bd142 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportErrorJob.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportErrorJob.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportJob.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportJob.java similarity index 96% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportJob.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportJob.java index f715a04473..c809b56b8f 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportJob.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportJob.java @@ -17,7 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,8 +36,8 @@ import org.jkiss.dbeaver.model.exec.*; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataContainer; import org.jkiss.dbeaver.runtime.AbstractJob; -import org.jkiss.dbeaver.ui.export.data.IDataExporter; -import org.jkiss.dbeaver.ui.export.data.IDataExporterSite; +import org.jkiss.dbeaver.tools.data.IDataExporter; +import org.jkiss.dbeaver.tools.data.IDataExporterSite; import org.jkiss.dbeaver.utils.ContentUtils; import org.jkiss.utils.Base64; import org.jkiss.utils.IOUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageFinal.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageFinal.java similarity index 98% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageFinal.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageFinal.java index b82705fea8..11c76a8e04 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageFinal.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageFinal.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ControlAdapter; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageInit.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageInit.java similarity index 99% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageInit.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageInit.java index 65bbe1d383..e939a890f0 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageInit.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageInit.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.eclipse.jface.viewers.*; import org.eclipse.swt.SWT; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageOutput.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageOutput.java similarity index 99% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageOutput.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageOutput.java index 14df109268..da21c7fa8c 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageOutput.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageOutput.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageSettings.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageSettings.java similarity index 99% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageSettings.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageSettings.java index 0652545c43..c3eada01c3 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageSettings.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageSettings.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.swt.SWT; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportProvider.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportProvider.java similarity index 93% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportProvider.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportProvider.java index 7b718983a2..e4d44ea9c2 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportProvider.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportProvider.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.jkiss.dbeaver.model.data.DBDDataFilter; import org.jkiss.dbeaver.model.struct.DBSDataContainer; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportSettings.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportSettings.java similarity index 96% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportSettings.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportSettings.java index bfb994c121..d0f87df67d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportSettings.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportSettings.java @@ -17,7 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.program.Program; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportWizard.java similarity index 98% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportWizard.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportWizard.java index 18f2a40727..dd9cd5fae5 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportWizard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportWizard.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.data.wizard; +package org.jkiss.dbeaver.tools.data.wizard; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ExportConstants.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ExportConstants.java similarity index 96% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ExportConstants.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ExportConstants.java index 94c98a9e92..73f5b6335d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ExportConstants.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ExportConstants.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; /** * Import/Export constants diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateData.java similarity index 92% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateData.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateData.java index c417cb86c5..bcbe816a1d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateData.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateData.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; /** * Create data diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizard.java similarity index 96% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizard.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizard.java index cdce04fe8c..aeafb8b79f 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizard.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizardPageSettings.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizardPageSettings.java similarity index 98% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizardPageSettings.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizardPageSettings.java index e908f58de4..e3f8836fc4 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizardPageSettings.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizardPageSettings.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.events.ModifyEvent; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportData.java similarity index 98% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportData.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportData.java index a24293d5ee..6847ae6045 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportData.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportData.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; import org.eclipse.core.resources.IProject; import org.jkiss.dbeaver.registry.DriverDescriptor; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizard.java similarity index 96% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizard.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizard.java index 5fb6df13e6..5a0bba784d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizard.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -272,6 +272,8 @@ public class ProjectExportWizard extends Wizard implements IExportWizard { private void exportProject(DBRProgressMonitor monitor, ProjectExportData exportData, IProject project) throws InterruptedException, CoreException, IOException { monitor.subTask(project.getName()); + // Refresh project + project.refreshLocal(IResource.DEPTH_INFINITE, monitor.getNestedMonitor()); // Write meta info exportData.meta.startElement(ExportConstants.TAG_PROJECT); @@ -316,6 +318,9 @@ public class ProjectExportWizard extends Wizard implements IExportWizard { // Export children final IResource[] members = ((IContainer) resource).members(); for (IResource child : members) { + if (child.isLinked()) { + continue; + } exportResourceTree(monitor, exportData, parentPath, child); } } else if (resource instanceof IFile) { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizardPage.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizardPage.java similarity index 99% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizardPage.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizardPage.java index bff6236749..70eb913733 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizardPage.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizardPage.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportData.java similarity index 95% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportData.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportData.java index c7ba5f9f31..735e44c5cc 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportData.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportData.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.wizard.WizardPage; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizard.java similarity index 97% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizard.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizard.java index ca578aeb52..5f4192cc8e 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizard.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizardPageFile.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizardPageFile.java similarity index 99% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizardPageFile.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizardPageFile.java index 4e19ed7fa7..bb571ee220 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizardPageFile.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizardPageFile.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.project; +package org.jkiss.dbeaver.tools.project; import org.eclipse.core.resources.IProject; import org.eclipse.jface.dialogs.IMessageProvider; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportData.java similarity index 97% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportData.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportData.java index f71d46bb46..7f5a529891 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportData.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportData.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.scripts; +package org.jkiss.dbeaver.tools.scripts; import org.eclipse.core.resources.IResource; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java similarity index 95% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportUtils.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java index f4755a1776..e0f02ff396 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.scripts; +package org.jkiss.dbeaver.tools.scripts; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java similarity index 96% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizard.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java index a01e8e5b01..c669133859 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.scripts; +package org.jkiss.dbeaver.tools.scripts; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizardPage.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizardPage.java similarity index 99% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizardPage.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizardPage.java index 4a5b903fdb..12e683f433 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizardPage.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizardPage.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.scripts; +package org.jkiss.dbeaver.tools.scripts; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportData.java similarity index 94% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportData.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportData.java index ac55dda03a..84cd2e5fc6 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportData.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportData.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.scripts; +package org.jkiss.dbeaver.tools.scripts; import org.jkiss.dbeaver.model.navigator.DBNResource; import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizard.java similarity index 96% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizard.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizard.java index a6be348006..1ba16460fe 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizard.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.scripts; +package org.jkiss.dbeaver.tools.scripts; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizardPage.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizardPage.java similarity index 99% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizardPage.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizardPage.java index c9bd611d8e..9736c2e081 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizardPage.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizardPage.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.jkiss.dbeaver.ui.export.scripts; +package org.jkiss.dbeaver.tools.scripts; import org.eclipse.core.resources.IFolder; import org.eclipse.jface.viewers.*; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java index 183db0ba57..a427606dc9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java @@ -25,7 +25,7 @@ import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IWorkbenchWindow; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.DBPObject; -import org.jkiss.dbeaver.model.DBPTool; +import org.jkiss.dbeaver.tools.IExternalTool; import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.struct.DBSWrapper; import org.jkiss.dbeaver.registry.DataSourceToolDescriptor; @@ -59,7 +59,7 @@ public class NavigatorActionExecuteTool implements IActionDelegate private void executeTool(DBPObject object) { try { - DBPTool toolInstance = tool.createTool(); + IExternalTool toolInstance = tool.createTool(); toolInstance.execute(window, DBUtils.getPublicObject(object)); } catch (DBException e) { UIUtils.showErrorDialog(window.getShell(), "Tool error", "Error executing tool '" + tool.getLabel() + "'", e); diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java index 603546334a..adddac2301 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java @@ -22,7 +22,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.ui.handlers.HandlerUtil; import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog; -import org.jkiss.dbeaver.ui.export.project.ProjectCreateWizard; +import org.jkiss.dbeaver.tools.project.ProjectCreateWizard; public class NavigatorHandlerProjectCreate extends NavigatorHandlerObjectBase { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java index 31ce7308df..c68a3ff2b6 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java @@ -41,9 +41,7 @@ import org.eclipse.swt.graphics.*; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; -import org.eclipse.ui.IEditorPart; import org.eclipse.ui.ISaveablePart2; -import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.menus.CommandContributionItem; @@ -60,8 +58,6 @@ import org.jkiss.dbeaver.model.data.*; import org.jkiss.dbeaver.model.data.query.DBQCondition; import org.jkiss.dbeaver.model.data.query.DBQOrderColumn; import org.jkiss.dbeaver.model.exec.*; -import org.jkiss.dbeaver.model.navigator.DBNAdapterFactory; -import org.jkiss.dbeaver.model.navigator.DBNNode; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress; import org.jkiss.dbeaver.model.struct.*; @@ -83,8 +79,8 @@ import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog; import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog; import org.jkiss.dbeaver.ui.dialogs.EditTextDialog; import org.jkiss.dbeaver.ui.dialogs.struct.EditConstraintDialog; -import org.jkiss.dbeaver.ui.export.data.wizard.DataExportProvider; -import org.jkiss.dbeaver.ui.export.data.wizard.DataExportWizard; +import org.jkiss.dbeaver.tools.data.wizard.DataExportProvider; +import org.jkiss.dbeaver.tools.data.wizard.DataExportWizard; import org.jkiss.dbeaver.ui.help.IHelpContextIds; import org.jkiss.dbeaver.ui.preferences.PrefConstants; import org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral; diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java index 22e3496cd6..5b707b5658 100644 --- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java +++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java @@ -22,13 +22,13 @@ import org.eclipse.ui.IWorkbenchWindow; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog; import org.jkiss.dbeaver.model.DBPObject; -import org.jkiss.dbeaver.model.DBPTool; +import org.jkiss.dbeaver.tools.IExternalTool; import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog; /** * Database export */ -public class MySQLToolExport implements DBPTool +public class MySQLToolExport implements IExternalTool { @Override public void execute(IWorkbenchWindow window, DBPObject object) throws DBException diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java index 1e58823349..51029b63a5 100644 --- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java +++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java @@ -22,13 +22,13 @@ import org.eclipse.ui.IWorkbenchWindow; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog; import org.jkiss.dbeaver.model.DBPObject; -import org.jkiss.dbeaver.model.DBPTool; +import org.jkiss.dbeaver.tools.IExternalTool; import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog; /** * Database import */ -public class MySQLToolImport implements DBPTool +public class MySQLToolImport implements IExternalTool { @Override public void execute(IWorkbenchWindow window, DBPObject object) throws DBException diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java index e25374cfce..bfdd674c53 100644 --- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java +++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java @@ -23,7 +23,7 @@ import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog; import org.jkiss.dbeaver.model.DBPConnectionInfo; import org.jkiss.dbeaver.model.DBPObject; -import org.jkiss.dbeaver.model.DBPTool; +import org.jkiss.dbeaver.tools.IExternalTool; import org.jkiss.dbeaver.ui.dialogs.tools.AbstractToolWizard; import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog; import org.jkiss.utils.CommonUtils; @@ -35,7 +35,7 @@ import java.util.List; /** * Database import */ -public class MySQLToolScript implements DBPTool +public class MySQLToolScript implements IExternalTool { @Override public void execute(IWorkbenchWindow window, DBPObject object) throws DBException diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java index edb66430af..8eed0d9dbf 100644 --- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java +++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java @@ -22,14 +22,14 @@ import org.eclipse.ui.IWorkbenchWindow; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.ext.oracle.model.OracleDataSource; import org.jkiss.dbeaver.model.DBPObject; -import org.jkiss.dbeaver.model.DBPTool; +import org.jkiss.dbeaver.tools.IExternalTool; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog; /** * Database import */ -public class OracleToolScript implements DBPTool +public class OracleToolScript implements IExternalTool { @Override public void execute(IWorkbenchWindow window, DBPObject object) throws DBException -- GitLab