dbeaver/pro#3336 RCP model refactoring. Remove VFS from base model

dbeaver · Sep 13, 2024 · 12e5b8a · 12e5b8a
1 parent ceefea4
commit 12e5b8a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/...r/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java b/...r/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java
@@ -20,7 +20,6 @@
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.DBPObject;
@@ -37,7 +36,6 @@
 import java.util.List;
 
 public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
-    private static final Log log = Log.getLog(DBNResourceManagerProject.class);
 
     private final RMProject project;
 
@@ -123,29 +121,29 @@ public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBE
         return this;
     }
 
-    @Override
-    public String toString() {
-        return getNodeDisplayName();
-    }
-
-
+    @NotNull
     @Override
     public DBPProject getOwnerProject() {
         List<? extends DBPProject> globalProjects = getModel().getModelProjects();
-        if (globalProjects == null) {
-            return null;
-        }
-        for (DBPProject modelProject : globalProjects) {
-            if (CommonUtils.equalObjects(modelProject.getId(), project.getId())) {
-                return modelProject;
+        if (globalProjects != null) {
+            for (DBPProject modelProject : globalProjects) {
+                if (CommonUtils.equalObjects(modelProject.getId(), project.getId())) {
+                    return modelProject;
+                }
             }
         }
-        return null;
+        throw new IllegalStateException("Project '" + project.getId() + "' not found in workspace");
     }
 
     @Nullable
     @Override
     public DBPObject getObjectDetails(@NotNull DBRProgressMonitor monitor, @NotNull SMSessionContext sessionContext, @NotNull Object dataSource) throws DBException {
         return project;
     }
+
+    @Override
+    public String toString() {
+        return getNodeDisplayName();
+    }
+
 }
diff --git a/.../bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java b/.../bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java
@@ -203,6 +203,7 @@ public DBPObject getObjectDetails(@NotNull DBRProgressMonitor monitor, @NotNull
         return resource;
     }
 
+    @NotNull
     @Override
     public DBPProject getOwnerProject() {
         return getParentNode().getOwnerProject();

diff --git a/...er/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionWorkspace.java b/...er/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionWorkspace.java
@@ -17,8 +17,10 @@
 package io.cloudbeaver.model.session;
 
 import io.cloudbeaver.WebProjectImpl;
+import org.eclipse.core.runtime.IAdaptable;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
@@ -132,6 +134,11 @@ public void dispose() {
         clearProjects();
     }
 
+    @Override
+    public DBPImage getResourceIcon(IAdaptable resourceAdapter) {
+        return null;
+    }
+
     public void setActiveProject(DBPProject activeProject) {
         this.activeProject = (WebProjectImpl) activeProject;
     }