From ef8ebea2216be941e5cf036728606ef3af0c0ea4 Mon Sep 17 00:00:00 2001 From: Ilya Muradyan Date: Tue, 2 Dec 2025 21:12:48 +0100 Subject: [PATCH] KTNB-1268 Provide single source of truth for database grid properties GitOrigin-RevId: d154f6b330191b14b344d440557130da0773e00e --- .../impl/src/datagrid/GridHelperPropertyProvider.kt | 8 ++++---- grid/impl/src/datagrid/gridUtil.kt | 4 ++-- .../src/run/actions/ChangePageSizeActionGroup.kt | 2 +- .../src/run/actions/SetDefaultPageSizeAction.java | 4 ++-- platform/ide-core/api-dump.txt | 13 +++++++++++++ .../com/intellij/ide/util/PropertiesComponentEx.kt | 2 +- platform/platform-api/api-dump-unreviewed.txt | 11 ----------- platform/platform-api/api-dump.txt | 3 --- 8 files changed, 23 insertions(+), 24 deletions(-) rename platform/{platform-api => ide-core}/src/com/intellij/ide/util/PropertiesComponentEx.kt (98%) diff --git a/grid/impl/src/datagrid/GridHelperPropertyProvider.kt b/grid/impl/src/datagrid/GridHelperPropertyProvider.kt index 33e24e4ff873..c8adef2586fe 100644 --- a/grid/impl/src/datagrid/GridHelperPropertyProvider.kt +++ b/grid/impl/src/datagrid/GridHelperPropertyProvider.kt @@ -6,15 +6,15 @@ import kotlin.properties.ReadWriteProperty const val IS_INSIDE_NOTEBOOK_DEFAULT_VALUE: Boolean = true interface GridHelperPropertyProvider { - var defaultPageSizeProperty: Int - var defaultLimitPageSizeProperty: Boolean + var defaultPageSize: Int + var defaultLimitPageSize: Boolean } open class GridHelperPropertyProviderImpl( private val isInsideNotebook: Boolean = IS_INSIDE_NOTEBOOK_DEFAULT_VALUE, ): GridHelperPropertyProvider { - override var defaultPageSizeProperty: Int by getDefaultPageSizeProperty() - override var defaultLimitPageSizeProperty: Boolean by getDefaultLimitPageSizeProperty() + override var defaultPageSize: Int by getDefaultPageSizeProperty() + override var defaultLimitPageSize: Boolean by getDefaultLimitPageSizeProperty() protected fun getDefaultPageSizeProperty( defaultValueInsideNotebook: Int = 10, diff --git a/grid/impl/src/datagrid/gridUtil.kt b/grid/impl/src/datagrid/gridUtil.kt index 26dbb92b76d3..6413d5eb4dce 100644 --- a/grid/impl/src/datagrid/gridUtil.kt +++ b/grid/impl/src/datagrid/gridUtil.kt @@ -35,8 +35,8 @@ private fun getOuterFileEditor(grid: DataGrid?): FileEditor? { } fun setPageSize(hookUp: GridDataHookUp, helper: GridHelper) { - hookUp.pageModel.pageSize = if (helper.properties.defaultLimitPageSizeProperty) { - helper.properties.defaultPageSizeProperty + hookUp.pageModel.pageSize = if (helper.properties.defaultLimitPageSize) { + helper.properties.defaultPageSize } else { GridPagingModel.UNLIMITED_PAGE_SIZE } diff --git a/grid/impl/src/run/actions/ChangePageSizeActionGroup.kt b/grid/impl/src/run/actions/ChangePageSizeActionGroup.kt index 99a9f870db2d..70d9084bc87e 100644 --- a/grid/impl/src/run/actions/ChangePageSizeActionGroup.kt +++ b/grid/impl/src/run/actions/ChangePageSizeActionGroup.kt @@ -198,7 +198,7 @@ private fun getActionState(grid: DataGrid): ChangePageSizeActionState { enabled, pageModel.getPageSize(), showCountRowsAction, - GridHelper.get(grid).properties.defaultPageSizeProperty + GridHelper.get(grid).properties.defaultPageSize ) } diff --git a/grid/impl/src/run/actions/SetDefaultPageSizeAction.java b/grid/impl/src/run/actions/SetDefaultPageSizeAction.java index b2076be0498c..7c62f1c65864 100644 --- a/grid/impl/src/run/actions/SetDefaultPageSizeAction.java +++ b/grid/impl/src/run/actions/SetDefaultPageSizeAction.java @@ -38,7 +38,7 @@ public class SetDefaultPageSizeAction extends DumbAwareAction { int pageSize = grid.getDataHookup().getPageModel().getPageSize(); GridHelper helper = GridHelper.get(grid); - helper.getProperties().setDefaultPageSizeProperty(pageSize); - helper.getProperties().setDefaultLimitPageSizeProperty(!GridUtilCore.isPageSizeUnlimited(pageSize)); + helper.getProperties().setDefaultPageSize(pageSize); + helper.getProperties().setDefaultLimitPageSize(!GridUtilCore.isPageSizeUnlimited(pageSize)); } } diff --git a/platform/ide-core/api-dump.txt b/platform/ide-core/api-dump.txt index d194ce350df9..cb3a519d2e46 100644 --- a/platform/ide-core/api-dump.txt +++ b/platform/ide-core/api-dump.txt @@ -106,6 +106,19 @@ com.intellij.ide.dnd.DropActionHandler com.intellij.ide.highlighter.FileTypeRegistrar - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName - a:initFileType(com.intellij.openapi.fileTypes.FileType):V +f:com.intellij.ide.util.PropertiesComponentExKt +- sf:propComponentProperty(com.intellij.openapi.project.Project,I):kotlin.properties.ReadWriteProperty +- sf:propComponentProperty(com.intellij.openapi.project.Project,java.lang.String):kotlin.properties.ReadWriteProperty +- sf:propComponentProperty(com.intellij.openapi.project.Project,java.lang.String,I):kotlin.properties.ReadWriteProperty +- sf:propComponentProperty(com.intellij.openapi.project.Project,java.lang.String,java.lang.String):kotlin.properties.ReadWriteProperty +- sf:propComponentProperty(com.intellij.openapi.project.Project,java.lang.String,Z):kotlin.properties.ReadWriteProperty +- sf:propComponentProperty(com.intellij.openapi.project.Project,Z):kotlin.properties.ReadWriteProperty +- bs:propComponentProperty$default(com.intellij.openapi.project.Project,I,I,java.lang.Object):kotlin.properties.ReadWriteProperty +- bs:propComponentProperty$default(com.intellij.openapi.project.Project,java.lang.String,I,I,java.lang.Object):kotlin.properties.ReadWriteProperty +- bs:propComponentProperty$default(com.intellij.openapi.project.Project,java.lang.String,I,java.lang.Object):kotlin.properties.ReadWriteProperty +- bs:propComponentProperty$default(com.intellij.openapi.project.Project,java.lang.String,java.lang.String,I,java.lang.Object):kotlin.properties.ReadWriteProperty +- bs:propComponentProperty$default(com.intellij.openapi.project.Project,java.lang.String,Z,I,java.lang.Object):kotlin.properties.ReadWriteProperty +- bs:propComponentProperty$default(com.intellij.openapi.project.Project,Z,I,java.lang.Object):kotlin.properties.ReadWriteProperty com.intellij.ide.wizard.Step - a:_commit(Z):V - a:_init():V diff --git a/platform/platform-api/src/com/intellij/ide/util/PropertiesComponentEx.kt b/platform/ide-core/src/com/intellij/ide/util/PropertiesComponentEx.kt similarity index 98% rename from platform/platform-api/src/com/intellij/ide/util/PropertiesComponentEx.kt rename to platform/ide-core/src/com/intellij/ide/util/PropertiesComponentEx.kt index 736bb52afedf..bb98da8662e5 100644 --- a/platform/platform-api/src/com/intellij/ide/util/PropertiesComponentEx.kt +++ b/platform/ide-core/src/com/intellij/ide/util/PropertiesComponentEx.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.util import com.intellij.diagnostic.LoadingState diff --git a/platform/platform-api/api-dump-unreviewed.txt b/platform/platform-api/api-dump-unreviewed.txt index 84225da8dbb7..ada82b6cceb1 100644 --- a/platform/platform-api/api-dump-unreviewed.txt +++ b/platform/platform-api/api-dump-unreviewed.txt @@ -1054,17 +1054,6 @@ c:com.intellij.ide.util.DelegatingProgressIndicator - start():V - startNonCancelableSection():V - stop():V -f:com.intellij.ide.util.PropertiesComponentExKt -- sf:propComponentProperty(com.intellij.openapi.project.Project,I):kotlin.properties.ReadWriteProperty -- sf:propComponentProperty(com.intellij.openapi.project.Project,java.lang.String):kotlin.properties.ReadWriteProperty -- sf:propComponentProperty(com.intellij.openapi.project.Project,java.lang.String,java.lang.String):kotlin.properties.ReadWriteProperty -- sf:propComponentProperty(com.intellij.openapi.project.Project,java.lang.String,Z):kotlin.properties.ReadWriteProperty -- sf:propComponentProperty(com.intellij.openapi.project.Project,Z):kotlin.properties.ReadWriteProperty -- bs:propComponentProperty$default(com.intellij.openapi.project.Project,I,I,java.lang.Object):kotlin.properties.ReadWriteProperty -- bs:propComponentProperty$default(com.intellij.openapi.project.Project,java.lang.String,I,java.lang.Object):kotlin.properties.ReadWriteProperty -- bs:propComponentProperty$default(com.intellij.openapi.project.Project,java.lang.String,java.lang.String,I,java.lang.Object):kotlin.properties.ReadWriteProperty -- bs:propComponentProperty$default(com.intellij.openapi.project.Project,java.lang.String,Z,I,java.lang.Object):kotlin.properties.ReadWriteProperty -- bs:propComponentProperty$default(com.intellij.openapi.project.Project,Z,I,java.lang.Object):kotlin.properties.ReadWriteProperty c:com.intellij.ide.util.treeView.NodeRenderer - com.intellij.ui.ColoredTreeCellRenderer - ():V diff --git a/platform/platform-api/api-dump.txt b/platform/platform-api/api-dump.txt index 860649021665..f31ab4ed1f9b 100644 --- a/platform/platform-api/api-dump.txt +++ b/platform/platform-api/api-dump.txt @@ -149,9 +149,6 @@ com.intellij.ide.ui.laf.UIThemeLookAndFeelInfo - a:installTheme(javax.swing.UIDefaults):V - a:isDark():Z - a:isInitialized():Z -f:com.intellij.ide.util.PropertiesComponentExKt -- sf:propComponentProperty(com.intellij.openapi.project.Project,java.lang.String,I):kotlin.properties.ReadWriteProperty -- bs:propComponentProperty$default(com.intellij.openapi.project.Project,java.lang.String,I,I,java.lang.Object):kotlin.properties.ReadWriteProperty c:com.intellij.ide.util.treeView.NodeRenderer - p:getMinHeight():I com.intellij.ide.warmup.WarmupConfigurator