diff --git a/build.gradle.kts b/build.gradle.kts index eb763d2d..c113fa89 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,7 @@ plugins { id("com.teamdev.jxbrowser") version "1.2.1" } -val jxBrowserVersion by extra { "7.43.9" } // The version of JxBrowser used in the examples. +val jxBrowserVersion by extra { "7.44.0" } // The version of JxBrowser used in the examples. val guavaVersion by extra { "29.0-jre" } // Some of the examples use Guava. allprojects { diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchKeyEvents.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchKeyEvents.java index 783934d9..788bb606 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchKeyEvents.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchKeyEvents.java @@ -83,8 +83,8 @@ public void windowClosing(WindowEvent e) { private static void loadHtmlAndWait(Browser browser, String html) { CountDownLatch latch = new CountDownLatch(1); - browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(html)); browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown()); + browser.navigation().loadHtml(html); awaitUninterruptibly(latch); } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchMouseEvents.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchMouseEvents.java index bd7602c4..8a0231fd 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchMouseEvents.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchMouseEvents.java @@ -96,8 +96,8 @@ public void windowClosing(WindowEvent e) { private static void loadHtmlAndWait(Browser browser, String html) { CountDownLatch latch = new CountDownLatch(1); - browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(html)); browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown()); + browser.navigation().loadHtml(html); awaitUninterruptibly(latch); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomForm.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomForm.java index fd0e7016..58c4b05d 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomForm.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomForm.java @@ -67,11 +67,10 @@ public void windowClosing(WindowEvent e) { element.findElementByName("lastName").ifPresent(lastName -> lastName.putAttribute("value", "Doe")); })); - browser.mainFrame().ifPresent(mainFrame -> - mainFrame.loadHtml("
" + + browser.navigation().loadHtml("" + "First name:
" + "Last name:
" + "" + - "
")); + ""); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomGetAttributes.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomGetAttributes.java index e2cab1e6..352af751 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomGetAttributes.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomGetAttributes.java @@ -37,8 +37,8 @@ public static void main(String[] args) { try (Engine engine = Engine.newInstance(OFF_SCREEN)) { Browser browser = engine.newBrowser(); - browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml( - "Link")); + browser.navigation().loadHtml( + "Link"); browser.mainFrame() .flatMap(Frame::document) .flatMap(Document::documentElement) diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomKeyEvents.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomKeyEvents.java index 3f2f78b4..f2f96b58 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomKeyEvents.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomKeyEvents.java @@ -93,7 +93,7 @@ private static void printEventDetails(Event event) { private static void loadHtmlAndWait(Browser browser) { CountDownLatch latch = new CountDownLatch(1); browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown()); - browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(HTML)); + browser.navigation().loadHtml(HTML); awaitUninterruptibly(latch); } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomMouseEvents.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomMouseEvents.java index 04a5f996..3a8da56d 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomMouseEvents.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomMouseEvents.java @@ -95,7 +95,7 @@ private static void printEventDetails(Event event) { private static void loadHtmlAndWait(Browser browser) { CountDownLatch latch = new CountDownLatch(1); browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown()); - browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(HTML)); + browser.navigation().loadHtml(HTML); awaitUninterruptibly(latch); } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomQuerySelector.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomQuerySelector.java index 6700b52e..83de0851 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomQuerySelector.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomQuerySelector.java @@ -64,11 +64,10 @@ public void windowClosing(WindowEvent e) { event.frame().document().flatMap(Document::documentElement).ifPresent(element -> element.findElementsByCssSelector("p").forEach(paragraph -> System.out.println("innerHTML " + paragraph.innerHtml())))); - browser.mainFrame().ifPresent(mainFrame -> - mainFrame.loadHtml("
" + + browser.navigation().loadHtml("
" + "

paragraph1

" + "

paragraph2

" + "

paragraph3

" + - "
")); + "
"); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomSelectOption.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomSelectOption.java index 6dc10f07..3aac8058 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/DomSelectOption.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/DomSelectOption.java @@ -71,12 +71,11 @@ public void windowClosing(WindowEvent e) { ((OptionElement) options[2]).select(); System.out.println(selectElement.innerHtml()); })); - browser.mainFrame().ifPresent(mainFrame -> - mainFrame.loadHtml("\n" + " \n" + " \n" + " \n" + " \n" + - "")); + ""); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/FileUpload.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/FileUpload.java index d43034af..1d85f7d8 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/FileUpload.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/FileUpload.java @@ -65,8 +65,7 @@ public void windowClosing(WindowEvent e) { browser.set(OpenFileCallback.class, (params, tell) -> tell.open(Paths.get("file.txt"))); - browser.mainFrame().ifPresent(mainFrame -> - mainFrame.loadHtml("Please specify a file, or a set of files:
\n" + - "")); + browser.navigation().loadHtml("Please specify a file, or a set of files:
\n" + + ""); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/LoadHtml.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/LoadHtml.java index b1437b93..27f1489e 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/LoadHtml.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/LoadHtml.java @@ -58,7 +58,6 @@ public void windowClosing(WindowEvent e) { frame.setVisible(true); }); - browser.mainFrame().ifPresent(mainFrame -> - mainFrame.loadHtml("

Hello there!

")); + browser.navigation().loadHtml("

Hello there!

"); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/PrintFromJavaScript.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/PrintFromJavaScript.java index f9994a3c..5273a942 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/PrintFromJavaScript.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/PrintFromJavaScript.java @@ -58,9 +58,8 @@ public void windowClosing(WindowEvent e) { frame.setLocationRelativeTo(null); frame.setVisible(true); - browser.mainFrame().ifPresent(mainFrame -> - mainFrame.loadHtml("" + - "Print")); + browser.navigation().loadHtml("" + + "Print"); }); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/SpellCheckEvents.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/SpellCheckEvents.java index 8e6f4afe..3002d073 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/SpellCheckEvents.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/SpellCheckEvents.java @@ -65,10 +65,8 @@ public void windowClosing(WindowEvent e) { System.out.println("Error start index: " + checkResult.location()); System.out.println("Error length: " + checkResult.length()); })); - browser.mainFrame().ifPresent(mainFrame -> { - mainFrame.loadHtml("" + + browser.navigation().loadHtml("" + "" + ""); - }); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/SpellCheckSuggestions.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/SpellCheckSuggestions.java index 999b7e99..51a7712a 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/SpellCheckSuggestions.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/SpellCheckSuggestions.java @@ -108,9 +108,8 @@ public void windowClosing(WindowEvent e) { Point location = params.location(); popupMenu.show(view, location.x(), location.y()); }); - browser.mainFrame().ifPresent(mainFrame -> - mainFrame.loadHtml("")); + browser.navigation().loadHtml(""); } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/SuppressKey.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/SuppressKey.java index 88858325..0a7c7026 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/SuppressKey.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/SuppressKey.java @@ -73,6 +73,6 @@ public void windowClosing(WindowEvent e) { frame.setVisible(true); }); - browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml("")); + browser.navigation().loadHtml(""); } } diff --git a/examples/src/main/java/com/teamdev/jxbrowser/examples/SuppressMouse.java b/examples/src/main/java/com/teamdev/jxbrowser/examples/SuppressMouse.java index 613d3ccf..040c8897 100644 --- a/examples/src/main/java/com/teamdev/jxbrowser/examples/SuppressMouse.java +++ b/examples/src/main/java/com/teamdev/jxbrowser/examples/SuppressMouse.java @@ -75,8 +75,7 @@ public void windowClosing(WindowEvent e) { frame.setVisible(true); }); - browser.mainFrame().ifPresent(mainFrame -> - mainFrame.loadHtml("" + - "")); + browser.navigation().loadHtml("" + + ""); } } diff --git a/tutorials/docker/project/build.gradle.kts b/tutorials/docker/project/build.gradle.kts index b3a2dbb6..55d0d992 100644 --- a/tutorials/docker/project/build.gradle.kts +++ b/tutorials/docker/project/build.gradle.kts @@ -34,7 +34,7 @@ repositories { } jxbrowser { - version = "7.43.9" + version = "7.44.0" } dependencies {