Print more

Author: laeubi

binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/.api_filters

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.swt.gtk.linux.x86_64" version="2">
-    <resource path="Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java" type="org.eclipse.swt.widgets.Composite">
-        <filter id="576778288">
+    <resource path="Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BusyIndicator.java" type="org.eclipse.swt.custom.BusyIndicator">
+        <filter id="336658481">
             <message_arguments>
-                <message_argument value="Scrollable"/>
-                <message_argument value="Composite"/>
+                <message_argument value="org.eclipse.swt.custom.BusyIndicator"/>
+                <message_argument value="onWake"/>
             </message_arguments>
         </filter>
     </resource>
     <resource path="Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataAtSizeProvider.java" type="org.eclipse.swt.graphics.ImageDataAtSizeProvider">
-        <filter id="403804204" comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable">
+        <filter comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable" id="403804204">
             <message_arguments>
                 <message_argument value="org.eclipse.swt.graphics.ImageDataAtSizeProvider"/>
                 <message_argument value="getDefaultSize()"/>
             </message_arguments>
         </filter>
-        <filter id="1211105284" comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable">
+        <filter comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable" id="403804204">
             <message_arguments>
-                <message_argument value="getDefaultSize()"/>
+                <message_argument value="org.eclipse.swt.graphics.ImageDataAtSizeProvider"/>
+                <message_argument value="getImageData(int, int)"/>
             </message_arguments>
         </filter>
-        <filter id="403804204" comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable">
+        <filter comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable" id="1211105284">
             <message_arguments>
-                <message_argument value="org.eclipse.swt.graphics.ImageDataAtSizeProvider"/>
-                <message_argument value="getImageData(int, int)"/>
+                <message_argument value="getDefaultSize()"/>
             </message_arguments>
         </filter>
-        <filter id="1211105284" comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable">
+        <filter comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable" id="1211105284">
             <message_arguments>
                 <message_argument value="getImageData(int, int)"/>
             </message_arguments>

bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BusyIndicator.java

@@ -17,6 +17,7 @@
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
+import java.util.function.*;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
@@ -33,6 +34,14 @@ public class BusyIndicator {
 	private static final AtomicInteger nextBusyId = new AtomicInteger();
 	static final String BUSYID_NAME = "SWT BusyIndicator"; //$NON-NLS-1$
 	static final String BUSY_CURSOR = "SWT BusyIndicator Cursor"; //$NON-NLS-1$
+	/**
+	 * @since 3.133
+	 */
+	public static Runnable onWake;
+	/**
+	 * @since 3.133
+	 */
+	public static Consumer<Exception> onWakeError;
 
 	/**
 	 * Runs the given <code>Runnable</code> while providing
@@ -111,8 +120,14 @@ public static void showWhile(Future<?> future) {
 						stage.handle((nil1, nil2) -> {
 							if (!display.isDisposed()) {
 								try {
+									if (onWake!=null) {
+										onWake.run();
+									}
 									display.wake();
 								} catch (SWTException e) {
+									if (onWakeError!=null) {
+										onWakeError.accept(e);
+									}
 									// ignore then, this can happen due to the async nature between our check for
 									// disposed and the actual call to wake the display can be disposed
 								}

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

@@ -69,6 +69,8 @@ private static class SwtInternalStateTracker {
 		volatile long lastSleepExitTime = 0;
 
 		SwtInternalStateTracker(Display display) {
+			BusyIndicator.onWake = () -> logEvent("Called Wake from inside call");
+			BusyIndicator.onWakeError = e -> logEvent("Error On wake "+e);
 			this.display = display;
 			initReflection();
 			logEvent("SwtInternalStateTracker initialized");
@@ -213,6 +215,7 @@ private static class TestState {
 		final AtomicBoolean asyncExec2Ran = new AtomicBoolean(false);
 		final AtomicBoolean asyncExec3Ran = new AtomicBoolean(false);
 
+
 		@Override
 		public String toString() {
 			StringBuilder sb = new StringBuilder();
@@ -387,6 +390,7 @@ public void testShowWhile() {
 				tracker.logEvent("Test completed successfully");
 			} finally {
 				watchdog.cancel(false);
+				state.swtTracker.printEventLog();
 			}
 		}
 	}
@@ -454,7 +458,6 @@ public void testShowWhileWithFuture() {
 				tracker.logEvent("About to call BusyIndicator.showWhile(future)");
 				tracker.logEvent("State before showWhile: wake=" + tracker.getWakeFlag() + ", syncEmpty="
 						+ tracker.isSynchronizerEmpty());
-
 				BusyIndicator.showWhile(future);
 
 				tracker.logEvent("BusyIndicator.showWhile(future) returned");
@@ -468,6 +471,7 @@ public void testShowWhileWithFuture() {
 				tracker.logEvent("Test completed successfully");
 			} finally {
 				watchdog.cancel(false);
+				state.swtTracker.printEventLog();
 			}
 		}
 	}