eclipse-platform · vogella · Jul 10, 2025 · Jul 10, 2025
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/.classpath b/tests/org.eclipse.e4.ui.tests.css.swt/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>

diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.ui.tests.css.swt/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -101,7 +101,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.e4.ui.css.core,
  org.eclipse.equinox.preferences;bundle-version="3.5.200",
  org.eclipse.ui.views.properties.tabbed
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: org.eclipse.core.runtime;version="3.5.0",
  org.junit.jupiter.api;version="5.9.1",
  org.junit.jupiter.api.function,

diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/forms/SectionTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/forms/SectionTest.java
@@ -56,9 +56,13 @@ protected Section createTestSection(String styleSheet) {
 	@Test
 	void testSectionColors() {
 		Section section = createTestSection(
-				"Section { swt-titlebar-color: #FF0000;" + "tb-toggle-color: #FF0000; "
-						+ "tb-toggle-hover-color: #00FF00; " + "background-color-gradient-titlebar: #00FF00; "
-						+ "background-color-titlebar: #0000FF; " + "border-color-titlebar: #00FF00}");
+				"""
+					Section { swt-titlebar-color: #FF0000;\
+					tb-toggle-color: #FF0000; \
+					tb-toggle-hover-color: #00FF00; \
+					background-color-gradient-titlebar: #00FF00; \
+					background-color-titlebar: #0000FF; \
+					border-color-titlebar: #00FF00}""");
 		assertNotNull(section.getTitleBarForeground());
 		assertEquals(RED, section.getTitleBarForeground().getRGB());
 		assertNotNull(section.getTitleBarBackground());
@@ -78,9 +82,13 @@ void testSectionColors() {
 	@Test
 	void testSectionResetColors() throws Exception {
 		Section section = createTestSection(
-				"Section { swt-titlebar-color: #FF0000;" + "tb-toggle-color: #FF0000; "
-						+ "tb-toggle-hover-color: #00FF00; " + "background-color-gradient-titlebar: #00FF00; "
-						+ "background-color-titlebar: #0000FF; " + "border-color-titlebar: #00FF00}");
+				"""
+					Section { swt-titlebar-color: #FF0000;\
+					tb-toggle-color: #FF0000; \
+					tb-toggle-hover-color: #00FF00; \
+					background-color-gradient-titlebar: #00FF00; \
+					background-color-titlebar: #0000FF; \
+					border-color-titlebar: #00FF00}""");
 
 		engine.reset();
 

diff --git a/...s/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java b/...s/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java
@@ -295,10 +295,11 @@ void testRetrievePropertyNull() {
 	@Test
 	void testTopRightAsDescendentChild() {
 		ToolBar[] toolBars = createTestToolBars(
-				"CTabFolder.special ToolBar { background: #FF0000}\n" +
-						"CTabFolder ToolBar { background: #00FF00}\n" +
-						"CTabFolder.extraordinary ToolBar { background: #FFFFFF}\n" +
-				"ToolBar { background: #0000FF}");
+				"""
+					CTabFolder.special ToolBar { background: #FF0000}
+					CTabFolder ToolBar { background: #00FF00}
+					CTabFolder.extraordinary ToolBar { background: #FFFFFF}
+					ToolBar { background: #0000FF}""");
 
 		ToolBar barA = toolBars[0];
 		ToolBar barB = toolBars[1];

diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java
@@ -251,9 +251,11 @@ void testFontsEditorStackClass() {
 		CTabFolder folder2 = createFolder(folder.getShell());
 
 		WidgetElement.setCSSClass(folder2, "editorStack");
-		engine = createEngine("CTabItem { font-size: 10 }" + "CTabItem:selected { font-size: 14; font-weight: bold }"
-				+ "CTabFolder.editorStack CTabItem { font-size: 11; }"
-				+ "CTabFolder.editorStack CTabItem:selected { font-size: 13; font-style: italic }", folder.getDisplay());
+		engine = createEngine("""
+			CTabItem { font-size: 10 }\
+			CTabItem:selected { font-size: 14; font-weight: bold }\
+			CTabFolder.editorStack CTabItem { font-size: 11; }\
+			CTabFolder.editorStack CTabItem:selected { font-size: 13; font-style: italic }""", folder.getDisplay());
 		engine.applyStyles(folder.getShell(), true);
 
 		folder.getShell().open();
@@ -306,10 +308,11 @@ void testFontsEditorStackClass2() {
 
 		WidgetElement.setCSSClass(folder2, "editorStack");
 		engine = createEngine(
-				"CTabItem { font-size: 10 }"
-						+ "CTabItem:selected { font-size: 14; font-weight: bold }"
-						+ "CTabFolder.editorStack CTabItem { font-size: 11; }"
-						+ "CTabFolder.editorStack CTabItem:selected { font-size: 13; font-weight: normal; font-style: italic }",
+				"""
+					CTabItem { font-size: 10 }\
+					CTabItem:selected { font-size: 14; font-weight: bold }\
+					CTabFolder.editorStack CTabItem { font-size: 11; }\
+					CTabFolder.editorStack CTabItem:selected { font-size: 13; font-weight: normal; font-style: italic }""",
 						folder.getDisplay());
 		engine.applyStyles(folder.getShell(), true);
 
@@ -362,8 +365,10 @@ void testShowCloseEditorStack() {
 		CTabFolder folder2 = createFolder(folder.getShell());
 
 		WidgetElement.setCSSClass(folder2, "editorStack");
-		engine = createEngine("CTabItem { show-close: false }" + "CTabItem:selected { show-close: true }"
-				+ "CTabFolder.editorStack CTabItem { show-close: true }", folder.getDisplay());
+		engine = createEngine("""
+			CTabItem { show-close: false }\
+			CTabItem:selected { show-close: true }\
+			CTabFolder.editorStack CTabItem { show-close: true }""", folder.getDisplay());
 		engine.applyStyles(folder.getShell(), true);
 
 		folder.getShell().open();
@@ -401,9 +406,11 @@ void testShowCloseViewStack() {
 		CTabFolder folder2 = createFolder(folder.getShell());
 
 		WidgetElement.setCSSClass(folder2, "viewStack");
-		engine = createEngine("CTabItem { show-close: false }" + "CTabItem:selected { show-close: true }"
-				+ "CTabFolder.viewStack CTabItem { show-close: false }"
-				+ "CTabFolder.viewStack CTabItem.selected { show-close: true }", folder.getDisplay());
+		engine = createEngine("""
+			CTabItem { show-close: false }\
+			CTabItem:selected { show-close: true }\
+			CTabFolder.viewStack CTabItem { show-close: false }\
+			CTabFolder.viewStack CTabItem.selected { show-close: true }""", folder.getDisplay());
 		engine.applyStyles(folder.getShell(), true);
 
 		folder.getShell().open();

diff --git a/...ipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/IEclipsePreferencesTest.java b/...ipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/IEclipsePreferencesTest.java
@@ -28,11 +28,13 @@ void testIEclipsePreferences() {
 		IEclipsePreferences preferences = new EclipsePreferences(null, "org.eclipse.jdt.ui") {};
 
 		engine = createEngine(
-				"IEclipsePreferences#org-eclipse-jdt-ui{preferences:"
-						+ "'semanticHighlighting.abstractClass.color=128,255,0',"
-						+ "'java_bracket=0,255,255',"
-						+ "'java_bracket_italic=true',"
-						+ "'java_bracket_underline='" + "}", display);
+				"""
+					IEclipsePreferences#org-eclipse-jdt-ui{preferences:\
+					'semanticHighlighting.abstractClass.color=128,255,0',\
+					'java_bracket=0,255,255',\
+					'java_bracket_italic=true',\
+					'java_bracket_underline='\
+					}""", display);
 		// when
 		engine.applyStyles(preferences, false);
 

diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java
@@ -67,9 +67,10 @@ void testBackgroundNoInherit() {
 	@Test
 	void testBackgroundInherit() throws Exception {
 		Label labelToTest = createTestLabel(
-				"Label { background-color: #00FF00; }\n"
-						+ "Composite { background-color: #FF0000; } \n"
-						+ "Composite Label { background-color: inherit; color: #0000FF; }",
+				"""
+					Label { background-color: #00FF00; }
+					Composite { background-color: #FF0000; }\s
+					Composite Label { background-color: inherit; color: #0000FF; }""",
 						false);
 		assertEquals(BLUE, labelToTest.getForeground().getRGB());
 		assertEquals(RED, labelToTest.getBackground().getRGB());