#7456 Set active - do not show for active objects

Former-commit-id: 009ccc96

#7456 Set active - do not show for active objects
Former-commit-id: 009ccc96
50401cd6 · Serge Rider · 6eac4ab0 · 50401cd6
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java ...or/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java +2 -2

未找到文件。
--- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
+++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
@@ -238,8 +238,8 @@ public class NavigatorUtils {
                DBCExecutionContext defaultContext = dataSource.getDefaultInstance().getDefaultContext(new VoidProgressMonitor(), true);
                DBCExecutionContextDefaults contextDefaults = defaultContext.getContextDefaults();
                if (contextDefaults != null) {
-                    if ((selectedObject instanceof DBSCatalog && contextDefaults.supportsCatalogChange()) ||
-                        (selectedObject instanceof DBSSchema && contextDefaults.supportsSchemaChange()))
+                    if ((selectedObject instanceof DBSCatalog && contextDefaults.supportsCatalogChange() && contextDefaults.getDefaultCatalog() != selectedObject) ||
+                        (selectedObject instanceof DBSSchema && contextDefaults.supportsSchemaChange() && contextDefaults.getDefaultSchema() != selectedObject))
                    {
                        addSetActive = true;
                    }