We don't need Rx.INSTANCE any more.

Author: nedtwigg

durian-swt/src/main/java/com/diffplug/common/swt/SwtRx.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 DiffPlug
+ * Copyright (C) 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.common.swt;
 
-
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.common.primitives.Ints;
@@ -51,30 +50,30 @@ public class SwtRx {
 
 	/** Subscribes to the given widget and pipes the events to an {@link Flow}<{@link Event}>. */
 	public static @SwtThread Flow<Event> addListener(Widget widget, Stream<Integer> events) {
-		MutableSharedFlow<Event> observable = Rx.INSTANCE.createEmitFlow();
+		MutableSharedFlow<Event> observable = Rx.createEmitFlow();
 		events.forEach(event -> widget.addListener(event, e -> {
-			Rx.INSTANCE.emit(observable, e);
+			Rx.emit(observable, e);
 		}));
 		return observable;
 	}
 
 	/** Returns an {@link Flow}<{@link Point}> of the right-click mouse-up on the given control, in global coordinates. */
 	public static @SwtThread Flow<Point> rightClickGlobal(Control ctl) {
-		MutableSharedFlow<Point> observable = Rx.INSTANCE.createEmitFlow();
+		MutableSharedFlow<Point> observable = Rx.createEmitFlow();
 		ctl.addListener(MouseClick.RIGHT_CLICK_EVENT, e -> {
 			if (e.button == MouseClick.RIGHT.code()) {
-				Rx.INSTANCE.emit(observable, ctl.toDisplay(e.x, e.y));
+				Rx.emit(observable, ctl.toDisplay(e.x, e.y));
 			}
 		});
 		return observable;
 	}
 
 	/** Returns an {@link Flow}<{@link Point}> of the right-click mouse-up on the given control, in local coordinates. */
 	public static @SwtThread Flow<Point> rightClickLocal(Control ctl) {
-		MutableSharedFlow<Point> observable = Rx.INSTANCE.createEmitFlow();
+		MutableSharedFlow<Point> observable = Rx.createEmitFlow();
 		ctl.addListener(MouseClick.RIGHT_CLICK_EVENT, e -> {
 			if (e.button == MouseClick.RIGHT.code()) {
-				Rx.INSTANCE.emit(observable, new Point(e.x, e.y));
+				Rx.emit(observable, new Point(e.x, e.y));
 			}
 		});
 		return observable;

durian-swt/src/main/java/com/diffplug/common/swt/widgets/NoBorderBtn.java

@@ -38,7 +38,7 @@ public class NoBorderBtn extends ControlWrapper.AroundControl<Canvas> {
 	private Image img = null;
 	private Rectangle imgBounds;
 	private boolean enabled = true;
-	private MutableSharedFlow<NoBorderBtn> selection = Rx.INSTANCE.createEmitFlow();
+	private MutableSharedFlow<NoBorderBtn> selection = Rx.createEmitFlow();
 
 	public NoBorderBtn(Composite parent) {
 		super(new Canvas(parent, SWT.NONE));

durian-swt/src/test/java/com/diffplug/common/swt/ShellsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright (C) 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.common.swt;
 
-
 import java.util.function.Consumer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
@@ -27,7 +26,7 @@
 
 @Category(InteractiveTest.class)
 public class ShellsTest {
-	private static final int UNIT = SwtMisc.systemFontWidth() * 20;
+	private static final int UNIT = SwtMisc.systemFontWidthTimes(20);
 
 	@Test
 	public void testPack() {

durian-swt/src/test/java/com/diffplug/common/swt/SwtExecProfile.java

@@ -131,7 +131,7 @@ public void addSwtExec(String name, SwtExec underTest) {
 		public void run(Widget guard) {
 			JuxtaProfiler profiler = new JuxtaProfiler();
 			profiler.addTestNanoWrap2Sec("control", () -> {
-				MutableSharedFlow<Integer> subject = Rx.INSTANCE.createEmitFlow();
+				MutableSharedFlow<Integer> subject = Rx.createEmitFlow();
 				drain(subject);
 			});
 			toProfile.forEach((name, underTest) -> {
@@ -141,7 +141,7 @@ public void run(Widget guard) {
 
 					@Override
 					protected void init() throws Throwable {
-						subject = Rx.INSTANCE.createEmitFlow();
+						subject = Rx.createEmitFlow();
 						sub = underTest.guardOn(guard).subscribeDisposable(subject, val -> {});
 					}
 

durian-swt/src/test/java/com/diffplug/common/swt/jface/ViewerMiscTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright (C) 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.common.swt.jface;
 
-
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.common.collect.ImmutableList;
@@ -175,7 +174,7 @@ public void testLazyContentProviderFile() {
 					.setLabelProviderText(File::getName);
 			format.addColumn().setText("Last Modified")
 					.setLabelProviderText(file -> new Date(file.lastModified()).toString())
-					.setLayoutPixel(SwtMisc.systemFontWidth() * new Date().toString().length());
+					.setLayoutPixel(SwtMisc.systemFontWidthTimes(new Date().toString()));
 
 			// create the tree viewer
 			TreeViewer viewer = format.buildTree(cmp);
@@ -203,7 +202,7 @@ public void testLazyContentProviderPath() {
 					.setLabelProviderText(path -> path.getFileName().toString());
 			format.addColumn().setText("Last Modified")
 					.setLabelProviderText(path -> Errors.suppress().getWithDefault(() -> Files.getLastModifiedTime(path).toString(), ""))
-					.setLayoutPixel(SwtMisc.systemFontWidth() * new Date().toString().length());
+					.setLayoutPixel(SwtMisc.systemFontWidthTimes(new Date().toString()));
 
 			// create the tree viewer
 			TreeViewer viewer = format.buildTree(cmp);