Rename asObservable to asFlow

Author: nedtwigg

durian-swt/src/main/java/com/diffplug/common/swt/SwtThread.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,7 @@
  */
 package com.diffplug.common.swt;
 
-
+import com.diffplug.common.rx.IFlowable;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -35,7 +35,7 @@
  *
  * When annotated on a parameter or field, it
  * must be either an {@link rx.Observable},
- * {@link com.diffplug.common.rx.IObservable}, or a
+ * {@link IFlowable}, or a
  * {@link java.util.concurrent.CompletionStage}, and
  * it indicates that the given code should only be
  * set and listened to from SWT.

durian-swt/src/main/java/com/diffplug/common/swt/jface/ViewerMisc.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.Converter;
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.collect.ImmutableList;
@@ -55,7 +54,7 @@ public static <T> void singleSelection(StructuredViewer viewer, RxBox<Optional<T
 			box.set(Optional.ofNullable(selected));
 		});
 		// set the selection when the box changes
-		SwtExec.immediate().guardOn(viewer.getControl()).subscribe(box.asObservable(), optional -> {
+		SwtExec.immediate().guardOn(viewer.getControl()).subscribe(box, optional -> {
 			if (optional.isPresent()) {
 				viewer.setSelection(new StructuredSelection(optional.get()));
 			} else {

durian-swt/src/main/java/com/diffplug/common/swt/widgets/RadioGroup.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.widgets;
 
-
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.collect.BiMap;
 import com.diffplug.common.collect.HashBiMap;
@@ -84,7 +83,7 @@ public RxBox<T> buildOn(Composite cmp) {
 
 		// when the selection is changed, set the button
 		Button firstBtn = Iterables.get(mapping.keySet(), 0);
-		SwtExec.immediate().guardOn(firstBtn).subscribe(selection.asObservable(), obj -> {
+		SwtExec.immediate().guardOn(firstBtn).subscribe(selection, obj -> {
 			Button selectedBtn = mapping.inverse().get(obj);
 			for (Button btn : mapping.keySet()) {
 				btn.setSelection(btn == selectedBtn);

durian-swt/src/test/java/com/diffplug/common/swt/widgets/RadioGroupTest.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.widgets;
 
-
 import com.diffplug.common.rx.RxBox;
 import com.diffplug.common.swt.InteractiveTest;
 import com.diffplug.common.swt.Layouts;
@@ -65,7 +64,7 @@ public void test() {
 							readLbl.setText("Read selection: ");
 
 							Text readTxt = new Text(debugParent, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY);
-							SwtExec.immediate().guardOn(readTxt).subscribe(selection.asObservable(), option -> {
+							SwtExec.immediate().guardOn(readTxt).subscribe(selection, option -> {
 								readTxt.setText(option.name());
 							});