diff --git a/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsFolderDiffSelection.java b/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsFolderDiffSelection.java index 5581d9cf7..4b6fd09dd 100644 --- a/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsFolderDiffSelection.java +++ b/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsFolderDiffSelection.java @@ -1,6 +1,5 @@ package org.sudu.experiments.diff; -import org.sudu.experiments.js.JsFunctions; import org.teavm.interop.NoSideEffects; import org.teavm.jso.JSBody; import org.teavm.jso.JSProperty; @@ -36,11 +35,5 @@ public static JsFolderDiffSelection create( ? create(JSString.valueOf(s.path), s.isLeft, s.isFolder, s.isOrphan) : null; } - - static FolderDiffRootView.SelectionListener toJava( - JsFunctions.Consumer callback - ) { - return s -> callback.f(create(s)); - } } } diff --git a/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsRemoteFolderDiff.java b/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsRemoteFolderDiff.java index f68098002..646d846f2 100644 --- a/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsRemoteFolderDiff.java +++ b/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsRemoteFolderDiff.java @@ -16,12 +16,4 @@ public interface JsRemoteFolderDiff extends JsFolderDiff { JsDisposable onControllerUpdate( JsFunctions.Consumer callback ); - - @Deprecated - JsFolderDiffSelection getSelected(); - - @Deprecated - JsDisposable onSelectionChanged( - JsFunctions.Consumer callback - ); } diff --git a/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsRemoteFolderDiff0.java b/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsRemoteFolderDiff0.java index 297cd073e..a28ab4e14 100644 --- a/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsRemoteFolderDiff0.java +++ b/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/JsRemoteFolderDiff0.java @@ -115,21 +115,6 @@ public JsDisposable onControllerUpdate( return JsDisposable.of(d); } - @Override - public JsFolderDiffSelection getSelected() { - var s = folderDiff.getSelected(); - return JsFolderDiffSelection.H.create(s); - } - - @Override - public JsDisposable onSelectionChanged( - JsFunctions.Consumer callback - ) { - var h = JsFolderDiffSelection.H.toJava(callback); - var d = rootView().selectionListeners.disposableAdd(h); - return JsDisposable.of(d); - } - private FolderDiffRootView rootView() { return folderDiff.rootView; } diff --git a/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/RemoteFolderDiffWindow.java b/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/RemoteFolderDiffWindow.java index 826011d66..e580f4409 100644 --- a/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/RemoteFolderDiffWindow.java +++ b/demo-edit-es-module/src/main/java/org/sudu/experiments/diff/RemoteFolderDiffWindow.java @@ -386,6 +386,7 @@ void leftSelectedChanged(int idx) { rootView.right.clearSelection(); } rootView.fireSelectionChanged(getSelected(true)); + fireControllerEvent(controller); } void rightSelectedChanged(int idx) { @@ -394,6 +395,7 @@ void rightSelectedChanged(int idx) { rootView.left.clearSelection(); } rootView.fireSelectionChanged(getSelected(false)); + fireControllerEvent(controller); } String replaceSlashes(String path) { @@ -451,6 +453,7 @@ public void refresh() { void fireControllerEvent(JsDiffViewController source) { var list = controllerListeners.array(); +// System.out.println("RemoteFolderDiffWindow.fireControllerEvent: " + list.length + " listeners"); for (var listener : list) { listener.onEvent(source); }