mirror of
https://github.com/dbeaver/cloudbeaver.git
synced 2026-10-16 06:40:05 +08:00
dbeaver/dbeaver#23203 Optional monitor for nav API (#2687)
* dbeaver/dbeaver#23203 Optional monitor for nav API * #23203 Local cache progress monitor
This commit is contained in:
+2
-2
@@ -93,8 +93,8 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
|
||||
}
|
||||
|
||||
@Override
|
||||
public DBNResourceManagerResource[] getChildren(DBRProgressMonitor monitor) throws DBException {
|
||||
if (children == null) {
|
||||
public DBNResourceManagerResource[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
|
||||
if (children == null && !monitor.isForceCacheUsage()) {
|
||||
List<DBNResourceManagerResource> rfList = new ArrayList<>();
|
||||
for (RMResource resource : getResourceController().listResources(
|
||||
project.getId(), null, null, true, false, false)) {
|
||||
|
||||
+2
-2
@@ -110,8 +110,8 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
|
||||
}
|
||||
|
||||
@Override
|
||||
public DBNNode[] getChildren(DBRProgressMonitor monitor) throws DBException {
|
||||
if (children == null) {
|
||||
public DBNNode[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
|
||||
if (children == null && !monitor.isForceCacheUsage()) {
|
||||
List<DBNResourceManagerResource> rfList = new ArrayList<>();
|
||||
for (RMResource resource : getResourceController().listResources(
|
||||
getResourceProject().getId(), getResourceFolder(), null, true, false, false)) {
|
||||
|
||||
+3
-2
@@ -19,6 +19,7 @@ package io.cloudbeaver.model.rm;
|
||||
|
||||
import io.cloudbeaver.model.session.WebSession;
|
||||
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.DBPHiddenObject;
|
||||
@@ -81,8 +82,8 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
|
||||
}
|
||||
|
||||
@Override
|
||||
public DBNResourceManagerProject[] getChildren(DBRProgressMonitor monitor) throws DBException {
|
||||
if (projects == null) {
|
||||
public DBNResourceManagerProject[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
|
||||
if (projects == null && !monitor.isForceCacheUsage()) {
|
||||
List<? extends DBPProject> projectList = getParentNode().getModel().getModelProjects();
|
||||
if (CommonUtils.isEmpty(projectList)) {
|
||||
return new DBNResourceManagerProject[0];
|
||||
|
||||
Reference in New Issue
Block a user