Update to support new Nexus Utilities version

zyneonstudios · Dec 22, 2024 · 415884d · 415884d
1 parent 1753ea5
commit 415884d
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Nexus Desktop `2024.9`
+# Nexus Desktop `2024.12.6`
 
 ### Java 21 library designed to simplify the development of Java Desktop apps.<br>Based on [Nexus Utilities](https://github.com/zyneonstudios/nexus-utilities)
 
@@ -11,13 +11,9 @@
 ---
 
 ### Contents
-- Everything from [Nexus Utilities Contents](https://github.com/zyneonstudios/nexus-utilities#contents)
-- [NexusDesktop: Default initialization class](https://zyneonstudios.github.io/nexus-desktop-base/apidocs/com/zyneonstudios/nexus/desktop/NexusDesktop)
-- [Frame](https://zyneonstudios.github.io/nexus-desktop-base/apidocs/com/zyneonstudios/nexus/desktop/frame/package-summary)
-  - [NexusFrame: Base frame](https://zyneonstudios.github.io/nexus-desktop-base/apidocs/com/zyneonstudios/nexus/desktop/frame/NexusFrame)
-  - [Web](https://zyneonstudios.github.io/nexus-desktop-base/apidocs/com/zyneonstudios/nexus/desktop/frame/web/package-summary)
-    - [NexusWebFrame: Chromium frame with optimized settings](https://zyneonstudios.github.io/nexus-desktop-base/apidocs/com/zyneonstudios/nexus/desktop/frame/web/NexusWebFrame)
-    - [NexusWebSetup: Setup for JCEF](https://zyneonstudios.github.io/nexus-desktop-base/apidocs/com/zyneonstudios/nexus/desktop/frame/web/NexusWebSetup)
+See Javadocs:
+- [NexusUtilities](https://zyneonstudios.github.io/nexus-utilities/apidocs/)
+- [NexusDesktop (this)](https://zyneonstudios.github.io/nexus-desktop-base/apidocs/)
 
 ---
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.zyneonstudios.nexus</groupId>
     <artifactId>base-desktop</artifactId>
-    <version>2024.12.6-beta.1</version>
+    <version>2024.12.6</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.zyneonstudios.nexus</groupId>
             <artifactId>base-utilities</artifactId>
-            <version>2024.12-beta.1</version>
+            <version>2024.12.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/events/AsyncWebFrameConnectorEvent.java b/src/main/java/com/zyneonstudios/nexus/desktop/events/AsyncWebFrameConnectorEvent.java
@@ -1,17 +1,36 @@
 package com.zyneonstudios.nexus.desktop.events;
 
 import com.zyneonstudios.nexus.desktop.frame.web.NexusWebFrame;
+import com.zyneonstudios.nexus.utilities.events.Event;
 
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
-public abstract class AsyncWebFrameConnectorEvent implements Event{
+public abstract class AsyncWebFrameConnectorEvent implements Event {
 
     private final UUID uuid = UUID.randomUUID();
     private final NexusWebFrame frame;
+    private String message;
 
-    public AsyncWebFrameConnectorEvent(NexusWebFrame frame) {
+    public AsyncWebFrameConnectorEvent(NexusWebFrame frame, String message) {
         this.frame = frame;
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public boolean execute() {
+        CompletableFuture.runAsync(() -> {
+            resolveMessage(message);
+        });
+        return true;
     }
 
     @Override
@@ -23,11 +42,5 @@ public NexusWebFrame getFrame() {
         return frame;
     }
 
-    public final void resolveAsync(String message) {
-        CompletableFuture.runAsync(() -> {resolveMessage(message);});
-    }
-
-    public void resolveMessage(String message) {
-        CompletableFuture.runAsync(() -> {});
-    };
+    protected abstract void resolveMessage(String message);
 }
diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/events/Event.java b/src/main/java/com/zyneonstudios/nexus/desktop/events/Event.java
diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/events/WebFrameConnectorEvent.java b/src/main/java/com/zyneonstudios/nexus/desktop/events/WebFrameConnectorEvent.java
@@ -1,16 +1,32 @@
 package com.zyneonstudios.nexus.desktop.events;
 
 import com.zyneonstudios.nexus.desktop.frame.web.NexusWebFrame;
+import com.zyneonstudios.nexus.utilities.events.Event;
 
 import java.util.UUID;
 
-public abstract class WebFrameConnectorEvent implements Event{
+public abstract class WebFrameConnectorEvent implements Event {
 
     private final UUID uuid = UUID.randomUUID();
     private final NexusWebFrame frame;
+    private String message;
 
-    public WebFrameConnectorEvent(NexusWebFrame frame) {
+    public WebFrameConnectorEvent(NexusWebFrame frame, String message) {
         this.frame = frame;
+        this.message = message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public final boolean execute() {
+        return resolveMessage(message);
+    }
+
+    public String getMessage() {
+        return message;
     }
 
     @Override
@@ -22,5 +38,5 @@ public NexusWebFrame getFrame() {
         return frame;
     }
 
-    public abstract boolean resolveMessage(String message);
+    protected abstract boolean resolveMessage(String message);
 }
diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/frame/web/NexusWebFrame.java b/src/main/java/com/zyneonstudios/nexus/desktop/frame/web/NexusWebFrame.java
@@ -43,16 +43,20 @@ public boolean onConsoleMessage(CefBrowser browser, CefSettings.LogSeverity leve
                 if (message.startsWith("[CONNECTOR] async.")) {
                     String request = message.replace("[CONNECTOR] async.", "");
                     if(asyncWebFrameConnectorEvent!=null) {
-                        asyncWebFrameConnectorEvent.resolveAsync(request);
+                        asyncWebFrameConnectorEvent.setMessage(request);
+                        asyncWebFrameConnectorEvent.execute();
                     } else if(webFrameConnectorEvent!=null) {
-                        webFrameConnectorEvent.resolveMessage(request);
+                        webFrameConnectorEvent.setMessage(request);
+                        webFrameConnectorEvent.execute();
                     }
                 } else if (message.startsWith("[CONNECTOR] ")) {
                     String request = message.replace("[CONNECTOR] ", "");
                     if(webFrameConnectorEvent!=null) {
-                        webFrameConnectorEvent.resolveMessage(request);
+                        webFrameConnectorEvent.setMessage(request);
+                        webFrameConnectorEvent.execute();
                     } else if(asyncWebFrameConnectorEvent!=null) {
-                        asyncWebFrameConnectorEvent.resolveAsync(request);
+                        asyncWebFrameConnectorEvent.setMessage(request);
+                        asyncWebFrameConnectorEvent.execute();
                     }
                 } else if (message.startsWith("[LOG] ")) {
                     NexusDesktop.getLogger().log(message.replace("[LOG] ","[FRAME] "));

diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/frame/web/NexusWebSetup.java b/src/main/java/com/zyneonstudios/nexus/desktop/frame/web/NexusWebSetup.java
@@ -1,5 +1,6 @@
 package com.zyneonstudios.nexus.desktop.frame.web;
 
+import com.zyneonstudios.nexus.desktop.NexusDesktop;
 import me.friwi.jcefmaven.CefAppBuilder;
 import org.cef.CefApp;
 import org.cef.CefClient;
@@ -101,6 +102,7 @@ public boolean onBeforePopup(CefBrowser browser, CefFrame frame, String target_u
             });
             return true;
         } catch (Exception e) {
+            NexusDesktop.getLogger().err("Failed to finish the web setup: "+e.getMessage());
             return false;
         }
     }