Get N(exus)Frame as JFrame

zyneonstudios · Jan 23, 2025 · ac38fbf · ac38fbf
1 parent 091b5cc
commit ac38fbf
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.zyneonstudios.nexus</groupId>
     <artifactId>base-desktop</artifactId>
-    <version>2025.1</version>
+    <version>2025.1.1</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>

diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/frame/NFrame.java b/src/main/java/com/zyneonstudios/nexus/desktop/frame/NFrame.java
@@ -70,4 +70,8 @@ public void setTitlebar(String title, Color background, Color foreground, List<I
         setTitle(title);
         setIconImages(icons);
     }
+
+    public JFrame getAsJFrame() {
+        return this;
+    }
 }
diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/frame/nexus/NexusFrame.java b/src/main/java/com/zyneonstudios/nexus/desktop/frame/nexus/NexusFrame.java
@@ -1,8 +1,5 @@
 package com.zyneonstudios.nexus.desktop.frame.nexus;
 
-import com.zyneonstudios.nexus.desktop.NexusDesktop;
-import com.zyneonstudios.nexus.desktop.frame.web.NexusWebSetup;
-
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
@@ -175,13 +172,7 @@ public void setTitle(String title) {
         super.setTitle(title);
     }
 
-    public static void main(String[] args) {
-        NexusDesktop.init();
-        NexusWebSetup setup = new NexusWebSetup("libs/jcef/");
-        setup.setup();
-        NexusWebFrame f = new NexusWebFrame(setup.getWebClient(),"https://google.com",false);
-        f.setVisible(true);
-        f.setTitle("Test");
-        f.setTitle("NEXUS CUSTOM FRAME");
+    public JFrame getAsJFrame() {
+        return this;
     }
 }
diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/frame/nexus/NexusWebFrame.java b/src/main/java/com/zyneonstudios/nexus/desktop/frame/nexus/NexusWebFrame.java
@@ -3,6 +3,7 @@
 import com.zyneonstudios.nexus.desktop.NexusDesktop;
 import com.zyneonstudios.nexus.desktop.events.AsyncWebFrameConnectorEvent;
 import com.zyneonstudios.nexus.desktop.events.WebFrameConnectorEvent;
+import com.zyneonstudios.nexus.desktop.frame.web.WebFrame;
 import org.cef.CefClient;
 import org.cef.CefSettings;
 import org.cef.browser.CefBrowser;
@@ -11,7 +12,7 @@
 
 import java.awt.*;
 
-public class NexusWebFrame extends NexusFrame {
+public class NexusWebFrame extends NexusFrame implements WebFrame {
 
     private final CefBrowser browser;
     private boolean browserFocus;

diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/frame/web/NWebFrame.java b/src/main/java/com/zyneonstudios/nexus/desktop/frame/web/NWebFrame.java
@@ -12,7 +12,7 @@
 
 import java.awt.*;
 
-public class NWebFrame extends NFrame {
+public class NWebFrame extends NFrame implements WebFrame {
 
     private final CefBrowser browser;
     private boolean browserFocus;

diff --git a/src/main/java/com/zyneonstudios/nexus/desktop/frame/web/WebFrame.java b/src/main/java/com/zyneonstudios/nexus/desktop/frame/web/WebFrame.java
@@ -0,0 +1,26 @@
+package com.zyneonstudios.nexus.desktop.frame.web;
+
+import com.zyneonstudios.nexus.desktop.events.AsyncWebFrameConnectorEvent;
+import com.zyneonstudios.nexus.desktop.events.WebFrameConnectorEvent;
+import org.cef.browser.CefBrowser;
+
+import javax.swing.*;
+
+public interface WebFrame {
+
+    AsyncWebFrameConnectorEvent getAsyncWebFrameConnectorEvent();
+
+    WebFrameConnectorEvent getWebFrameConnectorEvent();
+
+    void setAsyncWebFrameConnectorEvent(AsyncWebFrameConnectorEvent asyncWebFrameConnectorEvent);
+
+    void setWebFrameConnectorEvent(WebFrameConnectorEvent webFrameConnectorEvent);
+
+    CefBrowser getBrowser();
+
+    boolean isBrowserFocussed();
+
+    void executeJavaScript(String... scripts);
+
+    JFrame getAsJFrame();
+}