From 11ad52e91e65ee8d7c58da5cf33f27597699dde4 Mon Sep 17 00:00:00 2001 From: jurgen Date: Thu, 25 Jun 2015 06:36:16 +0000 Subject: [PATCH] QM model refactoring Former-commit-id: 81629fb658afd2a2781af41b8f280deaf805cb74 --- .../search/SearchResultPageAdapter.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../core/DBeaverPreferencesInitializer.java | 4 +-- .../src/org/jkiss/dbeaver/core/DBeaverUI.java | 6 ++-- .../src/org/jkiss/dbeaver/model/DBUtils.java | 3 +- .../impl/net/GlobalProxyAuthenticator.java | 2 +- .../sql/edit/struct/SQLConstraintManager.java | 2 +- .../sql/edit/struct/SQLForeignKeyManager.java | 2 +- .../impl/sql/edit/struct/SQLIndexManager.java | 2 +- .../edit/struct/SQLTableColumnManager.java | 2 +- .../impl/sql/edit/struct/SQLTableManager.java | 2 +- .../dbeaver/model/navigator/DBNProject.java | 2 +- .../{runtime => model}/qm/QMConstants.java | 2 +- .../jkiss/dbeaver/model/qm/QMController.java | 4 --- .../{runtime => model}/qm/QMEventFilter.java | 2 +- .../jkiss/dbeaver/model/qm/QMMCollector.java | 29 +++++++++++++++ .../{runtime => model}/qm/QMMetaEvent.java | 4 +-- .../{runtime => model}/qm/QMMetaListener.java | 2 +- .../{runtime => model}/qm/QMObjectType.java | 10 +++--- .../org/jkiss/dbeaver/model/qm/QMUtils.java | 2 -- .../{runtime => model}/qm/meta/QMMObject.java | 4 +-- .../qm/meta/QMMSessionInfo.java | 28 +++++++-------- .../qm/meta/QMMStatementExecuteInfo.java | 2 +- .../qm/meta/QMMStatementInfo.java | 4 +-- .../qm/meta/QMMTransactionInfo.java | 2 +- .../qm/meta/QMMTransactionSavepointInfo.java | 2 +- .../runtime/VoidProgressMonitor.java | 4 +-- .../virtual/DBVEntityConstraintColumn.java | 2 +- .../registry/DataSourceDescriptor.java | 8 ++--- .../dbeaver/registry/DataSourceRegistry.java | 2 +- .../dbeaver/registry/ProjectRegistry.java | 2 +- .../jkiss/dbeaver/runtime/RuntimeUtils.java | 33 ----------------- .../dbeaver/runtime/load/jobs/LoadingJob.java | 2 +- .../properties/ObjectPropertyDescriptor.java | 2 +- .../runtime/qm/DefaultEventFilter.java | 6 +++- .../dbeaver/runtime/qm/QMControllerImpl.java | 8 +++-- .../dbeaver/runtime/qm/QMLogFileWriter.java | 6 +++- ...MMCollector.java => QMMCollectorImpl.java} | 15 ++++---- .../{model => runtime}/ui/DBUICallback.java | 2 +- .../ui/DBUserInterface.java | 2 +- .../tools/scripts/ScriptsExportUtils.java | 2 +- .../database/ColumnsMappingDialog.java | 2 +- .../database/DatabaseConsumerPageMapping.java | 2 +- .../database/DatabaseMappingContainer.java | 2 +- .../ui/actions/DataSourcePropertyTester.java | 8 ++--- .../datasource/DataSourceConnectHandler.java | 2 +- .../NavigatorHandlerObjectRename.java | 2 +- .../ui/controls/ObjectViewerRenderer.java | 4 +-- .../ui/controls/itemlist/NodeListControl.java | 2 +- .../controls/itemlist/ObjectListControl.java | 4 +-- .../ui/controls/querylog/QueryLogViewer.java | 4 +-- .../resultset/CollectionElementData.java | 3 +- .../ui/controls/resultset/ResultSetUtils.java | 2 +- .../controls/resultset/ResultSetViewer.java | 2 +- .../ValidateUniqueKeyUsageDialog.java | 2 +- .../ui/data/editors/ContentInlineEditor.java | 2 +- .../ui/data/managers/BaseValueManager.java | 2 +- .../ui/dialogs/data/TextViewDialog.java | 2 +- .../ui/dialogs/data/ValueViewDialog.java | 2 +- .../dialogs/struct/EditConstraintDialog.java | 2 +- .../dialogs/struct/EditForeignKeyDialog.java | 2 +- .../ui/editors/content/ContentEditor.java | 2 +- .../properties/ObjectPropertiesEditor.java | 2 +- .../ui/editors/sql/log/SQLLogFilter.java | 6 ++-- .../ui/preferences/PrefPageQueryManager.java | 4 +-- .../ui/properties/PropertyTreeViewer.java | 4 +-- .../ui/search/data/SearchDataQuery.java | 2 +- .../database/CheckboxTreeManager.java | 3 +- .../DatabaseNavigatorContentProvider.java | 2 +- .../org/jkiss/dbeaver/utils/GeneralUtils.java | 35 +++++++++++++++++++ .../org/jkiss/dbeaver/ext/db2/DB2Utils.java | 2 +- .../ext/db2/manager/DB2TableManager.java | 2 +- .../dbeaver/ext/db2/model/DB2DataSource.java | 2 +- .../dbeaver/ext/db2/model/DB2DataType.java | 2 +- .../dbeaver/ext/db2/model/DB2Package.java | 2 +- .../ext/db2/model/DB2TablePartition.java | 2 +- .../dbeaver/ext/db2/model/DB2Tablespace.java | 2 +- .../dbeaver/ext/db2/model/DB2Variable.java | 2 +- .../ext/db2/model/fed/DB2RemoteServer.java | 2 +- .../ext/db2/model/fed/DB2UserMapping.java | 2 +- .../ext/db2/model/security/DB2Role.java | 2 +- .../ext/db2/model/security/DB2RoleDep.java | 2 +- .../dbeaver/ext/erd/model/DiagramLoader.java | 2 +- .../dbeaver/ext/erd/part/AssociationPart.java | 2 +- .../ext/generic/model/GenericDataSource.java | 2 +- .../ext/mysql/edit/MySQLTableManager.java | 2 +- .../model/OracleTableForeignKeyColumn.java | 2 +- 87 files changed, 201 insertions(+), 170 deletions(-) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/QMConstants.java (94%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/QMEventFilter.java (92%) create mode 100644 plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMCollector.java rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/QMMetaEvent.java (89%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/QMMetaListener.java (93%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/QMObjectType.java (85%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/meta/QMMObject.java (92%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/meta/QMMSessionInfo.java (85%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/meta/QMMStatementExecuteInfo.java (94%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/meta/QMMStatementInfo.java (93%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/meta/QMMTransactionInfo.java (95%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{runtime => model}/qm/meta/QMMTransactionSavepointInfo.java (95%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{ => model}/runtime/VoidProgressMonitor.java (88%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/{meta/QMMCollector.java => QMMCollectorImpl.java} (93%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{model => runtime}/ui/DBUICallback.java (94%) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{model => runtime}/ui/DBUserInterface.java (95%) diff --git a/plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/SearchResultPageAdapter.java b/plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/SearchResultPageAdapter.java index 6888fc418c..7e903a9e7e 100644 --- a/plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/SearchResultPageAdapter.java +++ b/plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/SearchResultPageAdapter.java @@ -7,7 +7,7 @@ import org.eclipse.ui.IActionBars; import org.eclipse.ui.IMemento; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.IPageSite; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.search.IObjectSearchResultPage; diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF index 750625fec8..6b955788c5 100644 --- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF @@ -38,6 +38,7 @@ Export-Package: org.jkiss.dbeaver, org.jkiss.dbeaver.model.net, org.jkiss.dbeaver.model.project, org.jkiss.dbeaver.model.qm, + org.jkiss.dbeaver.model.qm.meta, org.jkiss.dbeaver.model.runtime, org.jkiss.dbeaver.model.sql, org.jkiss.dbeaver.model.sql.parser, @@ -55,7 +56,6 @@ Export-Package: org.jkiss.dbeaver, org.jkiss.dbeaver.runtime.preferences, org.jkiss.dbeaver.runtime.properties, org.jkiss.dbeaver.runtime.qm, - org.jkiss.dbeaver.runtime.qm.meta, org.jkiss.dbeaver.runtime.sql, org.jkiss.dbeaver.tools, org.jkiss.dbeaver.tools.compare, diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java index 56d8f4d689..471e317cf1 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java @@ -29,8 +29,8 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; import org.jkiss.dbeaver.registry.DataFormatterProfile; import org.jkiss.dbeaver.runtime.RuntimeUtils; import org.jkiss.dbeaver.runtime.preferences.BundlePreferenceStore; -import org.jkiss.dbeaver.runtime.qm.QMConstants; -import org.jkiss.dbeaver.runtime.qm.QMObjectType; +import org.jkiss.dbeaver.model.qm.QMConstants; +import org.jkiss.dbeaver.model.qm.QMObjectType; import org.jkiss.dbeaver.model.sql.SQLConstants; import org.jkiss.dbeaver.runtime.sql.SQLScriptCommitType; import org.jkiss.dbeaver.runtime.sql.SQLScriptErrorHandling; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverUI.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverUI.java index a09a0b0cb9..703cd090a9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverUI.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverUI.java @@ -38,12 +38,12 @@ import org.jkiss.dbeaver.model.access.DBAAuthInfo; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.DBRRunnableContext; import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress; -import org.jkiss.dbeaver.model.ui.DBUICallback; -import org.jkiss.dbeaver.model.ui.DBUserInterface; +import org.jkiss.dbeaver.runtime.ui.DBUICallback; +import org.jkiss.dbeaver.runtime.ui.DBUserInterface; import org.jkiss.dbeaver.runtime.RunnableContextDelegate; import org.jkiss.dbeaver.runtime.RunnableWithResult; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.AbstractUIJob; import org.jkiss.dbeaver.ui.SharedTextColors; import org.jkiss.dbeaver.ui.TrayIconHandler; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java index 199f5670a9..f47ed4cd12 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java @@ -33,7 +33,6 @@ import org.jkiss.dbeaver.model.struct.*; import org.jkiss.dbeaver.model.struct.rdb.*; import org.jkiss.dbeaver.registry.DataSourceProviderRegistry; import org.jkiss.dbeaver.registry.DataTypeProviderDescriptor; -import org.jkiss.dbeaver.runtime.RuntimeUtils; import org.jkiss.dbeaver.model.sql.SQLConstants; import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.ArrayUtils; @@ -987,7 +986,7 @@ public final class DBUtils { byte[] bytes = (byte[]) value; return CommonUtils.toHexString(bytes, 0, 2000); } else { - return RuntimeUtils.makeDisplayString(value).toString(); + return GeneralUtils.makeDisplayString(value).toString(); } } String className = value.getClass().getName(); diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/GlobalProxyAuthenticator.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/GlobalProxyAuthenticator.java index d4570149e8..edd5a899aa 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/GlobalProxyAuthenticator.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/GlobalProxyAuthenticator.java @@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext; import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration; import org.jkiss.dbeaver.model.net.DBWHandlerType; import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer; -import org.jkiss.dbeaver.model.ui.DBUserInterface; +import org.jkiss.dbeaver.runtime.ui.DBUserInterface; import org.jkiss.dbeaver.registry.encode.EncryptionException; import org.jkiss.dbeaver.registry.encode.SecuredPasswordEncrypter; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLConstraintManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLConstraintManager.java index 78cd227b15..11cb3d2b1c 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLConstraintManager.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLConstraintManager.java @@ -27,7 +27,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTable; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableConstraint; import org.jkiss.dbeaver.model.impl.sql.edit.SQLObjectEditor; import org.jkiss.dbeaver.model.struct.DBSEntityAttributeRef; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import java.util.List; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLForeignKeyManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLForeignKeyManager.java index 0669d55142..58ba9ddf62 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLForeignKeyManager.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLForeignKeyManager.java @@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableConstraint; import org.jkiss.dbeaver.model.impl.sql.edit.SQLObjectEditor; import org.jkiss.dbeaver.model.struct.DBSEntityAttributeRef; import org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKey; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import java.util.Collection; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLIndexManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLIndexManager.java index de72de452e..23f47dbb1f 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLIndexManager.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLIndexManager.java @@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableIndex; import org.jkiss.dbeaver.model.impl.sql.edit.SQLObjectEditor; import org.jkiss.dbeaver.model.struct.DBSObjectContainer; import org.jkiss.dbeaver.model.struct.rdb.DBSTableIndexColumn; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; /** diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableColumnManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableColumnManager.java index 1ef51e2c57..9007fa1cb7 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableColumnManager.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableColumnManager.java @@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTable; import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTableColumn; import org.jkiss.dbeaver.model.impl.sql.edit.SQLObjectEditor; import org.jkiss.dbeaver.model.struct.DBSDataType; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; /** diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableManager.java index df7d25c1b5..47464693ff 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableManager.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLTableManager.java @@ -25,7 +25,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.struct.JDBCTable; import org.jkiss.dbeaver.model.impl.sql.edit.SQLStructEditor; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.DBSObjectContainer; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNProject.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNProject.java index aa95603cb7..5b8ef13fa9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNProject.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNProject.java @@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.DBPImage; import org.jkiss.dbeaver.model.project.DBPResourceHandler; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.registry.DataSourceRegistry; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.DBIcon; import java.util.ArrayList; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMConstants.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMConstants.java similarity index 94% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMConstants.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMConstants.java index 78acc782f4..264c577521 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMConstants.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMConstants.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm; +package org.jkiss.dbeaver.model.qm; /** * QM log constants diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMController.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMController.java index f9b4a83e28..3fde969e8e 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMController.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMController.java @@ -18,10 +18,6 @@ package org.jkiss.dbeaver.model.qm; -import org.jkiss.dbeaver.runtime.qm.QMMetaEvent; -import org.jkiss.dbeaver.runtime.qm.QMMetaListener; -import org.jkiss.dbeaver.runtime.qm.meta.QMMCollector; - import java.util.List; /** diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMEventFilter.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMEventFilter.java similarity index 92% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMEventFilter.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMEventFilter.java index 2a7a2f069d..305ac39d88 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMEventFilter.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMEventFilter.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm; +package org.jkiss.dbeaver.model.qm; /** * Query log filter diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMCollector.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMCollector.java new file mode 100644 index 0000000000..60b54b5beb --- /dev/null +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMCollector.java @@ -0,0 +1,29 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License (version 2) + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +package org.jkiss.dbeaver.model.qm; + +import org.jkiss.dbeaver.model.exec.DBCExecutionContext; +import org.jkiss.dbeaver.model.qm.meta.QMMSessionInfo; + +/** + * Query manager execution handler implementation + */ +public interface QMMCollector extends QMExecutionHandler { + + QMMSessionInfo getSessionInfo(DBCExecutionContext context); +} diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMetaEvent.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMetaEvent.java similarity index 89% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMetaEvent.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMetaEvent.java index 810a9a6274..c0cd4082f5 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMetaEvent.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMetaEvent.java @@ -16,9 +16,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm; +package org.jkiss.dbeaver.model.qm; -import org.jkiss.dbeaver.runtime.qm.meta.QMMObject; +import org.jkiss.dbeaver.model.qm.meta.QMMObject; /** * QM meta event diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMetaListener.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMetaListener.java similarity index 93% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMetaListener.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMetaListener.java index ffec6e57a9..2b0d685b22 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMetaListener.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMetaListener.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm; +package org.jkiss.dbeaver.model.qm; import java.util.List; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMObjectType.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMObjectType.java similarity index 85% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMObjectType.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMObjectType.java index ae8c800e60..ba922728fa 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMObjectType.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMObjectType.java @@ -15,12 +15,12 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm; +package org.jkiss.dbeaver.model.qm; -import org.jkiss.dbeaver.runtime.qm.meta.QMMObject; -import org.jkiss.dbeaver.runtime.qm.meta.QMMSessionInfo; -import org.jkiss.dbeaver.runtime.qm.meta.QMMStatementInfo; -import org.jkiss.dbeaver.runtime.qm.meta.QMMTransactionInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMObject; +import org.jkiss.dbeaver.model.qm.meta.QMMSessionInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMStatementInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMTransactionInfo; import org.jkiss.utils.CommonUtils; import java.util.ArrayList; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMUtils.java index 3d0a659cf3..1cab526bf1 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMUtils.java @@ -19,8 +19,6 @@ package org.jkiss.dbeaver.model.qm; import org.jkiss.dbeaver.core.DBeaverCore; -import org.jkiss.dbeaver.runtime.qm.QMMetaEvent; -import org.jkiss.dbeaver.runtime.qm.QMMetaListener; import java.util.List; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMObject.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMObject.java similarity index 92% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMObject.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMObject.java index 369df19ac5..674e888af1 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMObject.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMObject.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm.meta; +package org.jkiss.dbeaver.model.qm.meta; import org.jkiss.dbeaver.core.Log; @@ -43,7 +43,7 @@ public class QMMObject { this.openTime = getTimeStamp(); } - protected void close() + public void close() { this.closeTime = getTimeStamp(); this.update(); diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMSessionInfo.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMSessionInfo.java similarity index 85% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMSessionInfo.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMSessionInfo.java index d4fa381764..36c16789d3 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMSessionInfo.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMSessionInfo.java @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm.meta; +package org.jkiss.dbeaver.model.qm.meta; import org.jkiss.dbeaver.model.exec.DBCExecutionContext; import org.jkiss.dbeaver.model.exec.DBCResultSet; @@ -40,7 +40,7 @@ public class QMMSessionInfo extends QMMObject { private QMMStatementExecuteInfo executionStack; private QMMTransactionInfo transaction; - QMMSessionInfo(DBCExecutionContext context, boolean transactional, QMMSessionInfo previous) + public QMMSessionInfo(DBCExecutionContext context, boolean transactional, QMMSessionInfo previous) { this.containerId = context.getDataSource().getContainer().getId(); this.reference = new SoftReference(context); @@ -50,7 +50,7 @@ public class QMMSessionInfo extends QMMObject { } @Override - protected void close() + public void close() { if (transaction != null) { transaction.rollback(null); @@ -66,7 +66,7 @@ public class QMMSessionInfo extends QMMObject { super.close(); } - QMMTransactionInfo changeTransactional(boolean transactional) + public QMMTransactionInfo changeTransactional(boolean transactional) { if (this.transactional == transactional) { return null; @@ -81,7 +81,7 @@ public class QMMSessionInfo extends QMMObject { return this.transaction.getPrevious(); } - QMMTransactionInfo commit() + public QMMTransactionInfo commit() { if (this.transactional) { if (this.transaction != null) { @@ -93,7 +93,7 @@ public class QMMSessionInfo extends QMMObject { return null; } - QMMObject rollback(DBCSavepoint savepoint) + public QMMObject rollback(DBCSavepoint savepoint) { if (this.transactional) { if (this.transaction != null) { @@ -111,12 +111,12 @@ public class QMMSessionInfo extends QMMObject { return null; } - QMMStatementInfo openStatement(DBCStatement statement) + public QMMStatementInfo openStatement(DBCStatement statement) { return this.statementStack = new QMMStatementInfo(this, statement, this.statementStack); } - QMMStatementInfo closeStatement(DBCStatement statement) + public QMMStatementInfo closeStatement(DBCStatement statement) { for (QMMStatementInfo stat = this.statementStack; stat != null; stat = stat.getPrevious()) { if (stat.getReference() == statement) { @@ -128,7 +128,7 @@ public class QMMSessionInfo extends QMMObject { return null; } - QMMStatementInfo getStatement(DBCStatement statement) + public QMMStatementInfo getStatement(DBCStatement statement) { for (QMMStatementInfo stat = this.statementStack; stat != null; stat = stat.getPrevious()) { if (stat.getReference() == statement) { @@ -139,7 +139,7 @@ public class QMMSessionInfo extends QMMObject { return null; } - QMMStatementExecuteInfo getExecution(DBCStatement statement) + public QMMStatementExecuteInfo getExecution(DBCStatement statement) { for (QMMStatementExecuteInfo exec = this.executionStack; exec != null; exec = exec.getPrevious()) { if (exec.getStatement().getReference() == statement) { @@ -150,7 +150,7 @@ public class QMMSessionInfo extends QMMObject { return null; } - QMMStatementExecuteInfo beginExecution(DBCStatement statement) + public QMMStatementExecuteInfo beginExecution(DBCStatement statement) { QMMStatementInfo stat = getStatement(statement); if (stat != null) { @@ -168,7 +168,7 @@ public class QMMSessionInfo extends QMMObject { } } - QMMStatementExecuteInfo endExecution(DBCStatement statement, long rowCount, Throwable error) + public QMMStatementExecuteInfo endExecution(DBCStatement statement, long rowCount, Throwable error) { QMMStatementExecuteInfo exec = getExecution(statement); if (exec != null) { @@ -177,7 +177,7 @@ public class QMMSessionInfo extends QMMObject { return exec; } - QMMStatementExecuteInfo beginFetch(DBCResultSet resultSet) + public QMMStatementExecuteInfo beginFetch(DBCResultSet resultSet) { QMMStatementExecuteInfo exec = getExecution(resultSet.getSourceStatement()); if (exec == null) { @@ -189,7 +189,7 @@ public class QMMSessionInfo extends QMMObject { return exec; } - QMMStatementExecuteInfo endFetch(DBCResultSet resultSet, long rowCount) + public QMMStatementExecuteInfo endFetch(DBCResultSet resultSet, long rowCount) { QMMStatementExecuteInfo exec = getExecution(resultSet.getSourceStatement()); if (exec != null) { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMStatementExecuteInfo.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMStatementExecuteInfo.java similarity index 94% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMStatementExecuteInfo.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMStatementExecuteInfo.java index 94d608dc86..7533fd6137 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMStatementExecuteInfo.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMStatementExecuteInfo.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm.meta; +package org.jkiss.dbeaver.model.qm.meta; import java.sql.SQLException; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMStatementInfo.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMStatementInfo.java similarity index 93% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMStatementInfo.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMStatementInfo.java index 21eaec68aa..7957802307 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMStatementInfo.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMStatementInfo.java @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm.meta; +package org.jkiss.dbeaver.model.qm.meta; import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; import org.jkiss.dbeaver.model.exec.DBCStatement; @@ -41,7 +41,7 @@ public class QMMStatementInfo extends QMMObject { } @Override - protected void close() + public void close() { super.close(); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMTransactionInfo.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMTransactionInfo.java similarity index 95% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMTransactionInfo.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMTransactionInfo.java index 31a2538f17..006606f60a 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMTransactionInfo.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMTransactionInfo.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm.meta; +package org.jkiss.dbeaver.model.qm.meta; import org.jkiss.dbeaver.model.exec.DBCSavepoint; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMTransactionSavepointInfo.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMTransactionSavepointInfo.java similarity index 95% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMTransactionSavepointInfo.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMTransactionSavepointInfo.java index 0fe9ee0209..959704011e 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMTransactionSavepointInfo.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/meta/QMMTransactionSavepointInfo.java @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm.meta; +package org.jkiss.dbeaver.model.qm.meta; import org.jkiss.dbeaver.model.exec.DBCSavepoint; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/VoidProgressMonitor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/VoidProgressMonitor.java similarity index 88% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/VoidProgressMonitor.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/VoidProgressMonitor.java index ac037fbbf7..70bf4787c9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/VoidProgressMonitor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/VoidProgressMonitor.java @@ -15,12 +15,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime; +package org.jkiss.dbeaver.model.runtime; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.jkiss.dbeaver.model.runtime.DBRBlockingObject; -import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; /** * Progress monitor null implementation diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/virtual/DBVEntityConstraintColumn.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/virtual/DBVEntityConstraintColumn.java index b3eef718f5..091a7a15a8 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/virtual/DBVEntityConstraintColumn.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/virtual/DBVEntityConstraintColumn.java @@ -20,7 +20,7 @@ package org.jkiss.dbeaver.model.virtual; import org.jkiss.code.NotNull; import org.jkiss.dbeaver.model.struct.DBSEntityAttribute; import org.jkiss.dbeaver.model.struct.DBSEntityAttributeRef; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; /** * Constraint column diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java index e33d44f3ba..c923a56ca2 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java @@ -45,10 +45,10 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress; import org.jkiss.dbeaver.model.struct.*; import org.jkiss.dbeaver.model.virtual.DBVModel; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.qm.meta.QMMCollector; -import org.jkiss.dbeaver.runtime.qm.meta.QMMSessionInfo; -import org.jkiss.dbeaver.runtime.qm.meta.QMMTransactionInfo; -import org.jkiss.dbeaver.runtime.qm.meta.QMMTransactionSavepointInfo; +import org.jkiss.dbeaver.model.qm.QMMCollector; +import org.jkiss.dbeaver.model.qm.meta.QMMSessionInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMTransactionInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMTransactionSavepointInfo; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.actions.DataSourcePropertyTester; import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java index 99182a00ff..068accd512 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceRegistry.java @@ -37,7 +37,7 @@ import org.jkiss.dbeaver.registry.encode.EncryptionException; import org.jkiss.dbeaver.registry.encode.PasswordEncrypter; import org.jkiss.dbeaver.registry.encode.SimpleStringEncrypter; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.runtime.preferences.SimplePreferenceStore; import org.jkiss.dbeaver.utils.ContentUtils; import org.jkiss.dbeaver.utils.GeneralUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ProjectRegistry.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ProjectRegistry.java index a6cd7288b0..a5d97b96e7 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ProjectRegistry.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ProjectRegistry.java @@ -26,7 +26,7 @@ import org.jkiss.dbeaver.core.DBeaverCore; import org.jkiss.dbeaver.ui.resources.DefaultResourceHandlerImpl; import org.jkiss.dbeaver.model.project.DBPProjectListener; import org.jkiss.dbeaver.model.project.DBPResourceHandler; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.actions.GlobalPropertyTester; import org.jkiss.dbeaver.utils.ContentUtils; import org.jkiss.utils.ArrayUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/RuntimeUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/RuntimeUtils.java index da2deabf8c..f9ddb4bdce 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/RuntimeUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/RuntimeUtils.java @@ -411,39 +411,6 @@ public class RuntimeUtils { return null; } - public static Object makeDisplayString(Object object) - { - if (object == null) { - return ""; //$NON-NLS-1$ - } - if (object instanceof Number) { - return NumberFormat.getInstance().format(object); - } - Class eClass = object.getClass(); - if (eClass.isArray()) { - if (eClass == byte[].class) - return Arrays.toString((byte[]) object); - else if (eClass == short[].class) - return Arrays.toString((short[]) object); - else if (eClass == int[].class) - return Arrays.toString((int[]) object); - else if (eClass == long[].class) - return Arrays.toString((long[]) object); - else if (eClass == char[].class) - return Arrays.toString((char[]) object); - else if (eClass == float[].class) - return Arrays.toString((float[]) object); - else if (eClass == double[].class) - return Arrays.toString((double[]) object); - else if (eClass == boolean[].class) - return Arrays.toString((boolean[]) object); - else { // element is an array of object references - return Arrays.deepToString((Object[]) object); - } - } - return object; - } - public static void pause(int ms) { try { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/load/jobs/LoadingJob.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/load/jobs/LoadingJob.java index 2d740716e7..f846a6c0bd 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/load/jobs/LoadingJob.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/load/jobs/LoadingJob.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.Status; import org.jkiss.dbeaver.DBeaverConstants; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.runtime.AbstractJob; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.runtime.load.ILoadService; import org.jkiss.dbeaver.runtime.load.ILoadVisualizer; import org.jkiss.dbeaver.ui.UIUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java index 23d0c9f882..9f1606b1cf 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/properties/ObjectPropertyDescriptor.java @@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider; import org.jkiss.dbeaver.model.meta.IPropertyValueTransformer; import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.BeanUtils; import org.jkiss.utils.CommonUtils; import org.osgi.framework.Bundle; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/DefaultEventFilter.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/DefaultEventFilter.java index 483dcab22b..852d86be71 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/DefaultEventFilter.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/DefaultEventFilter.java @@ -21,7 +21,11 @@ package org.jkiss.dbeaver.runtime.qm; import org.jkiss.dbeaver.core.DBeaverCore; import org.jkiss.dbeaver.model.DBPPreferenceStore; import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; -import org.jkiss.dbeaver.runtime.qm.meta.*; +import org.jkiss.dbeaver.model.qm.QMConstants; +import org.jkiss.dbeaver.model.qm.QMEventFilter; +import org.jkiss.dbeaver.model.qm.QMMetaEvent; +import org.jkiss.dbeaver.model.qm.QMObjectType; +import org.jkiss.dbeaver.model.qm.meta.*; import org.jkiss.utils.CommonUtils; import java.util.ArrayList; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMControllerImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMControllerImpl.java index b61613c097..bbae78431d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMControllerImpl.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMControllerImpl.java @@ -20,7 +20,9 @@ package org.jkiss.dbeaver.runtime.qm; import org.jkiss.dbeaver.core.Log; import org.jkiss.dbeaver.model.qm.QMController; import org.jkiss.dbeaver.model.qm.QMExecutionHandler; -import org.jkiss.dbeaver.runtime.qm.meta.QMMCollector; +import org.jkiss.dbeaver.model.qm.QMMetaEvent; +import org.jkiss.dbeaver.model.qm.QMMetaListener; +import org.jkiss.dbeaver.model.qm.QMMCollector; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -37,7 +39,7 @@ public class QMControllerImpl implements QMController { static final Log log = Log.getLog(QMControllerImpl.class); private QMExecutionHandler defaultHandler; - private QMMCollector metaHandler; + private QMMCollectorImpl metaHandler; private List handlers = new ArrayList(); public QMControllerImpl() { @@ -46,7 +48,7 @@ public class QMControllerImpl implements QMController { new Class[]{ QMExecutionHandler.class }, new NotifyInvocationHandler()); - metaHandler = new QMMCollector(); + metaHandler = new QMMCollectorImpl(); registerHandler(metaHandler); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMLogFileWriter.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMLogFileWriter.java index 8ee3ab795b..57b1a8c914 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMLogFileWriter.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMLogFileWriter.java @@ -22,8 +22,12 @@ import org.jkiss.dbeaver.DBeaverConstants; import org.jkiss.dbeaver.core.DBeaverCore; import org.jkiss.dbeaver.core.Log; import org.jkiss.dbeaver.model.DBPPreferenceListener; +import org.jkiss.dbeaver.model.qm.QMConstants; +import org.jkiss.dbeaver.model.qm.QMEventFilter; +import org.jkiss.dbeaver.model.qm.QMMetaEvent; +import org.jkiss.dbeaver.model.qm.QMMetaListener; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.qm.meta.*; +import org.jkiss.dbeaver.model.qm.meta.*; import org.jkiss.dbeaver.utils.ContentUtils; import org.jkiss.dbeaver.utils.GeneralUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMCollector.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMCollectorImpl.java similarity index 93% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMCollector.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMCollectorImpl.java index 5da94959d5..6ee2a4f985 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMCollector.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMCollectorImpl.java @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.runtime.qm.meta; +package org.jkiss.dbeaver.runtime.qm; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -24,20 +24,21 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext; import org.jkiss.dbeaver.model.exec.DBCResultSet; import org.jkiss.dbeaver.model.exec.DBCSavepoint; import org.jkiss.dbeaver.model.exec.DBCStatement; +import org.jkiss.dbeaver.model.qm.QMMCollector; +import org.jkiss.dbeaver.model.qm.QMMetaEvent; +import org.jkiss.dbeaver.model.qm.QMMetaListener; +import org.jkiss.dbeaver.model.qm.meta.*; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.runtime.AbstractJob; -import org.jkiss.dbeaver.runtime.qm.DefaultExecutionHandler; -import org.jkiss.dbeaver.runtime.qm.QMMetaEvent; -import org.jkiss.dbeaver.runtime.qm.QMMetaListener; import java.util.*; /** * Query manager execution handler implementation */ -public class QMMCollector extends DefaultExecutionHandler { +public class QMMCollectorImpl extends DefaultExecutionHandler implements QMMCollector { - static final Log log = Log.getLog(QMMCollector.class); + static final Log log = Log.getLog(QMMCollectorImpl.class); private static final long EVENT_DISPATCH_PERIOD = 250; @@ -47,7 +48,7 @@ public class QMMCollector extends DefaultExecutionHandler { private final List pastEvents = new ArrayList(); private boolean running = true; - public QMMCollector() + public QMMCollectorImpl() { new EventDispatcher().schedule(EVENT_DISPATCH_PERIOD); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/ui/DBUICallback.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/ui/DBUICallback.java similarity index 94% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/ui/DBUICallback.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/ui/DBUICallback.java index 7302bee04f..786643b85b 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/ui/DBUICallback.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/ui/DBUICallback.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.model.ui; +package org.jkiss.dbeaver.runtime.ui; import org.eclipse.core.runtime.IStatus; import org.jkiss.code.NotNull; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/ui/DBUserInterface.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/ui/DBUserInterface.java similarity index 95% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/ui/DBUserInterface.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/ui/DBUserInterface.java index 5979ffb549..038eed9596 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/ui/DBUserInterface.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/ui/DBUserInterface.java @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.model.ui; +package org.jkiss.dbeaver.runtime.ui; import org.eclipse.core.runtime.IStatus; import org.jkiss.code.NotNull; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java index a2053d2dac..e6058d5e2d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java @@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.navigator.DBNModel; import org.jkiss.dbeaver.model.navigator.DBNNode; import org.jkiss.dbeaver.model.navigator.DBNProject; import org.jkiss.dbeaver.model.navigator.DBNResource; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; /** * Utils diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/ColumnsMappingDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/ColumnsMappingDialog.java index 3a38bf194b..976e41bb97 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/ColumnsMappingDialog.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/ColumnsMappingDialog.java @@ -39,7 +39,7 @@ import org.jkiss.dbeaver.model.struct.DBSDataType; import org.jkiss.dbeaver.model.struct.DBSEntity; import org.jkiss.dbeaver.model.struct.DBSEntityAttribute; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferWizard; import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.dbeaver.ui.SharedTextColors; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseConsumerPageMapping.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseConsumerPageMapping.java index 08c351c9bf..2f811f948d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseConsumerPageMapping.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseConsumerPageMapping.java @@ -42,7 +42,7 @@ import org.jkiss.dbeaver.model.navigator.DBNModel; import org.jkiss.dbeaver.model.navigator.DBNNode; import org.jkiss.dbeaver.model.navigator.DBNProject; import org.jkiss.dbeaver.model.struct.*; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferPipe; import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferWizard; import org.jkiss.dbeaver.ui.DBeaverIcons; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseMappingContainer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseMappingContainer.java index 32a9d39b6a..7eb8e6ec88 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseMappingContainer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseMappingContainer.java @@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress; import org.jkiss.dbeaver.model.struct.*; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.DBIcon; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java index a23fd9c4da..c10bba433e 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java @@ -31,10 +31,10 @@ import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.exec.*; import org.jkiss.dbeaver.model.qm.QMUtils; import org.jkiss.dbeaver.runtime.qm.DefaultExecutionHandler; -import org.jkiss.dbeaver.runtime.qm.meta.QMMSessionInfo; -import org.jkiss.dbeaver.runtime.qm.meta.QMMStatementExecuteInfo; -import org.jkiss.dbeaver.runtime.qm.meta.QMMTransactionInfo; -import org.jkiss.dbeaver.runtime.qm.meta.QMMTransactionSavepointInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMSessionInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMStatementExecuteInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMTransactionInfo; +import org.jkiss.dbeaver.model.qm.meta.QMMTransactionSavepointInfo; import org.jkiss.dbeaver.ui.ActionUtils; import org.jkiss.dbeaver.ui.ICommandIds; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java index bb11689a27..5cbb9fcbd6 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java @@ -34,7 +34,7 @@ import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration; import org.jkiss.dbeaver.model.runtime.DBRProcessListener; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer; -import org.jkiss.dbeaver.model.ui.DBUserInterface; +import org.jkiss.dbeaver.runtime.ui.DBUserInterface; import org.jkiss.dbeaver.registry.DataSourceDescriptor; import org.jkiss.dbeaver.runtime.jobs.ConnectJob; import org.jkiss.dbeaver.ui.actions.DataSourceHandler; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectRename.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectRename.java index 3e7d119270..a5629b27ad 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectRename.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectRename.java @@ -31,7 +31,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode; import org.jkiss.dbeaver.model.navigator.DBNNode; import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.dialogs.EnterNameDialog; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ObjectViewerRenderer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ObjectViewerRenderer.java index b08196349b..ba7b714841 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ObjectViewerRenderer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ObjectViewerRenderer.java @@ -27,9 +27,9 @@ import org.eclipse.swt.graphics.*; import org.eclipse.swt.widgets.*; import org.jkiss.code.Nullable; import org.jkiss.dbeaver.model.DBPNamedObject; -import org.jkiss.dbeaver.runtime.RuntimeUtils; import org.jkiss.dbeaver.ui.ImageUtils; import org.jkiss.dbeaver.ui.UIUtils; +import org.jkiss.dbeaver.utils.GeneralUtils; import java.text.Collator; @@ -324,7 +324,7 @@ public abstract class ObjectViewerRenderer { if (value instanceof DBPNamedObject) { value = ((DBPNamedObject)value).getName(); } - return RuntimeUtils.makeDisplayString(value).toString(); + return GeneralUtils.makeDisplayString(value).toString(); } private class MouseListener extends MouseAdapter { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/NodeListControl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/NodeListControl.java index 93e083c1b2..c4a24365b9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/NodeListControl.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/NodeListControl.java @@ -41,7 +41,7 @@ import org.jkiss.dbeaver.model.struct.DBSWrapper; import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry; import org.jkiss.dbeaver.registry.tree.DBXTreeFolder; import org.jkiss.dbeaver.registry.tree.DBXTreeNode; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.INavigatorModelView; import org.jkiss.dbeaver.ui.NavigatorUtils; import org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerObjectOpen; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ObjectListControl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ObjectListControl.java index 4052e76268..dcf12701ef 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ObjectListControl.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ObjectListControl.java @@ -37,13 +37,13 @@ import org.jkiss.dbeaver.model.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.IDataSourceContainerProvider; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.runtime.AbstractJob; -import org.jkiss.dbeaver.runtime.RuntimeUtils; import org.jkiss.dbeaver.runtime.load.jobs.LoadingJob; import org.jkiss.dbeaver.runtime.properties.*; import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.ObjectViewerRenderer; import org.jkiss.dbeaver.ui.controls.ProgressPageControl; +import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.ArrayUtils; import org.jkiss.utils.CommonUtils; @@ -991,7 +991,7 @@ public abstract class ObjectListControl extends ProgressPageControl lazyCache.put(element, objectCache); } } - String objectName = RuntimeUtils.makeDisplayString(getObjectValue(element)).toString(); + String objectName = GeneralUtils.makeDisplayString(getObjectValue(element)).toString(); monitor.subTask(NLS.bind(CoreMessages.controls_object_list_monitor_load_props, objectName)); for (ObjectColumn column : entry.getValue()) { if (monitor.isCanceled() || isDisposed()) { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/querylog/QueryLogViewer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/querylog/QueryLogViewer.java index 64a0b3061a..1aa49d95f6 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/querylog/QueryLogViewer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/querylog/QueryLogViewer.java @@ -51,11 +51,11 @@ import org.jkiss.dbeaver.core.DBeaverUI; import org.jkiss.dbeaver.model.DBPPreferenceListener; import org.jkiss.dbeaver.model.DBPPreferenceStore; import org.jkiss.dbeaver.model.exec.DBCExecutionContext; -import org.jkiss.dbeaver.model.qm.QMUtils; +import org.jkiss.dbeaver.model.qm.*; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer; import org.jkiss.dbeaver.runtime.qm.*; -import org.jkiss.dbeaver.runtime.qm.meta.*; +import org.jkiss.dbeaver.model.qm.meta.*; import org.jkiss.dbeaver.ui.AbstractUIJob; import org.jkiss.dbeaver.ui.ICommandIds; import org.jkiss.dbeaver.ui.TableToolTip; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/CollectionElementData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/CollectionElementData.java index e388d5bbd6..c149557717 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/CollectionElementData.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/CollectionElementData.java @@ -24,9 +24,8 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBindingElement; import org.jkiss.dbeaver.model.data.DBDCollection; import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; import org.jkiss.dbeaver.model.exec.DBCSession; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java index d0be3eae31..b0f2552af9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java @@ -40,7 +40,7 @@ import org.jkiss.dbeaver.model.struct.rdb.DBSTable; import org.jkiss.dbeaver.model.struct.rdb.DBSTableIndex; import org.jkiss.dbeaver.model.virtual.DBVEntity; import org.jkiss.dbeaver.model.virtual.DBVEntityConstraint; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import java.util.*; 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 2d32ab5bb9..02f86712f2 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 @@ -64,7 +64,7 @@ import org.jkiss.dbeaver.model.virtual.DBVConstants; import org.jkiss.dbeaver.model.virtual.DBVEntityConstraint; import org.jkiss.dbeaver.runtime.RunnableWithResult; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.tools.transfer.IDataTransferProducer; import org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer; import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferWizard; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ValidateUniqueKeyUsageDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ValidateUniqueKeyUsageDialog.java index 04e9e751cb..8e01d5ae7c 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ValidateUniqueKeyUsageDialog.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ValidateUniqueKeyUsageDialog.java @@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.data.DBDRowIdentifier; import org.jkiss.dbeaver.model.exec.DBCExecutionContext; import org.jkiss.dbeaver.model.struct.DBSEntityAttribute; import org.jkiss.dbeaver.model.virtual.DBVEntityConstraint; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/editors/ContentInlineEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/editors/ContentInlineEditor.java index c9443a2540..c2a85c0b5f 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/editors/ContentInlineEditor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/editors/ContentInlineEditor.java @@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.data.DBDContentCached; import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.model.impl.BytesContentStorage; import org.jkiss.dbeaver.model.impl.StringContentStorage; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.utils.ContentUtils; import org.jkiss.dbeaver.utils.GeneralUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/BaseValueManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/BaseValueManager.java index 37259735e1..8d2a7c9fcc 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/BaseValueManager.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/BaseValueManager.java @@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.exec.DBCException; import org.jkiss.dbeaver.model.exec.DBCExecutionContext; import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; import org.jkiss.dbeaver.model.exec.DBCSession; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.ui.data.IValueManager; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/TextViewDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/TextViewDialog.java index 31b28b2d5e..7893859604 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/TextViewDialog.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/TextViewDialog.java @@ -39,7 +39,7 @@ import org.jkiss.dbeaver.model.data.DBDDisplayFormat; import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; import org.jkiss.dbeaver.model.exec.DBCSession; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.DBIcon; import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.dbeaver.ui.UIUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/ValueViewDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/ValueViewDialog.java index 7066969065..429e912a4d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/ValueViewDialog.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/ValueViewDialog.java @@ -53,7 +53,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress; import org.jkiss.dbeaver.model.struct.*; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.runtime.jobs.DataSourceJob; import org.jkiss.dbeaver.model.DBIcon; import org.jkiss.dbeaver.ui.DBeaverIcons; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/struct/EditConstraintDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/struct/EditConstraintDialog.java index 8a4f90ddf1..5af6e3fa5d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/struct/EditConstraintDialog.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/struct/EditConstraintDialog.java @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Shell; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.core.CoreMessages; import org.jkiss.dbeaver.model.struct.*; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.utils.ArrayUtils; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/struct/EditForeignKeyDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/struct/EditForeignKeyDialog.java index bd3fdc01ee..b2292bf36d 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/struct/EditForeignKeyDialog.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/struct/EditForeignKeyDialog.java @@ -49,7 +49,7 @@ import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyModifyRule; import org.jkiss.dbeaver.model.struct.rdb.DBSTable; import org.jkiss.dbeaver.model.struct.rdb.DBSTableColumn; import org.jkiss.dbeaver.model.struct.rdb.DBSTableConstraint; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.itemlist.ItemListControl; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditor.java index dfe1816cd1..7067512890 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditor.java @@ -37,7 +37,7 @@ import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.ui.data.IValueEditorStandalone; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.ColumnInfoPanel; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java index 3a285450df..32689e03fd 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java @@ -42,7 +42,7 @@ import org.jkiss.dbeaver.registry.editor.EntityEditorDescriptor; import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry; import org.jkiss.dbeaver.registry.tree.DBXTreeItem; import org.jkiss.dbeaver.registry.tree.DBXTreeNode; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.runtime.properties.PropertiesContributor; import org.jkiss.dbeaver.ui.*; import org.jkiss.dbeaver.ui.controls.ObjectEditorPageControl; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/log/SQLLogFilter.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/log/SQLLogFilter.java index 590e181da3..78bed7b7c5 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/log/SQLLogFilter.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/log/SQLLogFilter.java @@ -20,9 +20,9 @@ package org.jkiss.dbeaver.ui.editors.sql.log; import org.jkiss.dbeaver.model.exec.DBCExecutionContext; import org.jkiss.dbeaver.model.exec.DBCStatement; import org.jkiss.dbeaver.model.sql.SQLQuery; -import org.jkiss.dbeaver.runtime.qm.QMEventFilter; -import org.jkiss.dbeaver.runtime.qm.QMMetaEvent; -import org.jkiss.dbeaver.runtime.qm.meta.*; +import org.jkiss.dbeaver.model.qm.QMEventFilter; +import org.jkiss.dbeaver.model.qm.QMMetaEvent; +import org.jkiss.dbeaver.model.qm.meta.*; import org.jkiss.dbeaver.ui.editors.sql.SQLEditor; /** diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageQueryManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageQueryManager.java index 8a66bba6cd..54e0c8ab51 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageQueryManager.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageQueryManager.java @@ -33,8 +33,8 @@ import org.jkiss.dbeaver.core.DBeaverCore; import org.jkiss.dbeaver.model.DBPPreferenceStore; import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.qm.QMConstants; -import org.jkiss.dbeaver.runtime.qm.QMObjectType; +import org.jkiss.dbeaver.model.qm.QMConstants; +import org.jkiss.dbeaver.model.qm.QMObjectType; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/PropertyTreeViewer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/PropertyTreeViewer.java index 1f6d649d9f..e15a9ae5c1 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/PropertyTreeViewer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/PropertyTreeViewer.java @@ -37,13 +37,13 @@ import org.jkiss.dbeaver.model.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.DBPPropertySource; import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode; import org.jkiss.dbeaver.model.struct.DBSObject; -import org.jkiss.dbeaver.runtime.RuntimeUtils; import org.jkiss.dbeaver.runtime.properties.IPropertySourceEditable; import org.jkiss.dbeaver.runtime.properties.PropertyCollector; import org.jkiss.dbeaver.runtime.properties.PropertySourceCollection; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerObjectOpen; import org.jkiss.dbeaver.ui.controls.ObjectViewerRenderer; +import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.BeanUtils; import org.jkiss.utils.CommonUtils; @@ -538,7 +538,7 @@ public class PropertyTreeViewer extends TreeViewer { return prop.category; } else { final Object propertyValue = prop.propertySource.getPropertyValue(prop.property.getId()); - return RuntimeUtils.makeDisplayString(propertyValue); + return GeneralUtils.makeDisplayString(propertyValue); } } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/data/SearchDataQuery.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/data/SearchDataQuery.java index e3e21fa0f1..ee52ba9899 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/data/SearchDataQuery.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/data/SearchDataQuery.java @@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataContainer; import org.jkiss.dbeaver.model.struct.DBSEntity; import org.jkiss.dbeaver.model.struct.DBSEntityAttribute; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.search.IObjectSearchListener; import org.jkiss.dbeaver.ui.search.IObjectSearchQuery; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/CheckboxTreeManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/CheckboxTreeManager.java index d7baa21c52..00e6365752 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/CheckboxTreeManager.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/CheckboxTreeManager.java @@ -21,7 +21,6 @@ import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.swt.widgets.Widget; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.core.DBeaverUI; import org.jkiss.dbeaver.model.navigator.DBNDataSource; @@ -29,7 +28,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode; 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.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.utils.ArrayUtils; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorContentProvider.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorContentProvider.java index 7962ab54ff..40427db1e1 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorContentProvider.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorContentProvider.java @@ -25,7 +25,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.widgets.Display; import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode; import org.jkiss.dbeaver.model.navigator.DBNNode; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.views.navigator.database.load.TreeLoadNode; import org.jkiss.dbeaver.ui.views.navigator.database.load.TreeLoadService; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/utils/GeneralUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/utils/GeneralUtils.java index 0a04295a2e..024ba365e1 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/utils/GeneralUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/utils/GeneralUtils.java @@ -33,7 +33,9 @@ import java.io.Writer; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.charset.Charset; +import java.text.NumberFormat; import java.text.ParseException; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -203,4 +205,37 @@ public class GeneralUtils { } return Double.valueOf(text); } + + public static Object makeDisplayString(Object object) + { + if (object == null) { + return ""; //$NON-NLS-1$ + } + if (object instanceof Number) { + return NumberFormat.getInstance().format(object); + } + Class eClass = object.getClass(); + if (eClass.isArray()) { + if (eClass == byte[].class) + return Arrays.toString((byte[]) object); + else if (eClass == short[].class) + return Arrays.toString((short[]) object); + else if (eClass == int[].class) + return Arrays.toString((int[]) object); + else if (eClass == long[].class) + return Arrays.toString((long[]) object); + else if (eClass == char[].class) + return Arrays.toString((char[]) object); + else if (eClass == float[].class) + return Arrays.toString((float[]) object); + else if (eClass == double[].class) + return Arrays.toString((double[]) object); + else if (eClass == boolean[].class) + return Arrays.toString((boolean[]) object); + else { // element is an array of object references + return Arrays.deepToString((Object[]) object); + } + } + return object; + } } diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/DB2Utils.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/DB2Utils.java index 99a4101a35..d7addf1879 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/DB2Utils.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/DB2Utils.java @@ -49,7 +49,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.sql.SQLUtils; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import java.sql.Clob; import java.sql.SQLException; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableManager.java index f7d70d3718..a4de198ab9 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableManager.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableManager.java @@ -33,7 +33,7 @@ import org.jkiss.dbeaver.model.edit.DBEObjectRenamer; import org.jkiss.dbeaver.model.impl.DBSObjectCache; import org.jkiss.dbeaver.model.impl.edit.SQLDatabasePersistAction; import org.jkiss.dbeaver.model.impl.sql.edit.struct.SQLTableManager; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java index bc58f3f6fe..ee1e6ee2e3 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataSource.java @@ -65,7 +65,7 @@ import org.jkiss.dbeaver.model.struct.DBSObject; import org.jkiss.dbeaver.model.struct.DBSObjectSelector; import org.jkiss.dbeaver.model.struct.DBSStructureAssistant; import org.jkiss.dbeaver.runtime.RunnableWithResult; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.ui.UIUtils; import java.sql.SQLException; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataType.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataType.java index 921477413e..f121d9cce1 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataType.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2DataType.java @@ -36,7 +36,7 @@ import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataType; import org.jkiss.dbeaver.model.struct.DBSObject; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import com.ibm.db2.jcc.DB2Types; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Package.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Package.java index ef74226d71..920235f0d6 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Package.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Package.java @@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectSimpleCache; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import java.sql.Date; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TablePartition.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TablePartition.java index 61b336bbe2..f2a5c4732c 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TablePartition.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2TablePartition.java @@ -26,7 +26,7 @@ import org.jkiss.dbeaver.ext.db2.model.dict.DB2TablePartitionStatus; import org.jkiss.dbeaver.ext.db2.model.dict.DB2YesNo; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import java.sql.Date; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Tablespace.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Tablespace.java index 7634f9694a..ecd193e4ba 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Tablespace.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Tablespace.java @@ -33,7 +33,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import java.sql.ResultSet; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Variable.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Variable.java index 0c3fe0a759..0090e51acb 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Variable.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/DB2Variable.java @@ -27,7 +27,7 @@ import org.jkiss.dbeaver.ext.db2.model.module.DB2Module; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.struct.DBSObject; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import java.sql.ResultSet; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServer.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServer.java index 26c3648f4c..7adca5df24 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServer.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2RemoteServer.java @@ -27,7 +27,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import java.sql.ResultSet; import java.util.Collection; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2UserMapping.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2UserMapping.java index de1743c235..ddf10c19db 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2UserMapping.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/fed/DB2UserMapping.java @@ -23,7 +23,7 @@ import org.jkiss.dbeaver.ext.db2.model.DB2DataSource; import org.jkiss.dbeaver.ext.db2.model.DB2GlobalObject; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import java.sql.ResultSet; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2Role.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2Role.java index 4a367d4515..986f3b4053 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2Role.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2Role.java @@ -31,7 +31,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectSimpleCache; import org.jkiss.dbeaver.model.meta.Association; import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import java.sql.ResultSet; import java.sql.Timestamp; diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2RoleDep.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2RoleDep.java index 97a26e09b0..339e1f02f7 100644 --- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2RoleDep.java +++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/security/DB2RoleDep.java @@ -24,7 +24,7 @@ import org.jkiss.dbeaver.ext.db2.model.dict.DB2YesNo; import org.jkiss.dbeaver.model.access.DBAPrivilege; import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.meta.Property; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import java.sql.ResultSet; diff --git a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/model/DiagramLoader.java b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/model/DiagramLoader.java index 2d5fcbc68c..e175e7cd3c 100644 --- a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/model/DiagramLoader.java +++ b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/model/DiagramLoader.java @@ -42,7 +42,7 @@ import org.jkiss.dbeaver.model.struct.*; import org.jkiss.dbeaver.registry.DataSourceDescriptor; import org.jkiss.dbeaver.registry.DataSourceRegistry; import org.jkiss.dbeaver.runtime.RuntimeUtils; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.CommonUtils; import org.jkiss.utils.xml.XMLBuilder; diff --git a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/part/AssociationPart.java b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/part/AssociationPart.java index 8e03105cb3..c302d24db8 100644 --- a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/part/AssociationPart.java +++ b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/part/AssociationPart.java @@ -40,7 +40,7 @@ import org.jkiss.dbeaver.model.struct.DBSEntityAssociation; import org.jkiss.dbeaver.model.struct.DBSEntityAttribute; import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType; import org.jkiss.dbeaver.model.struct.DBSEntityReferrer; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.dbeaver.model.DBIcon; import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataSource.java b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataSource.java index 505b9baf2d..d2c7a00aa8 100644 --- a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataSource.java +++ b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericDataSource.java @@ -41,7 +41,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.cache.JDBCObjectCache; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.sql.SQLDialect; import org.jkiss.dbeaver.model.struct.*; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; import org.jkiss.utils.CommonUtils; import java.sql.Driver; diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableManager.java index 5e656c6f0c..e52c7d2d9c 100644 --- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableManager.java +++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableManager.java @@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.exec.DBCException; import org.jkiss.dbeaver.model.impl.DBSObjectCache; import org.jkiss.dbeaver.model.impl.edit.SQLDatabasePersistAction; import org.jkiss.dbeaver.model.impl.sql.edit.struct.SQLTableManager; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; /** * MySQL table manager diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableForeignKeyColumn.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableForeignKeyColumn.java index 85a3963b2f..9a7dee8570 100644 --- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableForeignKeyColumn.java +++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableForeignKeyColumn.java @@ -19,7 +19,7 @@ package org.jkiss.dbeaver.ext.oracle.model; import org.jkiss.dbeaver.model.meta.Property; import org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKeyColumn; -import org.jkiss.dbeaver.runtime.VoidProgressMonitor; +import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor; /** * GenericConstraintColumn -- GitLab