diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java index b97c43810c..7d251b5755 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java @@ -104,7 +104,9 @@ public Integer getOrdinalPosition() { @Property public String getFullyQualifiedName() { - return object instanceof DBPQualifiedObject ? ((DBPQualifiedObject) object).getFullyQualifiedName(DBPEvaluationContext.UI) : getName(); + return object instanceof DBPQualifiedObject + ? ((DBPQualifiedObject) object).getFullyQualifiedName(DBPEvaluationContext.UI) + : getName(); } @Property @@ -151,7 +153,7 @@ public String[] getFeatures() { return features.toArray(new String[0]); } - private static void getObjectFeatures(DBSObject object, List features) { + private void getObjectFeatures(DBSObject object, List features) { boolean isDiagramSupported = true; if (object instanceof DBPScriptObject) features.add(OBJECT_FEATURE_SCRIPT); if (object instanceof DBPScriptObjectExt) features.add(OBJECT_FEATURE_SCRIPT_EXTENDED); @@ -181,7 +183,7 @@ private static void getObjectFeatures(DBSObject object, List features) { features.add(OBJECT_FEATURE_OBJECT_CONTAINER); try { Class childType = objectContainer.getPrimaryChildType(null); - Collection childrenCollection = objectContainer.getChildren(null); + Collection childrenCollection = objectContainer.getChildren(session.getProgressMonitor()); if (DBSTable.class.isAssignableFrom(childType) && childrenCollection != null) { features.add(OBJECT_FEATURE_ENTITY_CONTAINER); }