From ac4841e815336753701390eef808031b78fa4d55 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 7 Sep 2022 09:37:17 +0200
Subject: [PATCH] dbeaver/dbeaver-ee#1905 Driver controller model, use config
 controllers to load/save drivers

---
 .../io/cloudbeaver/server/WebPlatformActivator.java    | 10 ----------
 .../src/io/cloudbeaver/server/CBPlatform.java          |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
index d883272519..e3c97cb7cf 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
@@ -72,16 +72,6 @@ public class WebPlatformActivator extends Plugin {
         super.stop(context);
     }
 
-    /**
-     * Returns configuration file
-     */
-    public static synchronized File getConfigurationFile(String fileName) {
-        if (configDir == null) {
-            configDir = getInstance().getStateLocation().toFile();
-        }
-        return new File(configDir, fileName);
-    }
-
     public DBPPreferenceStore getPreferences() {
         return preferences;
     }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
index da00499683..e64aed6c67 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
@@ -21,6 +21,7 @@ import io.cloudbeaver.registry.WebDriverRegistry;
 import io.cloudbeaver.service.session.WebSessionManager;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -268,10 +269,9 @@ public class CBPlatform extends BasePlatformImpl {
         return folder.toFile();
     }
 
-    @NotNull
     @Override
-    public File getConfigurationFile(String fileName) {
-        return WebPlatformActivator.getConfigurationFile(fileName);
+    protected Plugin getProductPlugin() {
+        return WebPlatformActivator.getInstance();
     }
 
     @Override