QM model refactoring

Former-commit-id: 81629fb6

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;
 

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,

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;

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;

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();

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;

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;
 

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;

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;
 
 /**

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;
 
 /**

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;
 

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;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMConstants.java → 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

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;
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMEventFilter.java → 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

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/qm/QMMCollector.java

+/*
+ * 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);
+}

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMetaEvent.java → 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

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMMetaListener.java → 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;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/QMObjectType.java → 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;

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;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMObject.java → 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();

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMSessionInfo.java → 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<DBCExecutionContext>(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) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMStatementExecuteInfo.java → 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;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMStatementInfo.java → 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();
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMTransactionInfo.java → 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;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMTransactionSavepointInfo.java → 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;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/VoidProgressMonitor.java → 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

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

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;

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;

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;

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 {

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;

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;

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;

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<QMExecutionHandler> handlers = new ArrayList<QMExecutionHandler>();
 
     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);
     }
 

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;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/qm/meta/QMMCollector.java → 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<QMMetaEvent> pastEvents = new ArrayList<QMMetaEvent>();
     private boolean running = true;
 
-    public QMMCollector()
+    public QMMCollectorImpl()
     {
         new EventDispatcher().schedule(EVENT_DISPATCH_PERIOD);
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/ui/DBUICallback.java → 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;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/ui/DBUserInterface.java → 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;

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

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;

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;

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;

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;
 

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;

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;

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 {

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;

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<OBJECT_TYPE> 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()) {

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;

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;
 

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.*;

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;
 
 /**

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;
 

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);
         }
     }
 

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;
 

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;

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;

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;
+    }
 }

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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

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