From 076a7acb7e84201c9691d54368092062d075eb9e Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Wed, 29 Apr 2026 14:42:34 +0200 Subject: [PATCH 1/2] Sxxx: Add Short text column --- .../feature/table/pt1/sxxx/SxxxColumns.java | 17 ++++-- .../table/pt1/sxxx/SxxxTransformator.java | 57 +++++++++++------- .../table/internal/TableServiceImpl.java | 2 +- .../data/export/excel/sxxx_vorlage.xlsx | Bin 21381 -> 21467 bytes .../extensions/FootnoteExtensions.java | 7 ++- 5 files changed, 51 insertions(+), 32 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java index 0b7e31e7da..8d604585cc 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java @@ -16,17 +16,22 @@ @SuppressWarnings("nls") public class SxxxColumns { /** - * A: Inhalt Bearbeitungsvermerk + * A: Bearbeitungsvermerk.Kurztext */ - public static final String Text_Content = "A"; + public static final String Kurztext_Content = "A"; /** - * B: Referenziert von Objekt + * B: Inhalt Bearbeitungsvermerk */ - public static final String Reference_Object = "B"; + public static final String Text_Content = "B"; /** - * C: Ausgabe in Plan + * C: Referenziert von Objekt */ - public static final String Visualation_In_Table = "C"; + public static final String Reference_Object = "C"; + + /** + * D: Ausgabe in Plan + */ + public static final String Visualation_In_Table = "D"; } diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java index dcf69ed955..5b7a71ab85 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java @@ -10,6 +10,7 @@ */ package org.eclipse.set.feature.table.pt1.sxxx; +import static org.eclipse.set.feature.table.pt1.sxxx.SxxxColumns.*; import static org.eclipse.set.ppmodel.extensions.EObjectExtensions.getNullableObject; import java.util.List; @@ -31,6 +32,7 @@ import org.eclipse.set.model.tablemodel.ColumnDescriptor; import org.eclipse.set.model.tablemodel.Table; import org.eclipse.set.model.tablemodel.TableRow; +import org.eclipse.set.model.tablemodel.extensions.CellContentExtensions; import org.eclipse.set.ppmodel.extensions.AussenelementansteuerungExtensions; import org.eclipse.set.ppmodel.extensions.EObjectExtensions; import org.eclipse.set.ppmodel.extensions.UrObjectExtensions; @@ -90,7 +92,7 @@ public Table transformTableContent( .isSonstigeEnumWert(basisAttribut)) .toList(); - if (sonstigeEnumReferee.size() > 0 + if (!sonstigeEnumReferee.isEmpty() && referencedByList.size() == sonstigeEnumReferee.size()) { // bearbeitungsvermerke that are only used at sonstige enum // values shall not be displayed at all @@ -99,14 +101,7 @@ public Table transformTableContent( if (referencedByList.isEmpty()) { final TableRow row = rowGroup.newTableRow(); - // A: Bearbeitungsvermerke inhalt - fill(row, getColumn(cols, SxxxColumns.Text_Content), bv, - note -> EObjectExtensions - .getNullableObject(note, - e -> e.getBearbeitungsvermerkAllg() - .getKommentar() - .getWert()) - .orElse("")); //$NON-NLS-1$ + fillBearbeitungsvermerkContent(row, bv); continue; } for (final EObject referencedBy : referencedByList) { @@ -121,25 +116,43 @@ public Table transformTableContent( final TableRow row = rowGroup.newTableRow(); row.setRowObject(referencedBy); - // A: Bearbeitungsvermerke inhalt - fill(row, getColumn(cols, SxxxColumns.Text_Content), bv, - note -> EObjectExtensions - .getNullableObject(note, - e -> e.getBearbeitungsvermerkAllg() - .getKommentar() - .getWert()) - .orElse("")); //$NON-NLS-1$ - - // B: Referenziert von Objects - fill(row, getColumn(cols, SxxxColumns.Reference_Object), bv, + fillBearbeitungsvermerkContent(row, bv); + + // C: Referenziert von Objects + fill(row, getColumn(cols, Reference_Object), bv, note -> getReferenceObjDesignation(referencedBy)); - // C: Ausgabe in Plan - // Will fill in TableService + // D: Ausgabe in Plan + // Will fill later in TableService + fill(row, getColumn(cols, Visualation_In_Table), bv, + note -> CellContentExtensions.HOURGLASS_ICON); + } } return factory.getTable(); + + } + + private void fillBearbeitungsvermerkContent(final TableRow row, + final Bearbeitungsvermerk bv) { + // A: Bearbeitungsvermerke.Kurztext + fill(row, getColumn(cols, Kurztext_Content), bv, + note -> EObjectExtensions + .getNullableObject(note, + e -> e.getBearbeitungsvermerkAllg() + .getKurztext() + .getWert()) + .orElse("")); //$NON-NLS-1$ + + // B: Bearbeitungsvermerke inhalt + fill(row, getColumn(cols, Text_Content), bv, + note -> EObjectExtensions + .getNullableObject(note, + e -> e.getBearbeitungsvermerkAllg() + .getKommentar() + .getWert()) + .orElse("")); //$NON-NLS-1$ } @SuppressWarnings("nls") 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 fb765d5179..1188316ee6 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 @@ -471,7 +471,7 @@ private void storageFootnotes(final ToolboxFileRole sessionRole, && !footnotesPerTable .containsKey(createKeyValue.apply(table))) .toList(); - FootnoteExtensions.fillSxxxTableColumnC(resultTable, + FootnoteExtensions.fillSxxxTableColumnD(resultTable, footnotesPerTable, missingTables.isEmpty(), extractShortName); return; diff --git a/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sxxx_vorlage.xlsx b/java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sxxx_vorlage.xlsx index f90776ea2c3eb9f4f6b256222ce00cd5140ce707..c6541c25ced3d7c737095c78379d8e8292b0070e 100644 GIT binary patch delta 5500 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 rH>iROY2uBm{y|LC$N-q00N#xHAJ getNotesInTable(final Table table) { * @param extractTableShortName * extract table name form footnotesPerTable key value */ - public static void fillSxxxTableColumnC(final Table sxxxTable, + public static void fillSxxxTableColumnD(final Table sxxxTable, final Map> footnotesPerTable, final boolean allTablesGenerated, final UnaryOperator extractTableShortName) { @@ -193,12 +193,13 @@ public static void fillSxxxTableColumnC(final Table sxxxTable, } private static void fillValue(final TableRow row, final String value) { - final CellContent content = row.getCells().get(2).getContent(); + // IMPROVE: the get row cell is hard code + final CellContent content = row.getCells().get(3).getContent(); if (content == null) { final StringCellContent cellContent = TablemodelFactory.eINSTANCE .createStringCellContent(); cellContent.getValue().add(value); - row.getCells().get(2).setContent(cellContent); + row.getCells().get(3).setContent(cellContent); } else if (content instanceof final StringCellContent stringCellContent) { stringCellContent.getValue().add(value); stringCellContent.getValue().removeIf(String::isEmpty); From bd0ff376b3eb8df0f2fc2ded63dc50d16838eb5e Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Wed, 29 Apr 2026 14:45:54 +0200 Subject: [PATCH 2/2] Fix --- .../eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java index 5b7a71ab85..62c168c449 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java @@ -32,7 +32,6 @@ import org.eclipse.set.model.tablemodel.ColumnDescriptor; import org.eclipse.set.model.tablemodel.Table; import org.eclipse.set.model.tablemodel.TableRow; -import org.eclipse.set.model.tablemodel.extensions.CellContentExtensions; import org.eclipse.set.ppmodel.extensions.AussenelementansteuerungExtensions; import org.eclipse.set.ppmodel.extensions.EObjectExtensions; import org.eclipse.set.ppmodel.extensions.UrObjectExtensions; @@ -124,8 +123,6 @@ public Table transformTableContent( // D: Ausgabe in Plan // Will fill later in TableService - fill(row, getColumn(cols, Visualation_In_Table), bv, - note -> CellContentExtensions.HOURGLASS_ICON); } }