From 2da5dd8cf1eb88244a675a3f2c782483c401d014 Mon Sep 17 00:00:00 2001 From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com> Date: Thu, 5 Feb 2026 21:04:34 +0700 Subject: [PATCH 1/2] Fix clear map by null object --- .../feature/table/internal/TableServiceContextFunction.java | 3 --- .../set/feature/table/internal/TableServiceImpl.java | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java index 54808b375..82b3f75f9 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java @@ -199,9 +199,6 @@ public void handleEvent(final Event event) { .getCacheService() .getCache(schnitstelle, ToolboxConstants.CacheId.DIRECTED_EDGE_TO_SUBPATH)); - if (event.getTopic().equals(Events.MODEL_CHANGED)) { - tableService.cleanWorkNotesProTable(); - } } if (event.getTopic().equals(Events.CLOSE_SESSION)) { diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java index 169463324..3ae699e25 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java @@ -183,10 +183,6 @@ void removeDiffService(final TableCompareType compareType) { } } - void cleanWorkNotesProTable() { - workNotesPerTable.clear(); - } - private Table createDiffTable(final TableInfo tableInfo, final IModelSession modelSession, final String controlAreaId) { @@ -822,9 +818,9 @@ public Set getNonTransformableTables( .collect(Collectors.toSet()); } - @SuppressWarnings("static-method") void clearInstance() { transformTableThreads.clear(); nonTransformableTables.clear(); + workNotesPerTable.clear(); } } From fd86f6a975b24d3205d23fd7b64eae67a21cf874 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 10 Mar 2026 12:54:24 +0100 Subject: [PATCH 2/2] Change variable name --- .../table/internal/TableServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java index 2b1845c31..171cd81b0 100644 --- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java +++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java @@ -287,12 +287,12 @@ private void saveTableError(final TableInfo tableInfo, final String shortName = getTableNameInfo(tableInfo).getShortName(); final String shortCut = tableInfo.shortcut(); errors.forEach(error -> error.setSource(shortName)); - getCacheService() - .getCache(modelSession.getPlanProSchnittstelle(), + getCacheService() + .getCache(modelSession.getPlanProSchnittstelle(), ToolboxConstants.CacheId.TABLE_ERRORS) .set(shortCut, errors); - broker.post(Events.TABLEERROR_CHANGED, null); - } + broker.post(Events.TABLEERROR_CHANGED, null); + } private Object loadTransform(final TableInfo tableInfo, final IModelSession modelSession) { @@ -300,7 +300,7 @@ private Object loadTransform(final TableInfo tableInfo, tableInfo); Table transformedTable = null; transformedTable = createDiffStateTable(tableInfo, modelSession); - modelService.format(transformedTable); + modelService.format(transformedTable); if (Thread.currentThread().isInterrupted() || transformedTable == null) { return MissingSupplier.MISSING_VALUE; @@ -403,7 +403,7 @@ public Table transformToTable(final TableInfo tableInfo, TablemodelFactory.eINSTANCE.createTableContent()); getModelService(tableInfo).buildHeading(emptyTable); return emptyTable; - } + } final Table resultTable = TableServiceUtils.filterRequestValue( EcoreUtil.copy(table), tableInfo, tableType, modelSession, @@ -433,8 +433,8 @@ private void storageFootnotes(final TableInfo tableInfo, .toList(); FootnoteExtensions.fillSxxxTableColumnC(resultTable, footnotesPerTable, missingTables.isEmpty()); - return; - } + return; + } final Set tableNotes = FootnoteExtensions .getNotesInTable(resultTable); @@ -684,6 +684,6 @@ public Set getNonTransformableTables( void clearInstance() { transformTableThreads.clear(); nonTransformableTables.clear(); - workNotesPerTable.clear(); + footnotesPerTable.clear(); } }