QM refactoring (remove UI interactions from QM).

UI-Core split

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverActivator.java

@@ -54,10 +54,6 @@ public class DBeaverActivator extends AbstractUIPlugin
         return instance;
     }
 
-    /*
-      * (non-Javadoc)
-      * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-      */
     @Override
     public void start(BundleContext context)
         throws Exception
@@ -65,6 +61,7 @@ public class DBeaverActivator extends AbstractUIPlugin
         super.start(context);
 
         instance = this;
+        DBeaverUI.getInstance();
 
         try {
             resourceBundle = ResourceBundle.getBundle(CoreMessages.BUNDLE_NAME);
@@ -73,14 +70,11 @@ public class DBeaverActivator extends AbstractUIPlugin
         }
     }
 
-    /*
-      * (non-Javadoc)
-      * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-      */
     @Override
     public void stop(BundleContext context)
         throws Exception
     {
+        this.shutdownUI();
         this.shutdownCore();
 
         if (debugWriter != null) {
@@ -92,6 +86,10 @@ public class DBeaverActivator extends AbstractUIPlugin
         super.stop(context);
     }
 
+    private void shutdownUI() {
+        DBeaverUI.disposeUI();
+    }
+
     public synchronized PrintStream getDebugWriter()
     {
         if (debugWriter == null) {
@@ -145,6 +143,7 @@ public class DBeaverActivator extends AbstractUIPlugin
             return key;
         }
     }
+
     /**
      * Returns the workspace instance.
      */
@@ -155,7 +154,7 @@ public class DBeaverActivator extends AbstractUIPlugin
     private void shutdownCore()
     {
         try {
-// Dispose core
+            // Dispose core
             if (DBeaverCore.instance != null) {
                 DBeaverCore.instance.dispose();
             }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java

@@ -164,8 +164,6 @@ public class DBeaverCore implements DBPApplication {
 
         this.localSystem = new OSDescriptor(Platform.getOS(), Platform.getOSArch());
 
-        DBeaverUI.getInstance();
-
         IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
 
         this.queryManager = new QMControllerImpl();
@@ -280,8 +278,6 @@ public class DBeaverCore implements DBPApplication {
             }
         }
 
-        DBeaverUI.disposeUI();
-
         DBeaverCore.instance = null;
         DBeaverCore.disposed = true;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverUI.java

@@ -29,6 +29,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.services.IDisposable;
 import org.jkiss.dbeaver.DBeaverPreferences;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
@@ -42,6 +43,9 @@ import org.jkiss.dbeaver.ui.TrayIconHandler;
 import org.osgi.framework.Bundle;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * DBeaver UI core
@@ -54,6 +58,7 @@ public class DBeaverUI {
 
     private SharedTextColors sharedTextColors;
     private TrayIconHandler trayItem;
+    private final List<IDisposable> globalDisposables = new ArrayList<IDisposable>();
 
     public static DBeaverUI getInstance()
     {
@@ -84,6 +89,17 @@ public class DBeaverUI {
         if (trayItem != null) {
             trayItem.hide();
         }
+
+        List<IDisposable> dispList = new ArrayList<IDisposable>(globalDisposables);
+        Collections.reverse(dispList);
+        for (IDisposable disp : dispList) {
+            try {
+                disp.dispose();
+            } catch (Exception e) {
+                log.error(e);
+            }
+            globalDisposables.remove(disp);
+        }
     }
 
     private void initialize()
@@ -257,4 +273,7 @@ public class DBeaverUI {
         getInstance().trayItem.notify(message, status);
     }
 
+    public void addDisposeListener(IDisposable disposable) {
+        globalDisposables.add(disposable);
+    }
 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java

@@ -21,15 +21,20 @@ import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.services.IDisposable;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.core.DBeaverCore;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.model.DBPContextProvider;
 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.*;
+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.ui.ActionUtils;
 import org.jkiss.dbeaver.ui.ICommandIds;
 
@@ -47,7 +52,14 @@ public class DataSourcePropertyTester extends PropertyTester
 
     public DataSourcePropertyTester() {
         super();
-        QMUtils.registerHandler(new QMEventsHandler());
+        final QMEventsHandler qmHandler = new QMEventsHandler();
+        QMUtils.registerHandler(qmHandler);
+        DBeaverUI.getInstance().addDisposeListener(new IDisposable() {
+            @Override
+            public void dispose() {
+                QMUtils.unregisterHandler(qmHandler);
+            }
+        });
     }
 
     @Override