From 3ec088014bba57803aabdf5033e856c1bc7ff2f1 Mon Sep 17 00:00:00 2001
From: ShadelessFox <yanuari.channel@gmail.com>
Date: Fri, 20 Oct 2023 16:01:54 +0200
Subject: [PATCH] dbeaver/pro#1899 New API

---
 .../service/rm/fs/RMVirtualFileSystem.java    | 22 +++++++++++--------
 .../rm/fs/RMVirtualFileSystemProvider.java    |  6 +++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java b/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java
index 871179c58c..0df8ab33fb 100644
--- a/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java
+++ b/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java
@@ -19,7 +19,7 @@
 import io.cloudbeaver.service.rm.nio.RMNIOFileSystemProvider;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.DBPImage;
+import org.jkiss.dbeaver.model.fs.DBFFileSystemProvider;
 import org.jkiss.dbeaver.model.fs.DBFVirtualFileSystem;
 import org.jkiss.dbeaver.model.fs.DBFVirtualFileSystemRoot;
 import org.jkiss.dbeaver.model.rm.RMController;
@@ -30,15 +30,24 @@
 import java.nio.file.Path;
 
 public class RMVirtualFileSystem implements DBFVirtualFileSystem {
+    private final RMVirtualFileSystemProvider provider;
+
     @NotNull
     private final RMNIOFileSystemProvider rmNioFileSystemProvider;
 
     @NotNull
     private final RMProject rmProject;
 
-    public RMVirtualFileSystem(@NotNull RMController rmController, @NotNull RMProject rmProject) {
-        this.rmNioFileSystemProvider = new RMNIOFileSystemProvider(rmController);
-        this.rmProject = rmProject;
+    public RMVirtualFileSystem(@NotNull RMVirtualFileSystemProvider provider, @NotNull RMController controller, @NotNull RMProject project) {
+        this.provider = provider;
+        this.rmNioFileSystemProvider = new RMNIOFileSystemProvider(controller);
+        this.rmProject = project;
+    }
+
+    @NotNull
+    @Override
+    public DBFFileSystemProvider getProvider() {
+        return provider;
     }
 
     @NotNull
@@ -58,11 +67,6 @@ public String getDescription() {
         return "Resource Manager file system";
     }
 
-    @Override
-    public DBPImage getIcon() {
-        return null;
-    }
-
     @NotNull
     @Override
     public String getId() {
diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystemProvider.java b/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystemProvider.java
index 33617f913a..106db905c3 100644
--- a/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystemProvider.java
+++ b/server/bundles/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystemProvider.java
@@ -27,6 +27,12 @@
 public class RMVirtualFileSystemProvider implements DBFFileSystemProvider {
     private static final Log log = Log.getLog(RMVirtualFileSystemProvider.class);
 
+    @NotNull
+    @Override
+    public String getId() {
+        return "rm-nio";
+    }
+
     @Override
     public DBFVirtualFileSystem[] getAvailableFileSystems(
         @NotNull DBRProgressMonitor monitor,