- Fix for java 11

Author: Aliaksandr.Shpak

README.md

@@ -1,5 +1,6 @@
 # kafka_data_viewer
-Desctop UI Tool that providing ability to read and publish kafka records.
+
+Desktop UI Tool that providing ability to read and publish kafka records.
 
 # Description
 
@@ -19,17 +20,32 @@ Supported formats are:
 - GZIP
 - Avro
 
+# Download
+
+The read-to-use bundle can be downloaded at github releases page:
+
+https://github.com/alshpak/kafka_data_viewer/releases
+
 # How to run
 
 `java -jar <jar_name> [-n defaultGroupName]`
 
 # Java 11 support
 
-The tool is implemented on JavaFX.
+The tool is implemented on JavaFX that is not part of Java 11 anymore.
+
+In order to run it on Java 11 and you need to add JFX module in command line:
+
+**Download JavaFX SDK**
+ 
+Link to OpenJFX: https://openjfx.io/
+
+Link to Download: https://gluonhq.com/products/javafx/
+
+**Run program with JavaFX module**
 
-In order to run it on Java 11 and later follow the instruction:
+`java --module-path <path.to>/javafx-sdk-11/lib/ --add-modules=javafx.controls -jar <jar_name> [-n defaultGroupName]`
 
-- Download JavaFX - https://gluonhq.com/products/javafx/
+The example on windows
 
-- Run program with JavaFX module\
-`java --module-path <path.to>/javafx-sdk-11/lib/ --add-modules=javafx.controls <package.name>.JavaFX11 -jar <jar_name> [-n defaultGroupName]`
+`java --module-path "C:\Program Files\Java\javafx-sdk-11.0.2\lib" --add-modules=javafx.controls -jar kafka_data_viewer-all-<version>.jar`

build.gradle

@@ -58,6 +58,9 @@ classes {
 
 sourceSets {
     main {
+        java {
+            srcDirs = ['src/main/java']
+        }
         scala {
             srcDirs = ['src/main/scala']
         }

gradle.properties

@@ -1,3 +1,3 @@
-version = 0.1.4
+version = 0.1.5
 url = https://api.github.com/repos/alshpak/kafka_data_viewer/releases/latest
 update_url = https://github.com/alshpak/kafka_data_viewer/releases

src/main/java/devtools/lib/rxui/FxApp.java

@@ -0,0 +1,20 @@
+package devtools.lib.rxui;
+
+import java.util.function.Consumer;
+
+import javafx.application.Application;
+import javafx.stage.Stage;
+
+public class FxApp extends Application {
+
+    public static Consumer<Stage> appRunner;
+
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+        appRunner.accept(primaryStage);
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+}

src/main/scala/devtools/lib/rxui/FxRender.scala

@@ -26,6 +26,7 @@ import javafx.stage.{Modality, Stage, StageStyle}
 
 import devtools.lib.rxext.ListChangeOps.{AddItems, InsertItems, RemoveItemObjs, RemoveItems, SetList}
 import devtools.lib.rxext.{Observable, Subject}
+import devtools.lib.rxui.FxRender.primaryStage
 
 object FxRender {
 
@@ -709,7 +710,17 @@ object FxRender {
         override def runApp(root: UiWidget, postAction: UiRenderer => Unit = null): Unit = {
             FxRender.rootContent = root
             FxRender.postAction = postAction
-            LauncherImpl.launchApplication(classOf[App], Array())
+            //LauncherImpl.launchApplication(classOf[App], Array())
+            FxApp.appRunner = (primaryStage: Stage) => startApp(primaryStage)
+            FxApp.main(Array())
+        }
+
+        def startApp(primaryStage: Stage): Unit = {
+            FxRender.primaryStage = primaryStage
+            val rootContent = FxRender.renderers.renderer(FxRender.rootContent)(FxRender.renderers).render()
+            applyContentToState(rootContent, primaryStage, fullScreen = true)
+            primaryStage.show()
+            if (postAction != null) postAction(FxRender.renderers)
         }
 
         override def runModal(content: UiWidget, hideTitle: Boolean = false, close: Option[Subject[_ >: Unit]] = None): Unit = {
@@ -797,15 +808,4 @@ object FxRender {
     var primaryStage: Stage = _
     var postAction: UiRenderer => Unit = _
 
-    class App extends Application {
-        override def start(primaryStage: Stage): Unit = {
-            FxRender.primaryStage = primaryStage
-            val rootContent = FxRender.renderers.renderer(FxRender.rootContent)(FxRender.renderers).render()
-            applyContentToState(rootContent, primaryStage, fullScreen = true)
-            primaryStage.show()
-            if (postAction != null) postAction(FxRender.renderers)
-        }
-    }
-
-
 }