From 3a0a1346e4f03edffafb9f9191acfbb9728beee3 Mon Sep 17 00:00:00 2001 From: Anvar Ramazanov Date: Wed, 5 Mar 2025 10:44:35 +0000 Subject: [PATCH] [DBE-9310] Fixed comments after tests Merge-request: IJ-MR-156250 Merged-by: Anvar Ramazanov Merge-request: IJ-MR-156538 Merged-by: Anvar Ramazanov GitOrigin-RevId: 7354f7794e3fd7f7baf4b1d50421ff517923118f --- grid/impl/src/run/ui/RecordView.kt | 5 +++++ grid/impl/src/run/ui/grid/editors/GridCellEditorFactory.java | 4 ++-- grid/impl/src/run/ui/table/TableResultView.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/grid/impl/src/run/ui/RecordView.kt b/grid/impl/src/run/ui/RecordView.kt index 047046a5194b..3ac112f7c6c5 100644 --- a/grid/impl/src/run/ui/RecordView.kt +++ b/grid/impl/src/run/ui/RecordView.kt @@ -8,6 +8,7 @@ import com.intellij.database.run.ui.grid.editors.GridCellEditorFactoryProvider import com.intellij.database.run.ui.treetable.TreeTableResultView import com.intellij.icons.AllIcons import com.intellij.openapi.Disposable +import com.intellij.openapi.editor.EditorBundle import com.intellij.openapi.observable.util.addMouseHoverListener import com.intellij.openapi.observable.util.whenTextChangedFromUi import com.intellij.openapi.util.NlsSafe @@ -278,6 +279,10 @@ class RecordView( }) isEditable = isCellEditable(grid, rowIdx, columnInfo.idx) + + if (!isEditable) { + toolTipText = EditorBundle.message("editing.viewer.hint") + } } val label = JLabel(columnInfo.name).apply { this.icon = icon; toolTipText = tooltip diff --git a/grid/impl/src/run/ui/grid/editors/GridCellEditorFactory.java b/grid/impl/src/run/ui/grid/editors/GridCellEditorFactory.java index 171f608cf6b4..0f15dd2fa97b 100644 --- a/grid/impl/src/run/ui/grid/editors/GridCellEditorFactory.java +++ b/grid/impl/src/run/ui/grid/editors/GridCellEditorFactory.java @@ -96,8 +96,8 @@ public interface GridCellEditorFactory { @Override public @NotNull ValueFormatterResult format() { - if (myValue instanceof LobInfo) { - return new ValueFormatterResult(myValue instanceof LobInfo.ClobInfo ? ((LobInfo.ClobInfo)myValue).data : ""); + if (myValue instanceof LobInfo.ClobInfo) { + return new ValueFormatterResult(((LobInfo.ClobInfo)myValue).data); } if (myValue instanceof GeoWrapper) { return new ValueFormatterResult(((GeoWrapper)myValue).getWkt()); diff --git a/grid/impl/src/run/ui/table/TableResultView.java b/grid/impl/src/run/ui/table/TableResultView.java index daa08adf6b56..6087b958e23e 100644 --- a/grid/impl/src/run/ui/table/TableResultView.java +++ b/grid/impl/src/run/ui/table/TableResultView.java @@ -1318,7 +1318,7 @@ public final class TableResultView extends JBTableWithResizableCells private boolean shouldDisplayValueEditor(int row, int column) { var tableModel = getModel(); var cellValue = tableModel.getValueAt(row, column); - return cellValue instanceof LobInfo.ClobInfo clob && clob.isFullyReloaded(); + return (cellValue instanceof LobInfo.ClobInfo clob && clob.isFullyReloaded()) || (cellValue instanceof LobInfo.BlobInfo blob && blob.isFullyReloaded()); } private void showValueEditor(EventObject e) {