From 5ede7dc2db082e3386f6bbffac135cd6a62d3d04 Mon Sep 17 00:00:00 2001
From: "Knoll, Vladislav" <vladislav.knoll@vector.com>
Date: Tue, 31 Mar 2026 15:54:17 +0200
Subject: [PATCH 1/2] Implement attribute handling during context merging

Implement attribute handling during context merging and enable the
related test

Contributes to
https://github.com/eclipse-platform/eclipse.platform/issues/525
---
 .../help/internal/context/Context.java        | 37 ++++++++++++-------
 .../ua/tests/help/other/ContextTest.java      |  3 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/ua/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java b/ua/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java
index 633cf731c9a..6ca5c16b0c8 100644
--- a/ua/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java
+++ b/ua/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java
@@ -27,6 +27,7 @@
 import org.eclipse.help.internal.UAElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 public class Context extends UAElement implements IContext3 {
@@ -53,27 +54,37 @@ public void mergeContext(IContext src) {
 		if (getText() == null || getText().length() == 0) {
 			setText(text);
 		}
-		if (src instanceof IContext2 && getTitle() == null) {
-			String title  = ((IContext2)src).getTitle();
+		if (src instanceof IContext2 icontext2 && getTitle() == null) {
+			String title = icontext2.getTitle();
 			if (title != null) {
 				setAttribute(ATTRIBUTE_TITLE, title);
 			}
 		}
-		if (src instanceof IContext3) {
-			ICommandLink[] commands = ((IContext3)src).getRelatedCommands();
-			for (int i=0;i<commands.length;++i) {
-				appendChild(new CommandLink(commands[i]));
+		if (src instanceof IContext3 icontext3) {
+			ICommandLink[] commands = icontext3.getRelatedCommands();
+			for (ICommandLink command : commands) {
+				appendChild(new CommandLink(command));
 			}
 		}
-		IHelpResource[] topics = src.getRelatedTopics();
-		for (int i=0;i<topics.length;++i) {
-			if (topics[i] instanceof ITopic) {
-				appendChild(new Topic((ITopic)topics[i]));
+		if (src instanceof UAElement uaelement) {
+			NamedNodeMap attributes = uaelement.getElement().getAttributes();
+			for (int i = 0; i < attributes.getLength(); i++) {
+				Node attribute = attributes.item(i);
+				String attributeName = attribute.getNodeName();
+				String attributeValue = attribute.getNodeValue();
+				if (getAttribute(attributeName) == null) {
+					setAttribute(attributeName, attributeValue);
+				}
 			}
-			else {
+		}
+		IHelpResource[] relatedTopics = src.getRelatedTopics();
+		for (IHelpResource relatedTopic : relatedTopics) {
+			if (relatedTopic instanceof ITopic) {
+				appendChild(new Topic((ITopic) relatedTopic));
+			} else {
 				Topic topic = new Topic();
-				topic.setHref(topics[i].getHref());
-				topic.setLabel(topics[i].getLabel());
+				topic.setHref(relatedTopic.getHref());
+				topic.setLabel(relatedTopic.getLabel());
 				appendChild(topic);
 			}
 		}
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextTest.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextTest.java
index 737cfecc371..bde8c3cf352 100644
--- a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextTest.java
+++ b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ContextTest.java
@@ -420,7 +420,7 @@ public void testContextWithoutDescriptionMixedCatenation() {
 		assertEquals("Context Description", context3.getText());
 	}
 
-	/*
+	@Test
 	public void testCopyContextWithAttribute() {
 		final String contextSource = CONTEXT_HEAD_WITH_ATTRIBUTE +
 			CONTEXT_DESCRIPTION +
@@ -432,6 +432,5 @@ public void testCopyContextWithAttribute() {
 		assertEquals("abc", context1.getAttribute("att"));
 		assertEquals("abc", context2.getAttribute("att"));
 	}
-	*/
 
 }

From 0b3f071d40fd2df81590585c044c952858d447e8 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Tue, 31 Mar 2026 14:39:05 +0000
Subject: [PATCH 2/2] Version bump(s) for 4.40 stream

---
 ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF | 2 +-
 ua/org.eclipse.ua.tests/pom.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
index 3ac5e35883d..6c843abd05a 100644
--- a/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: User Assistance Test
 Bundle-SymbolicName: org.eclipse.ua.tests;singleton:=true
-Bundle-Version: 3.7.400.qualifier
+Bundle-Version: 3.7.500.qualifier
 Require-Bundle: org.eclipse.help.ui,
  org.eclipse.help.webapp,
  org.eclipse.test.performance,
diff --git a/ua/org.eclipse.ua.tests/pom.xml b/ua/org.eclipse.ua.tests/pom.xml
index b1a73bdb0c6..a24d50eec3d 100644
--- a/ua/org.eclipse.ua.tests/pom.xml
+++ b/ua/org.eclipse.ua.tests/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.ua.tests</artifactId>
-  <version>3.7.400-SNAPSHOT</version>
+  <version>3.7.500-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>