From 41d9dc3dd2b47019278a3ecc7920d5970a8bd5d8 Mon Sep 17 00:00:00 2001
From: Quang Truong <truong.quang@scheidt-bachmann-st.de>
Date: Thu, 14 Aug 2025 11:38:35 +0200
Subject: [PATCH 1/4] Update planpro version

---
 .../set/basis/files/PlanProFileResource.java  | 31 +++++++++-
 .../eclipse/set/core/services/Services.java   | 18 ++++++
 .../version/PlanProVersionService.java        | 37 +++++++++++
 .../core/fileservice/AbstractToolboxFile.java |  9 ++-
 .../core/fileservice/PlainToolboxFile.java    |  4 +-
 .../core/fileservice/PlanProXMLHelper.java    | 62 +++++++++++++++++++
 .../fileservice/ZippedPlanProToolboxFile.java |  7 ++-
 .../version/PlanProVersionServiceImpl.java    | 41 +++++++++++-
 .../table/pt1/sskg/SskgTransformator.xtend    | 54 +++++++++++-----
 .../table/pt1/ssks/SsksTransformator.xtend    | 20 +++---
 .../extensions/FmaKomponenteExtensions.xtend  | 30 +++++++--
 .../extensions/ZugEinwirkungExtensions.xtend  |  7 ++-
 12 files changed, 281 insertions(+), 39 deletions(-)
 create mode 100644 java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/PlanProXMLHelper.java

diff --git a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/files/PlanProFileResource.java b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/files/PlanProFileResource.java
index 77b031baf8..1234e880e4 100644
--- a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/files/PlanProFileResource.java
+++ b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/files/PlanProFileResource.java
@@ -13,6 +13,7 @@
 import java.util.Map;
 
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.xmi.XMLHelper;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xmi.XMLSave;
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
@@ -21,7 +22,24 @@
  * Adapted resource implementation for the EMF-XML Resources
  */
 public class PlanProFileResource extends XMLResourceImpl {
+
 	private String standalone;
+	private XMLHelper xmlHelper;
+
+	/**
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @param uri
+	 *            the URI of the new resource.
+	 * @param xmlHelper
+	 *            the {@link XMLHelper}
+	 * @generated
+	 */
+	public PlanProFileResource(final URI uri, final XMLHelper xmlHelper) {
+		this(uri);
+		this.xmlHelper = xmlHelper;
+	}
 
 	/**
 	 * Creates an instance of the resource. <!-- begin-user-doc --> <!--
@@ -33,7 +51,7 @@ public class PlanProFileResource extends XMLResourceImpl {
 	 */
 	public PlanProFileResource(final URI uri) {
 		super(uri);
-
+		this.xmlHelper = null;
 		getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA,
 				Boolean.TRUE);
 		getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA,
@@ -49,6 +67,9 @@ public PlanProFileResource(final URI uri) {
 				XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
 		getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER,
 				Boolean.TRUE);
+		getDefaultLoadOptions().put(
+				XMLResource.OPTION_USE_PACKAGE_NS_URI_AS_LOCATION,
+				Boolean.FALSE);
 	}
 
 	static final String STANDALONE = "standalone"; //$NON-NLS-1$
@@ -70,4 +91,12 @@ protected XMLSave createXMLSave() {
 	public void setStandalone(final String value) {
 		standalone = value;
 	}
+
+	@Override
+	protected XMLHelper createXMLHelper() {
+		if (xmlHelper != null) {
+			return xmlHelper;
+		}
+		return super.createXMLHelper();
+	}
 }
diff --git a/java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/Services.java b/java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/Services.java
index 5bd5fd6780..bad25f1744 100644
--- a/java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/Services.java
+++ b/java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/Services.java
@@ -16,6 +16,7 @@
 import org.eclipse.set.core.services.graph.TopologicalGraphService;
 import org.eclipse.set.core.services.planningaccess.PlanningAccessService;
 import org.eclipse.set.core.services.siteplan.SiteplanService;
+import org.eclipse.set.core.services.version.PlanProVersionService;
 import org.eclipse.set.core.services.viewmodel.ToolboxViewModelService;
 
 /**
@@ -33,6 +34,7 @@ public class Services {
 	private static UserConfigurationService userConfigurationService;
 	private static TopologicalGraphService topGraphService;
 	private static PointObjectPositionService pointObjectPositionService;
+	private static PlanProVersionService planProVersionService;
 
 	/**
 	 * @return the siteplan service
@@ -183,4 +185,20 @@ public static void setPointObjectPositionService(
 			final PointObjectPositionService pointObjectPositionService) {
 		Services.pointObjectPositionService = pointObjectPositionService;
 	}
+
+	/**
+	 * @param planProVersionService
+	 *            the {@link PlanProVersionService}
+	 */
+	public static void setPlanProVersionService(
+			final PlanProVersionService planProVersionService) {
+		Services.planProVersionService = planProVersionService;
+	}
+
+	/**
+	 * @return the {@link PlanProVersionService}
+	 */
+	public static PlanProVersionService getPlanProVersionService() {
+		return planProVersionService;
+	}
 }
diff --git a/java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/version/PlanProVersionService.java b/java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/version/PlanProVersionService.java
index dfc5d647c8..7be7b12728 100644
--- a/java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/version/PlanProVersionService.java
+++ b/java/bundles/org.eclipse.set.core.services/src/org/eclipse/set/core/services/version/PlanProVersionService.java
@@ -19,11 +19,43 @@
  */
 public interface PlanProVersionService {
 
+	/**
+	 * The PlanPro Version format <major>.<patch>.<minor>
+	 * 
+	 * @param major
+	 *            the major version
+	 * @param patch
+	 *            the patch version
+	 * @param minor
+	 *            the minor version
+	 */
+	public record PlanProVersionFormat(String major, String patch,
+			String minor) {
+		/**
+		 * @return <major>.<patch>
+		 */
+		public String getMajorPatchVersion() {
+			return major + "." + patch; //$NON-NLS-1$
+		}
+
+		/**
+		 * @return <major>.<patch>.<version>
+		 */
+		public String getFullVersion() {
+			return String.format("%s.%s.%s", major, patch, minor); //$NON-NLS-1$
+		}
+	}
+
 	/**
 	 * @return the supported PlanPro version
 	 */
 	public VersionInfo createSupportedVersion();
 
+	/**
+	 * @return the supported PlanPro version format
+	 */
+	public PlanProVersionFormat getSupportedVersionFormat();
+
 	/**
 	 * @param location
 	 *            location to the PlanPro model
@@ -31,4 +63,9 @@ public interface PlanProVersionService {
 	 * @return the used version
 	 */
 	public VersionInfo createUsedVersion(Path location);
+
+	/**
+	 * @return the current PlanPro version
+	 */
+	public String getCurrentVersion();
 }
diff --git a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/AbstractToolboxFile.java b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/AbstractToolboxFile.java
index 862240e60f..3bb852a358 100644
--- a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/AbstractToolboxFile.java
+++ b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/AbstractToolboxFile.java
@@ -28,6 +28,7 @@
 import org.eclipse.set.basis.files.ExtendedPlanProValidator;
 import org.eclipse.set.basis.files.PlanProFileResource;
 import org.eclipse.set.basis.files.ToolboxFile;
+import org.eclipse.set.core.services.version.PlanProVersionService;
 import org.eclipse.set.model.planpro.PlanPro.DocumentRoot;
 import org.w3c.dom.Document;
 
@@ -80,10 +81,11 @@ private void modifyXmlDeclaration() {
 	}
 
 	protected void loadResource(final Path path,
-			final EditingDomain editingDomain) throws IOException {
+			final EditingDomain editingDomain,
+			final PlanProVersionService versionService) throws IOException {
 		ExtendedPlanProValidator.registerValidator();
 		final ResourceSet resourceSet = editingDomain.getResourceSet();
-
+		versionService.createSupportedVersion();
 		// Allow file extesion with Uppercase
 		final URI resourceUri = URI.createFileURI(
 				PathExtensions.toLowerCaseExtension(path).toString());
@@ -91,7 +93,8 @@ protected void loadResource(final Path path,
 				.getResource(resourceUri, false);
 		if (newResource == null) {
 			// Load the resource
-			newResource = new PlanProFileResource(resourceUri);
+			newResource = new PlanProFileResource(resourceUri,
+					new PlanProXMLHelper(newResource, versionService));
 			resourceSet.getResources().add(newResource);
 			// Allow ppxml files with unknown features to be loaded
 			// by ignoring wrapped FeatureNotFoundExceptions
diff --git a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/PlainToolboxFile.java b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/PlainToolboxFile.java
index 6fd5ad2ca8..cc16d942f0 100644
--- a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/PlainToolboxFile.java
+++ b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/PlainToolboxFile.java
@@ -23,6 +23,7 @@
 import org.eclipse.set.basis.files.ToolboxFile;
 import org.eclipse.set.basis.files.ToolboxFileRole;
 import org.eclipse.set.basis.guid.Guid;
+import org.eclipse.set.core.services.Services;
 import org.eclipse.set.core.services.session.SessionService;
 import org.eclipse.set.model.planpro.PlanPro.DocumentRoot;
 import org.eclipse.set.model.planpro.PlanPro.util.PlanProResourceImpl;
@@ -152,7 +153,8 @@ public boolean isLoadable() {
 	public void openModel() throws IOException {
 		if (isLoadable()) {
 			generateMD5CheckSum();
-			loadResource(getModelPath(), editingDomain);
+			loadResource(getModelPath(), editingDomain,
+					Services.getPlanProVersionService());
 			final DocumentRoot doc = (org.eclipse.set.model.planpro.PlanPro.DocumentRoot) getPlanProResource()
 					.getContents()
 					.getFirst();
diff --git a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/PlanProXMLHelper.java b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/PlanProXMLHelper.java
new file mode 100644
index 0000000000..f2339ba4b4
--- /dev/null
+++ b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/PlanProXMLHelper.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2025 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.core.fileservice;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
+import org.eclipse.set.core.services.version.PlanProVersionService;
+
+/**
+ * Make the old minor version compatible
+ * 
+ * @author truong
+ */
+public class PlanProXMLHelper extends XMLHelperImpl {
+
+	private static final String PLANPRO_URI_PREFIX = "http://www.plan-pro.org/modell/"; //$NON-NLS-1$
+	private final PlanProVersionService versionService;
+
+	private static String parseVersion(final String uri) {
+		return uri.substring(uri.lastIndexOf("/") + 1); //$NON-NLS-1$
+	}
+
+	/**
+	 * @param resource
+	 *            the {@link XMLResource}
+	 * @param versionSerivce
+	 *            the {@link PlanProVersionService}
+	 */
+	public PlanProXMLHelper(final XMLResource resource,
+			final PlanProVersionService versionSerivce) {
+		super(resource);
+		this.versionService = versionSerivce;
+	}
+
+	@Override
+	public void addPrefix(final String prefix, final String uri) {
+		if (!uri.startsWith(PLANPRO_URI_PREFIX)
+				|| parseVersion(uri).equals(versionService.getCurrentVersion())
+				|| !parseVersion(uri)
+						.startsWith(versionService.getSupportedVersionFormat()
+								.getMajorPatchVersion())) {
+			super.addPrefix(prefix, uri);
+			return;
+		}
+
+		// When the version isn't equal current version, but this version is
+		// supported then replace the version part in uri to current version
+		final String version = parseVersion(uri);
+		final String newUri = uri.replace(version,
+				versionService.getCurrentVersion());
+		super.addPrefix(prefix, newUri);
+
+	}
+}
diff --git a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/ZippedPlanProToolboxFile.java b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/ZippedPlanProToolboxFile.java
index fe84e824cc..79f8bfc3e7 100644
--- a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/ZippedPlanProToolboxFile.java
+++ b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/ZippedPlanProToolboxFile.java
@@ -34,6 +34,7 @@
 import org.eclipse.set.basis.files.ToolboxFile;
 import org.eclipse.set.basis.files.ToolboxFileRole;
 import org.eclipse.set.basis.guid.Guid;
+import org.eclipse.set.core.services.Services;
 import org.eclipse.set.model.planpro.PlanPro.DocumentRoot;
 import org.eclipse.set.model.planpro.PlanPro.PlanProPackage;
 import org.eclipse.set.model.zipmanifest.Manifest;
@@ -312,7 +313,8 @@ public void openModel() throws IOException {
 		if (isLoadable()) {
 			generateMD5CheckSum();
 			unzip();
-			loadResource(getModelPath(), editingDomain);
+			loadResource(getModelPath(), editingDomain,
+					Services.getPlanProVersionService());
 			final DocumentRoot doc = (org.eclipse.set.model.planpro.PlanPro.DocumentRoot) getPlanProResource()
 					.getContents()
 					.getFirst();
@@ -326,7 +328,8 @@ public void openModel() throws IOException {
 	@Override
 	public void openLayout() throws IOException {
 		if (Files.exists(getLayoutPath())) {
-			loadResource(getLayoutPath(), editingDomain);
+			loadResource(getLayoutPath(), editingDomain,
+					Services.getPlanProVersionService());
 			final org.eclipse.set.model.planpro.Layoutinformationen.DocumentRoot doc = (org.eclipse.set.model.planpro.Layoutinformationen.DocumentRoot) getLayoutResource()
 					.getContents()
 					.getFirst();
diff --git a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/version/PlanProVersionServiceImpl.java b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/version/PlanProVersionServiceImpl.java
index b459e4f33f..341e7c515a 100644
--- a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/version/PlanProVersionServiceImpl.java
+++ b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/version/PlanProVersionServiceImpl.java
@@ -16,11 +16,13 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import org.eclipse.set.core.services.Services;
 import org.eclipse.set.core.services.version.PlanProVersionService;
 import org.eclipse.set.model.validationreport.ValidationreportFactory;
 import org.eclipse.set.model.validationreport.VersionInfo;
 import org.eclipse.set.ppmodel.extensions.PlanProPackageExtensions;
 import org.eclipse.set.ppmodel.extensions.SignalbegriffeRil301PackageExtensions;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 
 /**
@@ -37,6 +39,13 @@ public class PlanProVersionServiceImpl implements PlanProVersionService {
 	private static final String SIGNALS_KEY = "http://www.plan-pro.org/modell/Signalbegriffe_Ril_301/"; //$NON-NLS-1$
 	private static final int VALUE_GROUP = 1;
 
+	private static final String VERSION_FORMAT = "(?<major>[1-9]+\\.[0-9]+)\\.(?<patch>[0-9]+)(\\.(?<minor>[0-9]))*"; //$NON-NLS-1$
+
+	@Activate
+	private void active() {
+		Services.setPlanProVersionService(this);
+	}
+
 	private static String getText(final Path location) {
 		List<String> lines;
 		try {
@@ -64,13 +73,31 @@ private static String parseVersion(final String text, final String key) {
 		return null;
 	}
 
+	private static PlanProVersionFormat parseVersionFormat(
+			final String version) {
+		final Pattern compile = Pattern.compile(VERSION_FORMAT);
+		final Matcher matcher = compile.matcher(version);
+		if (!matcher.matches()) {
+			throw new IllegalArgumentException("Illegal Version Foramt"); //$NON-NLS-1$
+		}
+
+		return new PlanProVersionFormat(matcher.group("major"), //$NON-NLS-1$
+				matcher.group("patch"), matcher.group("minor")); //$NON-NLS-1$ //$NON-NLS-2$
+
+	}
+
 	@Override
 	public VersionInfo createSupportedVersion() {
 		final VersionInfo versionInfo = ValidationreportFactory.eINSTANCE
 				.createVersionInfo();
-		versionInfo.setPlanPro(PlanProPackageExtensions.getModelVersion());
-		versionInfo.setSignals(
+		final PlanProVersionFormat modelVersionFormat = parseVersionFormat(
+				PlanProPackageExtensions.getModelVersion());
+		versionInfo
+				.setPlanPro(modelVersionFormat.getMajorPatchVersion() + ".*"); //$NON-NLS-1$
+		final PlanProVersionFormat signalVersionFormat = parseVersionFormat(
 				SignalbegriffeRil301PackageExtensions.getModelVersion());
+		versionInfo
+				.setSignals(signalVersionFormat.getMajorPatchVersion() + ".*"); //$NON-NLS-1$
 		return versionInfo;
 	}
 
@@ -88,4 +115,14 @@ public VersionInfo createUsedVersion(final Path location) {
 
 		return versionInfo;
 	}
+
+	@Override
+	public PlanProVersionFormat getSupportedVersionFormat() {
+		return parseVersionFormat(PlanProPackageExtensions.getModelVersion());
+	}
+
+	@Override
+	public String getCurrentVersion() {
+		return PlanProPackageExtensions.getModelVersion();
+	}
 }
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformator.xtend
index c8285ec980..3252ec80e2 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformator.xtend
+++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformator.xtend
@@ -15,7 +15,11 @@ import org.eclipse.set.core.services.enumtranslation.EnumTranslationService
 import org.eclipse.set.core.services.graph.TopologicalGraphService
 import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableModelTransformator
 import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich
+import org.eclipse.set.model.planpro.Bahnuebergang.BUE_Anlage
+import org.eclipse.set.model.planpro.Bahnuebergang.BUE_Kante
+import org.eclipse.set.model.planpro.Basisobjekte.Basis_Objekt
 import org.eclipse.set.model.planpro.Basisobjekte.Punkt_Objekt
+import org.eclipse.set.model.planpro.Fahrstrasse.Markanter_Punkt
 import org.eclipse.set.model.planpro.Ortung.FMA_Komponente
 import org.eclipse.set.model.planpro.Ortung.Zugeinwirkung
 import org.eclipse.set.model.tablemodel.ColumnDescriptor
@@ -28,7 +32,6 @@ import static org.eclipse.set.feature.table.pt1.sskg.SskgColumns.*
 
 import static extension org.eclipse.set.ppmodel.extensions.FmaKomponenteAchszaehlpunktExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.FmaKomponenteExtensions.*
-import static extension org.eclipse.set.ppmodel.extensions.MarkanterPunktExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.PunktObjektExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.PunktObjektStreckeExtensions.*
 import static extension org.eclipse.set.ppmodel.extensions.UrObjectExtensions.*
@@ -45,8 +48,7 @@ class SskgTransformator extends AbstractPlanPro2TableModelTransformator {
 
 	new(Set<ColumnDescriptor> cols,
 		EnumTranslationService enumTranslationService,
-		TopologicalGraphService topGraphService,
-		EventAdmin eventAdmin) {
+		TopologicalGraphService topGraphService, EventAdmin eventAdmin) {
 		super(cols, enumTranslationService, eventAdmin)
 		this.topGraphService = topGraphService;
 	}
@@ -76,8 +78,7 @@ class SskgTransformator extends AbstractPlanPro2TableModelTransformator {
 				cols.getColumn(Art),
 				ein,
 				[
-					ein?.zugeinwirkungAllg?.zugeinwirkungArt?.translate ?:
-						""
+					ein?.zugeinwirkungAllg?.zugeinwirkungArt?.translate ?: ""
 				]
 			)
 
@@ -127,8 +128,7 @@ class SskgTransformator extends AbstractPlanPro2TableModelTransformator {
 				cols.getColumn(Bezugspunkt_Bezeichnung),
 				ein,
 				[
-					ein?.markanterPunkt?.bezeichnung?.
-						bezeichnungMarkanterPunkt?.wert ?: ""
+					bezugspunktBezeichnung
 				]
 			)
 
@@ -138,11 +138,11 @@ class SskgTransformator extends AbstractPlanPro2TableModelTransformator {
 				cols.getColumn(Bezugspunkt_Abstand),
 				ein,
 				[
-					val mp = markanterPunkt?.markanteStelle
-					if (mp === null) {
+					val punkt = bezugspunkt
+					if (punkt === null) {
 						return null
 					}
-					String.format("%.0f", getShortestPathLength(ein, mp))
+					String.format("%.0f", getShortestPathLength(ein, punkt))
 				]
 			)
 
@@ -271,8 +271,7 @@ class SskgTransformator extends AbstractPlanPro2TableModelTransformator {
 					cols.getColumn(Bezugspunkt_Bezeichnung),
 					fma,
 					[
-						fma?.markanterPunkt?.bezeichnung?.
-							bezeichnungMarkanterPunkt?.wert ?: ""
+						bezugspunktBezeichnung ?: ""
 					]
 				)
 
@@ -282,11 +281,11 @@ class SskgTransformator extends AbstractPlanPro2TableModelTransformator {
 					cols.getColumn(Bezugspunkt_Abstand),
 					fma,
 					[
-						val mp = markanterPunkt?.markanteStelle
-						if (mp === null) {
+						val punkt = bezugsPunkt
+						if (punkt === null) {
 							return null
 						}
-						String.format("%.0f", getShortestPathLength(fma, mp))
+						String.format("%.0f", getShortestPathLength(fma, punkt))
 					]
 				)
 
@@ -342,4 +341,29 @@ class SskgTransformator extends AbstractPlanPro2TableModelTransformator {
 			]
 		].filter[present].map[get.doubleValue].min
 	}
+
+	def dispatch String getBezugspunktBezeichnung(FMA_Komponente fma) {
+		return fma.IDBezugspunkt?.value.bezugspunktBezeichnung
+	}
+	
+	def dispatch String getBezugspunktBezeichnung(Zugeinwirkung ein) {
+		return ein.IDBezugspunkt?.value?.bezugspunktBezeichnung
+	}
+
+	def dispatch String getBezugspunktBezeichnung(Basis_Objekt fma) {
+		return ""
+	}
+
+	def dispatch String getBezugspunktBezeichnung(BUE_Anlage bueAnlage) {
+		return bueAnlage.bezeichnung?.bezeichnungTabelle?.wert
+	}
+
+	def dispatch String getBezugspunktBezeichnung(BUE_Kante bueKante) {
+		return bueKante?.IDBUEAnlage?.value?.bezugspunktBezeichnung
+	}
+
+	def dispatch String getBezugspunktBezeichnung(Markanter_Punkt markanter) {
+		return markanter?.bezeichnung?.bezeichnungMarkanterPunkt?.wert
+	}
+
 }
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend
index 3e10244f78..729289997b 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend
+++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend
@@ -615,18 +615,20 @@ class SsksTransformator extends AbstractPlanPro2TableModelTransformator {
 							new Case<Signal>(
 								[
 									hasSignalbegriffID(Sh1) &&
-										signalReal?.geltungsbereich?.wert ==
-											ENUMGeltungsbereich.
+										signalReal?.geltungsbereich.exists [
+											wert === ENUMGeltungsbereich.
 												ENUM_GELTUNGSBEREICH_DV
+										]
 								],
 								["Ra 12"]
 							),
 							new Case<Signal>(
 								[
 									hasSignalbegriffID(Sh1) &&
-										signalReal?.geltungsbereich?.wert ==
-											ENUMGeltungsbereich.
+										signalReal?.geltungsbereich.exists [
+											wert == ENUMGeltungsbereich.
 												ENUM_GELTUNGSBEREICH_DS
+										]
 								],
 								["Sh 1"]
 							),
@@ -1352,7 +1354,7 @@ class .simpleName»: «e.message» - failed to transform table contents''', e)
 
 	private static def String fillSonstigesDurchfahrtErlaubt(Signal signal) {
 		val durchfahrt = signal.signalFstr?.durchfahrt?.wert
-		val geltungsbereich = signal.signalReal?.geltungsbereich?.wert
+		val geltungsbereich = signal.signalReal?.geltungsbereich
 
 		switch (durchfahrt) {
 			case ENUM_DURCHFAHRT_VERBOTEN:
@@ -1360,10 +1362,14 @@ class .simpleName»: «e.message» - failed to transform table contents''', e)
 			case ENUM_DURCHFAHRT_ERLAUBT:
 				return "x"
 			case durchfahrt == ENUM_DURCHFAHRT_NUR_MIT_SH1 &&
-				geltungsbereich == ENUM_GELTUNGSBEREICH_DV:
+				geltungsbereich !== null && geltungsbereich.exists [
+					wert == ENUM_GELTUNGSBEREICH_DV
+				]:
 				return "Ra 12"
 			case durchfahrt == ENUM_DURCHFAHRT_NUR_MIT_SH1 &&
-				geltungsbereich == ENUM_GELTUNGSBEREICH_DS:
+				geltungsbereich !== null && geltungsbereich.exists [
+					wert == ENUM_GELTUNGSBEREICH_DS
+				]:
 				return "Sh 1"
 			default:
 				return null
diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/FmaKomponenteExtensions.xtend b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/FmaKomponenteExtensions.xtend
index c63ed6d45f..487bcb999b 100644
--- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/FmaKomponenteExtensions.xtend
+++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/FmaKomponenteExtensions.xtend
@@ -9,13 +9,18 @@
 package org.eclipse.set.ppmodel.extensions
 
 import java.util.List
+import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich
+import org.eclipse.set.model.planpro.Bahnuebergang.BUE_Anlage
+import org.eclipse.set.model.planpro.Bahnuebergang.BUE_Kante
+import org.eclipse.set.model.planpro.Basisobjekte.Basis_Objekt
+import org.eclipse.set.model.planpro.Basisobjekte.Punkt_Objekt
 import org.eclipse.set.model.planpro.Fahrstrasse.Markanter_Punkt
 import org.eclipse.set.model.planpro.Ortung.FMA_Anlage
 import org.eclipse.set.model.planpro.Ortung.FMA_Komponente
 import org.eclipse.set.model.planpro.Ortung.Schaltmittel_Zuordnung
-import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich
 
 import static extension org.eclipse.set.ppmodel.extensions.AussenelementansteuerungExtensions.*
+import static extension org.eclipse.set.ppmodel.extensions.MarkanterPunktExtensions.*
 
 /**
  * This class extends {@link FMA_Komponente}.
@@ -46,11 +51,26 @@ class FmaKomponenteExtensions extends BasisObjektExtensions {
 	) {
 		return komp.IDFMAgrenze.map[value].filterNull.toList
 	}
-
-	def static Markanter_Punkt getMarkanterPunkt(FMA_Komponente komp) {
-		return komp.IDBezugspunkt?.value
+	
+	def static dispatch Punkt_Objekt getBezugsPunkt(FMA_Komponente fma) {
+		return fma?.IDBezugspunkt?.value?.bezugsPunkt
 	}
-
+	
+	def static dispatch Punkt_Objekt getBezugsPunkt(Basis_Objekt object) {
+		return null
+	}
+	def static dispatch Punkt_Objekt getBezugsPunkt(BUE_Anlage bueAnlage) {
+		return bueAnlage.bezugsPunkt
+	}
+	
+	def static dispatch Punkt_Objekt getBezugsPunkt(BUE_Kante bueKante) {
+		return bueKante.bezugsPunkt
+	}
+	
+	def static dispatch Punkt_Objekt getBezugsPunkt(Markanter_Punkt markanter) {
+		return markanter.markanteStelle
+	}
+	
 	def static Schaltmittel_Zuordnung getSchaltmittelZuordnung(
 		FMA_Komponente komp) {
 		for (Schaltmittel_Zuordnung zuord : komp.container.
diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/ZugEinwirkungExtensions.xtend b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/ZugEinwirkungExtensions.xtend
index 106e356b7b..96a55f02fc 100644
--- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/ZugEinwirkungExtensions.xtend
+++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/ZugEinwirkungExtensions.xtend
@@ -12,18 +12,19 @@ import java.util.List
 import org.eclipse.set.model.planpro.Ansteuerung_Element.Stell_Bereich
 import org.eclipse.set.model.planpro.Block.Block_Element
 import org.eclipse.set.model.planpro.Fahrstrasse.Fstr_Fahrweg
-import org.eclipse.set.model.planpro.Fahrstrasse.Markanter_Punkt
 import org.eclipse.set.model.planpro.Ortung.Schaltmittel_Zuordnung
 import org.eclipse.set.model.planpro.Ortung.Zugeinwirkung
 
 import static extension org.eclipse.set.ppmodel.extensions.BereichObjektExtensions.*
+import static extension org.eclipse.set.ppmodel.extensions.FmaKomponenteExtensions.*
+import org.eclipse.set.model.planpro.Basisobjekte.Punkt_Objekt
 
 /**
  * This class extends {@link Zugeinwirkung}.
  */
 class ZugEinwirkungExtensions extends BasisObjektExtensions {
-	def static Markanter_Punkt getMarkanterPunkt(Zugeinwirkung einwirkung) {
-		return einwirkung.IDBezugspunkt?.value
+	def static Punkt_Objekt getBezugspunkt(Zugeinwirkung einwirkung) {
+		return einwirkung.IDBezugspunkt?.value?.bezugsPunkt
 	}
 
 	def static List<Schaltmittel_Zuordnung> getSchaltMittelZuordnung(

From 29ea989400bf5376426f92530455276b0895b97e Mon Sep 17 00:00:00 2001
From: Quang Truong <truong.quang@scheidt-bachmann-st.de>
Date: Wed, 20 Aug 2025 13:33:38 +0200
Subject: [PATCH 2/4] Update Unitest

---
 .../META-INF/MANIFEST.MF                      |  9 +-
 .../MockPlanProVersionService.java            | 50 +++++++++++
 .../fileservice/PlainToolboxFileTest.xtend    | 57 ++++++-------
 .../fileservice/ZippedToolboxFileTest.xtend   | 82 +++++++++++--------
 .../core/fileservice/AbstractToolboxFile.java |  2 -
 .../table/pt1/sskg/SskgTransformator.xtend    |  2 +-
 .../org.eclipse.set.releng.target.target      |  2 +
 7 files changed, 136 insertions(+), 68 deletions(-)
 create mode 100644 java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/MockPlanProVersionService.java

diff --git a/java/bundles/org.eclipse.set.core.test/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.core.test/META-INF/MANIFEST.MF
index ab9c8574dd..48604ad8de 100644
--- a/java/bundles/org.eclipse.set.core.test/META-INF/MANIFEST.MF
+++ b/java/bundles/org.eclipse.set.core.test/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Fragment-Host: org.eclipse.set.core;bundle-version="0.1.0"
 Automatic-Module-Name: org.eclipse.set.core.test
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: Eclipse Signalling Engineering Toolbox
-Import-Package: org.eclipse.set.feature.validation.session,
+Import-Package: org.eclipse.set.core.services.version,
+ org.eclipse.set.feature.validation.session,
  org.eclipse.set.model.planpro.PlanPro,
  org.eclipse.set.model.planpro.Signalbegriffe_Ril_301,
  org.eclipse.set.sessionservice,
@@ -15,5 +16,9 @@ Import-Package: org.eclipse.set.feature.validation.session,
  org.eclipse.set.unittest.utils.session,
  org.eclipse.set.unittest.utils.toolboxfile,
  org.junit,
+ org.junit.function,
  org.junit.jupiter.api
-Require-Bundle: org.hamcrest.core
+Require-Bundle: org.hamcrest.core,
+ org.mockito.mockito-core,
+ net.bytebuddy.byte-buddy,
+ net.bytebuddy.byte-buddy-agent
diff --git a/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/MockPlanProVersionService.java b/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/MockPlanProVersionService.java
new file mode 100644
index 0000000000..4af702ebc5
--- /dev/null
+++ b/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/MockPlanProVersionService.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2025 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.core.fileservice;
+
+import org.eclipse.set.core.services.Services;
+import org.eclipse.set.core.services.version.PlanProVersionService;
+import org.eclipse.set.core.services.version.PlanProVersionService.PlanProVersionFormat;
+import org.junit.function.ThrowingRunnable;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+/**
+ * The {@link PlanProVersionService} is needed for open planpro file
+ */
+public class MockPlanProVersionService {
+	private static final PlanProVersionFormat currentVersion = new PlanProVersionFormat(
+			"1.10", "0", "3"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * Mock {@link PlanProVersionService}
+	 * 
+	 * @param doTest
+	 *            the test code
+	 * @throws Throwable
+	 *             the exception
+	 */
+	public static void mockPlanProVersionService(final ThrowingRunnable doTest)
+			throws Throwable {
+		final PlanProVersionService mockVersionService = Mockito
+				.mock(PlanProVersionService.class);
+		Mockito.when(mockVersionService.getCurrentVersion())
+				.thenReturn(currentVersion.getFullVersion());
+		Mockito.when(mockVersionService.getSupportedVersionFormat())
+				.thenReturn(currentVersion);
+		try (MockedStatic<Services> mockStatic = Mockito
+				.mockStatic(Services.class)) {
+			mockStatic.when(Services::getPlanProVersionService)
+					.thenReturn(mockVersionService);
+			doTest.run();
+		}
+	}
+}
diff --git a/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/PlainToolboxFileTest.xtend b/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/PlainToolboxFileTest.xtend
index 3ad05921fc..0d37310eb4 100644
--- a/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/PlainToolboxFileTest.xtend
+++ b/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/PlainToolboxFileTest.xtend
@@ -8,14 +8,12 @@
  */
 package org.eclipse.set.core.fileservice
 
-import java.io.IOException
 import java.nio.file.Paths
 import org.eclipse.set.basis.files.ToolboxFile
 import org.eclipse.set.basis.files.ToolboxFileRole
-import org.eclipse.set.core.services.files.ToolboxFileFormatService
+import org.eclipse.set.feature.validation.session.SetSessionService
 import org.eclipse.set.unittest.utils.toolboxfile.AbstractToolboxFileTest
 import org.junit.jupiter.api.Test
-import org.eclipse.set.feature.validation.session.SetSessionService
 
 /**
  * Test for {@link PlainToolboxFile}
@@ -28,30 +26,37 @@ class PlainToolboxFileTest extends AbstractToolboxFileTest {
 	 * Test method for {@link PlainToolboxFile#open()}
 	 */
 	@Test
-	def void testOpen() throws IOException{
-		whenOpen
-		thenExpectContentsExists(true)
+	def void testOpen() throws Throwable{
+		MockPlanProVersionService.mockPlanProVersionService([
+			whenOpen
+			thenExpectContentsExists(true)
+		])
 	}
 
 	/**
 	 * Test method for {@link PlainToolboxFile#close()}
 	 */
 	@Test
-	def void testClose() throws IOException{
-		whenOpen
-		whenClose
-		thenExpectContentsExists(false)
+	def void testClose() throws Throwable{
+		MockPlanProVersionService.mockPlanProVersionService([
+			whenOpen
+			whenClose
+			thenExpectContentsExists(false)
+		])
+
 	}
 
 	/**
 	 * Test method for multiple {@link PlainToolboxFile#close()}
 	 */
 	@Test
-	def void testMultipleClose() throws IOException{
-		whenOpen
-		whenClose
-		whenClose
-		thenExpectContentsExists(false)
+	def void testMultipleClose() throws Throwable{
+		MockPlanProVersionService.mockPlanProVersionService([
+			whenOpen
+			whenClose
+			whenClose
+			thenExpectContentsExists(false)
+		])
 	}
 
 	/**
@@ -60,19 +65,15 @@ class PlainToolboxFileTest extends AbstractToolboxFileTest {
 	 * 
 	 */
 	@Test
-	def void testCloseThenOpen() throws IOException{
-		whenOpen
-		thenExpectContentsExists(true)
-		whenClose
-		thenExpectContentsExists(false)
-		whenOpen
-		thenExpectContentsExists(true)
-	}
-
-	def ToolboxFileFormatService setUpFormatService() {
-		val formatService = new PlainFileFormatService
-		formatService.sessionService = new SetSessionService
-		return formatService
+	def void testCloseThenOpen() throws Throwable {
+		MockPlanProVersionService.mockPlanProVersionService([
+			whenOpen
+			thenExpectContentsExists(true)
+			whenClose
+			thenExpectContentsExists(false)
+			whenOpen
+			thenExpectContentsExists(true)
+		])
 	}
 
 	override protected ToolboxFile createToolboxFile(ToolboxFileRole role) {
diff --git a/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/ZippedToolboxFileTest.xtend b/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/ZippedToolboxFileTest.xtend
index f9e5e60317..0613f893ed 100644
--- a/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/ZippedToolboxFileTest.xtend
+++ b/java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/ZippedToolboxFileTest.xtend
@@ -9,7 +9,7 @@
 
 package org.eclipse.set.core.fileservice
 
-import java.io.IOException
+import java.lang.Throwable
 import java.nio.file.Files
 import java.nio.file.Paths
 import org.eclipse.set.basis.files.ToolboxFile
@@ -34,11 +34,13 @@ class ZippedToolboxFileTest extends AbstractToolboxFileTest {
 	 * Test method for {@link ZippedPlanProToolboxFile#open()}
 	 */
 	@Test
-	def void testOpen() throws IOException{
-		whenOpen
-		thenExpectContentsExists(true)
-		thenExpectLayoutContentExists(true)
-		thenExpectResourceCallsWithinZipDirectory
+	def void testOpen() throws Throwable{
+		MockPlanProVersionService.mockPlanProVersionService([
+			whenOpen
+			thenExpectContentsExists(true)
+			thenExpectLayoutContentExists(true)
+			thenExpectResourceCallsWithinZipDirectory
+		])
 	}
 
 	/**
@@ -46,37 +48,44 @@ class ZippedToolboxFileTest extends AbstractToolboxFileTest {
 	 * 
 	 */
 	@Test
-	def void testClose() throws IOException {
-		whenOpen
-		whenClose
-		thenExpectZippedDirectoryNotExist
-		thenExpectContentsExists(false)
+	def void testClose() throws Throwable {
+		MockPlanProVersionService.mockPlanProVersionService([
+			whenOpen
+			whenClose
+			thenExpectZippedDirectoryNotExist
+			thenExpectContentsExists(false)
+		])
 	}
 
 	/**
 	 * Test method for multiple {@link ZippedPlanProToolboxFile#close()}
 	 */
 	@Test
-	def void testMultipleClose() throws IOException {
-		whenOpen
-		whenClose
-		whenClose
-		thenExpectZippedDirectoryNotExist
-		thenExpectContentsExists(false)
-		thenExpectLayoutContentExists(false)
+	def void testMultipleClose() throws Throwable {
+		MockPlanProVersionService.mockPlanProVersionService([
+			whenOpen
+			whenClose
+			whenClose
+			thenExpectZippedDirectoryNotExist
+			thenExpectContentsExists(false)
+			thenExpectLayoutContentExists(false)
+		])
 	}
 
 	/**
 	 * Test method for multiple {@link ZippedPlanProToolboxFile#close()}
 	 */
 	@Test
-	def void testAutoclose() throws IOException {
-		PlanProPackage.eINSTANCE.eClass();
-		org.eclipse.set.model.planpro.PlanPro.PlanProPackage.eINSTANCE.
-			eClass();
+	def void testAutoclose() throws Throwable {
+		MockPlanProVersionService.mockPlanProVersionService([
+			PlanProPackage.eINSTANCE.eClass();
+			org.eclipse.set.model.planpro.PlanPro.PlanProPackage.eINSTANCE.
+				eClass();
 
-		ToolboxFileRole.SESSION.whenOpenAndAutoclose
-		thenExpectZippedDirectoryNotExist
+			ToolboxFileRole.SESSION.whenOpenAndAutoclose
+			thenExpectZippedDirectoryNotExist
+
+		])
 	}
 
 	/**
@@ -85,17 +94,20 @@ class ZippedToolboxFileTest extends AbstractToolboxFileTest {
 	 * 
 	 */
 	@Test
-	def void testCloseThenOpen() throws IOException{
-		whenOpen
-		thenExpectContentsExists(true)
-		thenExpectLayoutContentExists(true)
-		whenClose
-		thenExpectContentsExists(false)
-		thenExpectLayoutContentExists(false)
-		whenOpen
-		thenExpectContentsExists(true)
-		thenExpectLayoutContentExists(true)
-		thenExpectResourceCallsWithinZipDirectory
+	def void testCloseThenOpen() throws Throwable{
+		MockPlanProVersionService.mockPlanProVersionService([
+			whenOpen
+			thenExpectContentsExists(true)
+			thenExpectLayoutContentExists(true)
+			whenClose
+			thenExpectContentsExists(false)
+			thenExpectLayoutContentExists(false)
+			whenOpen
+			thenExpectContentsExists(true)
+			thenExpectLayoutContentExists(true)
+			thenExpectResourceCallsWithinZipDirectory
+
+		])
 	}
 
 	def void thenExpectLayoutContentExists(boolean exists) {
diff --git a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/AbstractToolboxFile.java b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/AbstractToolboxFile.java
index 3bb852a358..343becefde 100644
--- a/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/AbstractToolboxFile.java
+++ b/java/bundles/org.eclipse.set.core/src/org/eclipse/set/core/fileservice/AbstractToolboxFile.java
@@ -85,7 +85,6 @@ protected void loadResource(final Path path,
 			final PlanProVersionService versionService) throws IOException {
 		ExtendedPlanProValidator.registerValidator();
 		final ResourceSet resourceSet = editingDomain.getResourceSet();
-		versionService.createSupportedVersion();
 		// Allow file extesion with Uppercase
 		final URI resourceUri = URI.createFileURI(
 				PathExtensions.toLowerCaseExtension(path).toString());
@@ -187,7 +186,6 @@ public org.eclipse.set.model.planpro.Layoutinformationen.DocumentRoot getLayoutD
 		} catch (final UnsupportedOperationException e) {
 			return null;
 		}
-
 	}
 
 	/**
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformator.xtend
index 3252ec80e2..bebfb4870c 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformator.xtend
+++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskg/SskgTransformator.xtend
@@ -343,7 +343,7 @@ class SskgTransformator extends AbstractPlanPro2TableModelTransformator {
 	}
 
 	def dispatch String getBezugspunktBezeichnung(FMA_Komponente fma) {
-		return fma.IDBezugspunkt?.value.bezugspunktBezeichnung
+		return fma.IDBezugspunkt?.value?.bezugspunktBezeichnung
 	}
 	
 	def dispatch String getBezugspunktBezeichnung(Zugeinwirkung ein) {
diff --git a/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target b/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
index dc87033670..fc9677919d 100644
--- a/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
+++ b/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
@@ -84,6 +84,8 @@
 			<unit id="org.eclipse.ui.trace" version="1.3.200.v20230913-0603"/>
 			<unit id="org.eclipse.ui.views.log" version="1.4.200.v20231025-1102"/>
 			<unit id="org.mockito.mockito-core" version="5.7.0"/>
+			<unit id="net.bytebuddy.byte-buddy" version="1.14.9"/>
+			<unit id="net.bytebuddy.byte-buddy-agent" version="1.14.9" />
 			<unit id="org.objenesis" version="3.3.0"/>
 			<repository location="https://download.eclipse.org/eclipse/updates/4.30/"/>
 		</location>

From 8be5309a62a984115f2e5d5cf5232502d386f29e Mon Sep 17 00:00:00 2001
From: Quang Truong <truong.quang@scheidt-bachmann-st.de>
Date: Wed, 20 Aug 2025 13:35:23 +0200
Subject: [PATCH 3/4] update targer platform

---
 .../org.eclipse.set.releng.target.target                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target b/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
index fc9677919d..e797de2823 100644
--- a/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
+++ b/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
@@ -226,7 +226,7 @@
 Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
 Bundle-SymbolicName:   maven.${mvnGroupId}.artifact.${mvnArtifactId}
-Bundle-Version:        2.6
+Bundle-Version:        ${version}
 Import-Package:        *;resolution:=optional
 Export-Package:        *;version="${version}";-noimport:=true
 Require-Bundle:        org.apache.batik.util

From afeb591572c2acbb85851f18788e2c303ca7858d Mon Sep 17 00:00:00 2001
From: TruongQuangSB <truong.quang@scheidt-bachmann-st.de>
Date: Tue, 16 Sep 2025 12:38:11 +0200
Subject: [PATCH 4/4] Update PlanProschema directory

---
 .../org/eclipse/set/basis/PlanProSchemaDir.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/PlanProSchemaDir.java b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/PlanProSchemaDir.java
index f9dea8e3bc..17f91a98cb 100644
--- a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/PlanProSchemaDir.java
+++ b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/PlanProSchemaDir.java
@@ -42,14 +42,16 @@ private static class LSInputImpl implements LSInput {
 		private final String baseURI;
 		private final String publicId;
 		private final String systemId;
+		private final String version;
 		private final Bundle bundle = FrameworkUtil
 				.getBundle(PlanPro_Schnittstelle.class);
 
 		LSInputImpl(final String publicId, final String systemId,
-				final String baseURI) {
+				final String baseURI, final String version) {
 			this.publicId = publicId;
 			this.systemId = systemId;
 			this.baseURI = baseURI;
+			this.version = version;
 		}
 
 		@Override
@@ -133,8 +135,12 @@ public void setSystemId(final String systemId) {
 			throw new UnsupportedOperationException();
 		}
 
+		private String getSchemaDir() {
+			return String.format("%s/%s", SCHEMA_DIR, version); //$NON-NLS-1$
+		}
+
 		private String getSchemaPath() {
-			final Enumeration<URL> entries = bundle.findEntries(SCHEMA_DIR,
+			final Enumeration<URL> entries = bundle.findEntries(getSchemaDir(),
 					getSystemId(), true);
 			final URL element = entries.nextElement();
 			Assert.isTrue(!entries.hasMoreElements());
@@ -153,7 +159,9 @@ public ResourceResolver() {
 		public LSInput resolveResource(final String type,
 				final String namespaceURI, final String publicId,
 				final String systemId, final String baseURI) {
-			return new LSInputImpl(publicId, systemId, baseURI);
+			final String version = namespaceURI
+					.substring(namespaceURI.lastIndexOf("/") + 1); //$NON-NLS-1$
+			return new LSInputImpl(publicId, systemId, baseURI, version);
 		}
 	}