From b91973ecfe2cb14a927870d46793a5c2560de456 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Mon, 2 Mar 2026 13:58:14 +0100 Subject: [PATCH] Fix create Multicolor compare content --- .../set/feature/table/diff/TableStateDiffService.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/diff/TableStateDiffService.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/diff/TableStateDiffService.java index c6648c7b1..66a0d3a5c 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/diff/TableStateDiffService.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/diff/TableStateDiffService.java @@ -48,15 +48,16 @@ SessionService getSessionService() { @Override CellContent createDiffContent(final TableCell oldCell, final TableCell newCell) { - if (oldCell.getContent() instanceof MultiColorCellContent) { + if (oldCell.getContent() instanceof MultiColorCellContent + || newCell != null && newCell + .getContent() instanceof MultiColorCellContent) { createMultiColorDiffCotent(oldCell, newCell); return oldCell.getContent(); } - if (!StringCellContent.class.isInstance(oldCell.getContent()) - || newCell != null && newCell.getContent() != null - && !StringCellContent.class - .isInstance(newCell.getContent())) { + if (!(oldCell.getContent() instanceof StringCellContent) + || newCell != null && newCell.getContent() != null && !(newCell + .getContent() instanceof StringCellContent)) { throw new IllegalArgumentException( "Can not create CompareStateCellContent only from StringCellContent"); //$NON-NLS-1$ }