Table: Implement Sxxx – Tabelle weiterer Bearbeitungsvermerke (#2160)

* Ssbv: initial

* Designation

* Ssbv: handle by open another table

* Update Object designation

* Fix

* SwtBot: add test case for Ssbv

* SWTBot disable new test and format

* Change table name

* Rename template

* Rerfresh nattable

* Active SWTBot test for Sxxx

* fix build error

* add column C and add separate rows per value in column B

* update Sxxx table

* fix nullpointer exceptions when generating tables

* fix comment for merging sxxx columns

* calculate references of worknotes per table

* update tablemodel ecore

* Update Sxxx table

* Update table reference

* update fill column c

---------

Co-authored-by: Marius Heine <m.heine@geprog.com>
Co-authored-by: eclipse-set-bot <set-bot@eclipse.org>

Author: 3 people

java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/Events.java

@@ -110,4 +110,9 @@ public interface Events {
 	 * When a subwork is selected
 	 */
 	String SUBWORK_CHANGED = "subwork/change";
+
+	/**
+	 * When a table open after Worknotes table - Sxxx
+	 */
+	String RELOAD_WORKNOTES_TABLE = "table/reload/Sxxx";
 }

java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java

@@ -97,6 +97,7 @@ public interface CacheId {
 		 * The cache id for the route and route km of the {@link Punkt_Objekt}
 		 */
 		public static final String POINT_OBJECT_ROUTE_KM = "toolbox.cache.point-object-route-km";
+
 	}
 
 	/**
@@ -292,6 +293,11 @@ public interface CacheId {
 	 */
 	public static final String ESTW_SUPPLEMENT_PART_ID_PREFIX = "org.eclipse.set.feature.table.supplement-estw";
 
+	/**
+	 * The prefix of Supplement table part
+	 */
+	public static final String SUPPLEMENT_TABLE_PART_ID_PREFIX = "org.eclipse.set.feature.table.supplement";
+
 	/**
 	 * Rounding result of BigDecimal.divide to place after comma
 	 */
@@ -357,6 +363,11 @@ public interface CacheId {
 	 */
 	public static final String TITLE_FILE_NAME_SEPARATOR = " ⇔ ";
 
+	/**
+	 * Shortcut of Worknotes table
+	 */
+	public static final String WORKNOTES_TABLE_SHORTCUT = "Sxxx"; //$NON-NLS-1$
+
 	/**
 	 * The tolerance value between TOP_Kante length and the sum of GEO_Kanten
 	 * length, which belong to this TOP_Kante (in Meter)

java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/pdf/TableToTableDocument.xtend

@@ -17,13 +17,16 @@ import javax.imageio.ImageIO
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.parsers.ParserConfigurationException
 import org.eclipse.set.basis.FreeFieldInfo
+import org.eclipse.set.basis.constants.ToolboxConstants
 import org.eclipse.set.model.tablemodel.CellContent
 import org.eclipse.set.model.tablemodel.CompareCellContent
 import org.eclipse.set.model.tablemodel.CompareFootnoteContainer
 import org.eclipse.set.model.tablemodel.CompareTableCellContent
+import org.eclipse.set.model.tablemodel.CompareTableFootnoteContainer
 import org.eclipse.set.model.tablemodel.FootnoteContainer
 import org.eclipse.set.model.tablemodel.MultiColorCellContent
 import org.eclipse.set.model.tablemodel.MultiColorContent
+import org.eclipse.set.model.tablemodel.PlanCompareRow
 import org.eclipse.set.model.tablemodel.SimpleFootnoteContainer
 import org.eclipse.set.model.tablemodel.Table
 import org.eclipse.set.model.tablemodel.TableContent
@@ -41,15 +44,12 @@ import org.w3c.dom.Document
 import org.w3c.dom.Element
 
 import static extension org.eclipse.set.model.tablemodel.extensions.CellContentExtensions.*
+import static extension org.eclipse.set.model.tablemodel.extensions.TableCellExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableContentExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableExtensions.*
-import static extension org.eclipse.set.model.tablemodel.extensions.TableCellExtensions.*
 import static extension org.eclipse.set.model.tablemodel.extensions.TableRowExtensions.*
 import static extension org.eclipse.set.utils.StringExtensions.*
 import static extension org.eclipse.set.utils.export.xsl.siteplan.SiteplanXSL.pxToMilimeter
-import org.eclipse.set.basis.constants.ToolboxConstants
-import org.eclipse.set.model.tablemodel.PlanCompareRow
-import org.eclipse.set.model.tablemodel.CompareTableFootnoteContainer
 
 /**
  * Transformation from {@link Table} to TableDocument {@link Document}.
@@ -63,7 +63,7 @@ class TableToTableDocument {
 
 	public static val String FOOTNOTE_INLINE_TEXT_SEPARATOR = String.
 		format("%n")
-	private static val String FOOTNOTE_MARK_SEPRATOR = "; "
+	static val String FOOTNOTE_MARK_SEPRATOR = "; "
 
 	val Document doc
 	var String tablename
@@ -419,13 +419,17 @@ class TableToTableDocument {
 	private dispatch def void addFootnoteContent(Element element,
 		CompareFootnoteContainer fc, int columnNumber, boolean isRemarkColumn) {
 		val separator = remarkTextInlnie ? FOOTNOTE_INLINE_TEXT_SEPARATOR : FOOTNOTE_MARK_SEPRATOR
-		val oldFootnotes = fc.oldFootnotes.map[getFootnoteInfo(fc, it)].map [
+		val oldFootnotes = fc.oldFootnotes.footnotes.map [
+			getFootnoteInfo(fc, it)
+		].map [
 			remarkTextInlnie ? toText : toShorthand
 		].iterableToString(separator)
-		val newFootnotes = fc.newFootnotes.map[getFootnoteInfo(fc, it)].map [
+		val newFootnotes = fc.newFootnotes.footnotes.map [
+			getFootnoteInfo(fc, it)
+		].map [
 			remarkTextInlnie ? toText : toShorthand
 		].iterableToString(separator)
-		val unchangedFootnotes = fc.unchangedFootnotes.map [
+		val unchangedFootnotes = fc.unchangedFootnotes.footnotes.map [
 			getFootnoteInfo(fc, it)
 		].map[remarkTextInlnie ? toText : toShorthand].
 			iterableToString(separator)
@@ -487,8 +491,9 @@ class TableToTableDocument {
 	private def Element addContentToElement(String content, Element element,
 		int columnNumber, boolean isRemarkColumn) {
 		val checkOutput = content.checkForTestOutput(columnNumber)
-		element.textContent = isRemarkColumn ? checkOutput : checkOutput.
-			intersperseWithZeroSpacesSC
+		element.textContent = isRemarkColumn
+			? checkOutput
+			: checkOutput.intersperseWithZeroSpacesSC
 		return element
 	}
 

java/bundles/org.eclipse.set.feature.table.pt1/META-INF/MANIFEST.MF

@@ -161,4 +161,6 @@ Service-Component: OSGI-INF/org.eclipse.set.feature.table.pt1.messages.Messages.
  OSGI-INF/org.eclipse.set.feature.table.pt1.sszs.SszsDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sszs.SszsTransformationService.xml,
  OSGI-INF/org.eclipse.set.feature.table.pt1.sszw.SszwDescriptionService.xml,
- OSGI-INF/org.eclipse.set.feature.table.pt1.sszw.SszwTransformationService.xml
+ OSGI-INF/org.eclipse.set.feature.table.pt1.sszw.SszwTransformationService.xml,
+ OSGI-INF/org.eclipse.set.feature.table.pt1.sxxx.SxxxDescriptionService.xml,
+ OSGI-INF/org.eclipse.set.feature.table.pt1.sxxx.SxxxTransformationService.xml

java/bundles/org.eclipse.set.feature.table.pt1/OSGI-INF/l10n/bundle.properties

@@ -184,3 +184,10 @@ ToolboxTableNameSslsShort=Ssls
 ToolboxTableNameSslsLong=Signalisierungstabelle
 ToolboxTableNameSslsPlanningNumber=??
 
+SxxxDescriptionService_ViewName=Sxxx – Tabelle weiterer Bearbeitungsvermerke
+SxxxDescriptionService_ViewTooltip=Tabelle weiterer Bearbeitungsvermerke
+SxxxTableView_Heading=Tabelle weiterer Bearbeitungsvermerke – Sxxx
+ToolboxTableNameSxxxShort=Sxxx
+ToolboxTableNameSxxxLong=Tabelle weiterer Bearbeitungsvermerke
+ToolboxTableNameSxxxPlanningNumber=??
+

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/FootnoteTransformation.xtend

@@ -68,10 +68,14 @@ class FootnoteTransformation {
 	def void transform(Basis_Objekt object, TableRow row) {
 		this.row = row
 		// Direct attachment notes
-		object?.IDBearbeitungsvermerk?.map[value]?.toSet?.forEach[addFootnote]
-		object?.referenceFootnotes?.map[value]?.toSet?.forEach[addFootnote]
+		object?.IDBearbeitungsvermerk?.map[value]?.toSet?.forEach [
+			object.addFootnote(it)
+		]
+		object?.referenceFootnotes?.map[value]?.toSet?.forEach [
+			object.addFootnote(it)
+		]
 
-		object?.transformObjectStateEnum?.value?.addFootnote
+		object?.addFootnote(object?.transformObjectStateEnum?.value)
 	}
 
 	private def dispatch Iterable<ID_Bearbeitungsvermerk_TypeClass> getReferenceFootnotes(
@@ -125,7 +129,8 @@ class FootnoteTransformation {
 		val objectStateNote = #[signalRahmen?.transformObjectStateEnum].
 			filterNull
 		val signalBegriffFootntoes = signalRahmen?.signalbegriffe?.flatMap [
-			IDBearbeitungsvermerk
+			val stateNote = #[transformObjectStateEnum].filterNull
+			return #[stateNote, IDBearbeitungsvermerk].filterNull.flatten
 		]?.filterNull
 		return #[rahmenFootnotes, objectStateNote, signalBegriffFootntoes].
 			filterNull.flatten
@@ -284,13 +289,17 @@ class FootnoteTransformation {
 		return #[routeNotes, kmNotes].filterNull.flatten
 	}
 
-	private def void addFootnote(Bearbeitungsvermerk comment) {
-		if (comment === null) {
+	private def void addFootnote(Basis_Objekt obj,
+		Bearbeitungsvermerk comment) {
+		if (obj === null || comment === null) {
 			return
 		}
-		if (row.footnotes === null)
+		if (row.footnotes === null) {
 			row.footnotes = TablemodelFactory.eINSTANCE.
 				createSimpleFootnoteContainer()
+			(row.footnotes as SimpleFootnoteContainer).ownerObject = obj
+		}
+
 		(row.footnotes as SimpleFootnoteContainer).footnotes.add(comment)
 	}
 }

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/messages/Messages.java

@@ -793,4 +793,34 @@ private void bindBundleLocalization(
 	 */
 	public String ToolboxTableNameSslsPlanningNumber;
 
+	/**
+	 * Sxxx
+	 */
+	public String ToolboxTableNameSxxxShort;
+
+	/**
+	 * Tabelle weiterer Bearbeitungsvermerke – Sxxx
+	 */
+	public String SxxxTableView_Heading;
+
+	/**
+	 * Tabelle weiterer Bearbeitungsvermerke
+	 */
+	public String ToolboxTableNameSxxxLong;
+
+	/**
+	 * ???
+	 */
+	public String ToolboxTableNameSxxxPlanningNumber;
+
+	/**
+	 * Sxxx – Tabelle weiterer Bearbeitungsvermerke
+	 */
+	public String SxxxDescriptionService_ViewName;
+
+	/**
+	 * Tabelle weiterer Bearbeitungsvermerke
+	 */
+	public String SxxxDescriptionService_ViewTooltip;
+
 }

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxColumns.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2026 DB InfraGO AG and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ */
+package org.eclipse.set.feature.table.pt1.sxxx;
+
+/**
+ * 
+ */
+@SuppressWarnings("nls")
+public class SxxxColumns {
+	/**
+	 * A: Inhalt Bearbeitungsvermerk
+	 */
+	public static final String Text_Content = "A";
+
+	/**
+	 * B: Referenziert von Objekt
+	 */
+	public static final String Reference_Object = "B";
+
+	/**
+	 * C: Ausgabe in Plan
+	 */
+	public static final String Visualation_In_Table = "C";
+}

java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxDescriptionService.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2026 DB InfraGO AG and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ */
+package org.eclipse.set.feature.table.pt1.sxxx;
+
+import org.eclipse.set.core.services.part.PartDescriptionService;
+import org.eclipse.set.feature.table.AbstractESTWSupplementTableDesciption;
+import org.eclipse.set.feature.table.pt1.messages.Messages;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+/**
+ * 
+ */
+@Component(service = PartDescriptionService.class)
+public class SxxxDescriptionService
+		extends AbstractESTWSupplementTableDesciption {
+
+	@Reference
+	Messages messages;
+
+	@Override
+	protected String getToolboxViewName() {
+		return messages.SxxxDescriptionService_ViewName;
+	}
+
+	@Override
+	protected String getToolboxViewTooltip() {
+		return messages.SxxxDescriptionService_ViewTooltip;
+	}
+
+	@Override
+	protected String getTableShortcut() {
+		return messages.ToolboxTableNameSxxxShort;
+	}
+
+}