From 48b49ada28dbf2794e94330f24b91899bd558c4d Mon Sep 17 00:00:00 2001 From: Kirill Prazdnikov Date: Wed, 14 Aug 2024 21:18:15 +0300 Subject: [PATCH] rework DiffDemoJs --- .../java/org/sudu/experiments/editor/DiffDemoJs.java | 10 +++++----- .../java/org/sudu/experiments/diff/FileDiffScene.java | 9 +++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/demo-edit-js/src/main/java/org/sudu/experiments/editor/DiffDemoJs.java b/demo-edit-js/src/main/java/org/sudu/experiments/editor/DiffDemoJs.java index edc16ea4b..3893a09be 100644 --- a/demo-edit-js/src/main/java/org/sudu/experiments/editor/DiffDemoJs.java +++ b/demo-edit-js/src/main/java/org/sudu/experiments/editor/DiffDemoJs.java @@ -2,7 +2,7 @@ import org.sudu.experiments.SceneApi; import org.sudu.experiments.SplitInfo; -import org.sudu.experiments.diff.Diff0; +import org.sudu.experiments.diff.FileDiffScene; import org.sudu.experiments.fonts.Fonts; import org.sudu.experiments.js.Fetch; import org.sudu.experiments.js.JsHelper; @@ -11,16 +11,16 @@ import java.util.function.Consumer; -public class DiffDemoJs extends Diff0 { +public class DiffDemoJs extends FileDiffScene { public DiffDemoJs(SceneApi api) { super(api); setReadonly(true); - load(this::setLeftModel, "ClassL.java"); - load(this::setRightModel, "ClassR.java"); + load(model -> left().setModel(model), "ClassL.java"); + load(model -> right().setModel(model), "ClassR.java"); } @Override - protected String[] menuFonts() { + public String[] menuFonts() { return Fonts.editorFonts(true); } diff --git a/demo-edit/src/main/java/org/sudu/experiments/diff/FileDiffScene.java b/demo-edit/src/main/java/org/sudu/experiments/diff/FileDiffScene.java index 07ced34af..fb304b4ed 100644 --- a/demo-edit/src/main/java/org/sudu/experiments/diff/FileDiffScene.java +++ b/demo-edit/src/main/java/org/sudu/experiments/diff/FileDiffScene.java @@ -1,6 +1,7 @@ package org.sudu.experiments.diff; import org.sudu.experiments.SceneApi; +import org.sudu.experiments.editor.EditorComponent; import org.sudu.experiments.editor.ThemeControl; import org.sudu.experiments.editor.WindowScene; import org.sudu.experiments.editor.ui.colors.EditorColorScheme; @@ -20,6 +21,14 @@ public String[] menuFonts() { return Fonts.editorFonts(true); } + protected EditorComponent left() { + return w.rootView.editor1; + } + + protected EditorComponent right() { + return w.rootView.editor2; + } + @Override public void applyTheme(EditorColorScheme t) { theme = t;