Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java

@@ -3547,6 +3547,9 @@ void setBackground () {
  * <p>
  * Note: This operation is a hint and may be overridden by the platform.
  * </p>
+ * <p>
+ * Note: The background color can be overridden by setting a background image.
+ * </p>
  * @param color the new color (or null)
  *
  * @exception IllegalArgumentException <ul>
@@ -3587,6 +3590,9 @@ private void _setBackground (Color color) {
  * Note: This operation is a hint and may be overridden by the platform.
  * For example, on Windows the background of a Button cannot be changed.
  * </p>
+ * <p>
+ * Note: Setting a background image overrides a set background color.
+ * </p>
  * @param image the new image (or null)
  *
  * @exception IllegalArgumentException <ul>

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java

@@ -499,7 +499,9 @@ long gtk_draw (long widget, long cairo) {
 	int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height;
 	// We specify a 0 value for x & y as we want the whole widget to be
 	// colored, not some portion of it.
-	GTK.gtk_render_background(context, cairo, 0, 0, width, height);
+	if (backgroundImage == null) {
+		GTK.gtk_render_background(context, cairo, 0, 0, width, height);
+	}
 	// If fixClipHandle is set: iterate through the children of widget
 	// and set their clips to be that of their allocation
 	if (widget == fixClipHandle) fixClippings();

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java

@@ -194,11 +194,7 @@ void drawBackground (Control control, long gdkResource, long cr, int x, int y, i
 			cairo_rectangle_int_t regionRect = new cairo_rectangle_int_t ();
 			int [] fetchedHeight = new int [1];
 			int [] fetchedWidth = new int [1];
-			if (GTK.GTK4) {
-				gdk_surface_get_size(gdkResource, fetchedWidth, fetchedHeight);
-			} else {
-				gdk_window_get_size(gdkResource, fetchedWidth, fetchedHeight);
-			}
+			gdk_surface_get_size(gdkResource, fetchedWidth, fetchedHeight);
 			regionRect.x = 0;
 			regionRect.y = 0;
 			regionRect.width = fetchedWidth[0];
@@ -3432,8 +3428,15 @@ int gtk_gesture_press_event (long gesture, int n_press, double x, double y, long
 				}
 			}
 		}
-	} else if (n_press == 2) {
+	} else if (n_press >= 2) {
 		boolean cancelled = sendMouseEvent(SWT.MouseDoubleClick, eventButton, n_press, 0, false, eventTime, x, y, false, eventState);
+		
+		//Issue 344, DoubleClick event currently unsupported below sendMouseEvent(). Until DoubleClickSupport is 
+		//added this will catch failed events and try MouseDown instead.
+		if (cancelled) {
+			cancelled = sendMouseEvent(SWT.MouseDown, eventButton, n_press, 0, false, eventTime, x, y, false, eventState);
+		}
+		
 		if (!cancelled) {
 			result = GTK4.GTK_EVENT_SEQUENCE_CLAIMED;
 		}
@@ -3456,7 +3459,7 @@ int gtk_gesture_release_event (long gesture, int n_press, double x, double y, lo
 	lastInput.x = (int) eventX[0];
 	lastInput.y = (int) eventY[0];
 	if (containedInRegion(lastInput.x, lastInput.y)) return GTK4.GTK_EVENT_SEQUENCE_NONE;
-	boolean cancelled = sendMouseEvent(SWT.MouseUp, eventButton, display.clickCount, 0, false, eventTime, 0, 0, false, eventState);
+	boolean cancelled = sendMouseEvent(SWT.MouseUp, eventButton, display.clickCount, 0, false, eventTime, x, y, false, eventState);
 	int result = GTK4.GTK_EVENT_SEQUENCE_NONE;
 	if (!cancelled) {
 		result = GTK4.GTK_EVENT_SEQUENCE_CLAIMED;
@@ -5176,6 +5179,9 @@ void setBackground () {
  * <p>
  * Note: This operation is a hint and may be overridden by the platform.
  * </p>
+ * <p>
+ * Note: The background color can be overridden by setting a background image.
+ * </p>
  * @param color the new color (or null)
  *
  * @exception IllegalArgumentException <ul>
@@ -5281,6 +5287,9 @@ void setBackgroundGdkRGBA (long handle, GdkRGBA rgba) {
  * Note: This operation is a hint and may be overridden by the platform.
  * For example, on Windows the background of a Button cannot be changed.
  * </p>
+ * <p>
+ * Note: Setting a background image overrides a set background color.
+ * </p>
  * @param image the new image (or null)
  *
  * @exception IllegalArgumentException <ul>

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java

@@ -3072,6 +3072,9 @@ void setBackground () {
  * <p>
  * Note: This operation is a hint and may be overridden by the platform.
  * </p>
+ * <p>
+ * Note: The background color can be overridden by setting a background image.
+ * </p>
  * @param color the new color (or null)
  *
  * @exception IllegalArgumentException <ul>
@@ -3114,6 +3117,9 @@ private void _setBackground (Color color) {
  * Note: This operation is a hint and may be overridden by the platform.
  * For example, on Windows the background of a Button cannot be changed.
  * </p>
+ * <p>
+ * Note: Setting a background image overrides a set background color.
+ * </p>
  * @param image the new image (or null)
  *
  * @exception IllegalArgumentException <ul>

examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/BrowserTab.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -16,10 +16,9 @@
 
 import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTError;
@@ -118,18 +117,12 @@ void createExampleWidgets () {
 		} else if (lastText != null) {
 			browser.setText(lastText);
 		} else {
-			StringBuilder sb= new StringBuilder(300);
-
-			try (InputStream htmlStream = ControlExample.class.getResourceAsStream("browser-content.html");
-					BufferedReader br = new BufferedReader(new InputStreamReader(htmlStream))) {
-				int read = 0;
-				while ((read = br.read()) != -1)
-					sb.append((char) read);
+			try (InputStream htmlStream = ControlExample.class.getResourceAsStream("browser-content.html")) {
+				browser.setText( new String (htmlStream.readAllBytes(), StandardCharsets.UTF_8));
 			} catch (IOException e) {
 				log(e.getMessage());
+				browser.setText("Loading failed, see log for details!");
 			}
-			String text= sb.toString();
-			browser.setText(text);
 		}
 		lastText = lastUrl = null;
 	}
@@ -229,16 +222,6 @@ void disposeExampleWidgets () {
 		super.disposeExampleWidgets();
 	}
 
-	public static String getContents(InputStream in) throws IOException {
-		StringBuilder sb= new StringBuilder(300);
-		try (BufferedReader br= new BufferedReader(new InputStreamReader(in))) {
-			int read= 0;
-			while ((read= br.read()) != -1)
-				sb.append((char) read);
-		}
-		return sb.toString();
-	}
-
 	/**
 	 * Gets the list of custom event names.
 	 *

examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/browser-content.html

@@ -1,10 +1,11 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>SWT Browser</title>
 </head>
 
 <h3>About SWT Browser</h3>
-<p>You are looking at HTML content in a <b>Browser</b> widget.
+<p>You are looking at HTML content in a <b>Browser</b> widget.</p>
 <ul>
 <li>For a definition of the Browser widget, see:
 <a href="http://www.eclipse.org/swt/faq.php#whatisbrowser">http://www.eclipse.org/swt/faq.php#whatisbrowser</a></li>
@@ -14,7 +15,7 @@ <h3>About SWT Browser</h3>
 <a href="http://www.eclipse.org/swt/faq.php#howusewebkit">http://www.eclipse.org/swt/faq.php#howusewebkit</a></li>
 <li>For more examples that use a Browser widget, see BrowserExample, BrowserDemo, and WebBrowser:
 <a href="http://www.eclipse.org/swt/examples.php">http://www.eclipse.org/swt/examples.php</a></li>
-</ul></p>
+</ul>
 
 <h3>About SWT</h3>
 <p>For more information on SWT, including the Widget Gallery, Snippets, Examples, FAQ, Tools, Documentation

examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet62.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -40,12 +40,12 @@ public static void main (String [] args) {
 	final Shell shell = new Shell (display);
 	shell.setText("Snippet 62");
 	Listener listener = e -> {
-		String string = "Unknown";
-		switch (e.type) {
-			case SWT.MouseDown: string = "DOWN"; break;
-			case SWT.MouseMove: string = "MOVE"; break;
-			case SWT.MouseUp: string = "UP"; break;
-		}
+		String string = switch (e.type) {
+			case SWT.MouseDown -> "DOWN";
+			case SWT.MouseMove -> "MOVE";
+			case SWT.MouseUp -> "UP";
+			default -> "Unknown";
+		};
 		string +=": button: " + e.button + ", ";
 		string += "stateMask=0x" + Integer.toHexString (e.stateMask) + stateMask (e.stateMask) + ", x=" + e.x + ", y=" + e.y;
 		if ((e.stateMask & SWT.BUTTON1) != 0) string += " BUTTON1";

examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetLauncher.java

@@ -24,6 +24,8 @@
  */
 import java.io.*;
 import java.lang.reflect.*;
+import java.nio.charset.*;
+import java.nio.file.*;
 
 import org.eclipse.swt.*;
 
@@ -47,15 +49,13 @@ public static void main (String [] args) {
 			if (clazz != null) {
 				System.out.println("\n" + clazz.getName());
 				if (hasSource) {
-					File sourceFile = new File(sourceDir, className + ".java");
-					try (FileReader reader = new FileReader(sourceFile);){
-						char [] buffer = new char [(int)sourceFile.length()];
-						reader.read(buffer);
-						String source = String.valueOf(buffer);
+					Path sourceFile = Path.of(sourceDir.getPath(), className + ".java");
+					try {
+						String source = Files.readString(sourceFile, StandardCharsets.UTF_8);
 						int start = source.indexOf("package");
 						start = source.indexOf("/*", start);
 						int end = source.indexOf("* For a list of all");
-						System.out.println(source.substring(start, end-3));
+						System.out.println(source.substring(start+3, end-3));
 						boolean skip = false;
 						String platform = SWT.getPlatform();
 						if (source.contains("OpenGL")) {

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java

@@ -31,7 +31,7 @@
 import org.eclipse.swt.SWTError;
 import org.eclipse.swt.SWTException;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
 /**
  * Automated Test Suite for class {@link org.eclipse.swt.SWT}.
@@ -114,7 +114,7 @@ private List<String> signersFromClass(Class<?> classValue) {
 	 * GitHub Pull Requests.
 	 */
 	@Test
-	@EnabledIfSystemProperty(named = "org.eclipse.swt.tests.junit.disable.test_isLocal", matches = "true")
+	@DisabledIfSystemProperty(named = "org.eclipse.swt.tests.junit.disable.test_isLocal", matches = "true")
 	public void test_isLocal() {
 		String swtPath = pathFromClass(SWT.class);
 		String tstPath = pathFromClass(Test_org_eclipse_swt_SWT.class);

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
@@ -640,12 +641,8 @@ public void test_setBackgroundAlphaLorg_eclipse_swt_graphics_Color() {
 public void test_setBackgroundDisposedColorLorg_eclipse_swt_graphics_Color() {
 	Color color = new Color(255, 0, 0);
 	color.dispose();
-	try {
-		control.setBackground(color);
-		fail("setting a disposed color object with Control.setBackground(Color) should throw an exception");
-	} catch (IllegalArgumentException e) {
-		// expected, since the color is disposed
-	}
+	assertThrows("setting a disposed color object with Control.setBackground(Color) should throw an exception",
+			IllegalArgumentException.class, () -> control.setBackground(color));
 }
 @Test
 public void test_setBoundsIIII() {
@@ -665,12 +662,8 @@ public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
 	control.setBounds(new Rectangle(20, 30, 40, 50));
 	assertNotEquals(new Rectangle(10, 20, 30, 40), control.getBounds());
 
-	try {
-		control.setBounds(null);
-		fail("No exception thrown for rectangle == null");
-	}
-	catch (IllegalArgumentException e) {
-	}
+	assertThrows("No exception thrown for rectangle == null", IllegalArgumentException.class,
+			() -> control.setBounds(null));
 
 	control.setBounds(new Rectangle(10, 20, 30, 40));
 }
@@ -735,12 +728,9 @@ public void test_setFontLorg_eclipse_swt_graphics_Font() {
 
 	control.setFont(null);
 	font.dispose();
-	try {
-		control.setFont(font);
-		control.setFont(null);
-		fail("No exception thrown for disposed font");
-	} catch (IllegalArgumentException e) {
-	}
+	Font f = font;
+	assertThrows("No exception thrown for disposed font", IllegalArgumentException.class, () -> control.setFont(f));
+	control.setFont(null);
 }
 @Test
 public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
@@ -775,12 +765,8 @@ public void test_setForegroundAlphaLorg_eclipse_swt_graphics_Color() {
 public void test_setForegroundDisposedColorLorg_eclipse_swt_graphics_Color() {
 	Color color = new Color(255, 0, 0);
 	color.dispose();
-	try {
-		control.setForeground(color);
-		fail("setting a disposed color object with Control.setForeground(Color) should throw an exception");
-	} catch (IllegalArgumentException e) {
-		// expected, since the color is disposed
-	}
+	assertThrows("setting a disposed color object with Control.setForeground(Color) should throw an exception",
+			IllegalArgumentException.class, () -> control.setForeground(color));
 }
 @Test
 public void test_setLayoutDataLjava_lang_Object() {
@@ -808,12 +794,8 @@ public void test_setLocationII() {
 }
 @Test
 public void test_setLocationLorg_eclipse_swt_graphics_Point() {
-	try {
-		control.setLocation(null);
-		fail("No exception thrown for location == null");
-	}
-	catch (IllegalArgumentException e) {
-	}
+	assertThrows("No exception thrown for location == null", IllegalArgumentException.class,
+			() -> control.setLocation(null));
 
 	Point loc = new Point(30, 40);
 	control.setLocation(loc);
@@ -881,12 +863,7 @@ public void test_setSizeLorg_eclipse_swt_graphics_Point() {
 	control.setSize(new Point(30, 40));
 	assertEquals(new Point(30, 40), control.getSize());
 
-	try {
-		control.setSize(null);
-		fail("No exception thrown for size == null");
-	}
-	catch (IllegalArgumentException e) {
-	}
+	assertThrows("No exception thrown for size == null", IllegalArgumentException.class, () -> control.setSize(null));
 
 	control.setSize(new Point(0, 0));
 
@@ -921,12 +898,8 @@ public void test_toControlII() {
 public void test_toControlLorg_eclipse_swt_graphics_Point() {
 	Point controlCoords = control.toControl(new Point(0, 0));
 	assertEquals(new Point(0, 0), control.toDisplay(controlCoords));
-	try {
-		control.toControl(null);
-		fail("No exception thrown for size == null");
-	}
-	catch (IllegalArgumentException e) {
-	}
+	assertThrows("No exception thrown for point == null", IllegalArgumentException.class,
+			() -> control.toControl(null));
 }
 @Test
 public void test_toDisplayII() {
@@ -937,12 +910,8 @@ public void test_toDisplayII() {
 public void test_toDisplayLorg_eclipse_swt_graphics_Point() {
 	Point displayCoords = control.toDisplay(new Point(0, 0));
 	assertEquals(new Point(0, 0), control.toControl(displayCoords));
-	try {
-		control.toDisplay(null);
-		fail("No exception thrown for size == null");
-	}
-	catch (IllegalArgumentException e) {
-	}
+	assertThrows("No exception thrown for display == null", IllegalArgumentException.class,
+			() -> control.toDisplay(null));
 }
 @Test
 public void test_traverseI() {