Skip to content

Commit 2a2ccad

Browse files
Update loadHTML in examples
1 parent 0de41cb commit 2a2ccad

15 files changed

+23
-33
lines changed

examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchKeyEvents.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public void windowClosing(WindowEvent e) {
8383

8484
private static void loadHtmlAndWait(Browser browser, String html) {
8585
CountDownLatch latch = new CountDownLatch(1);
86-
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(html));
8786
browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown());
87+
browser.navigation().loadHtml(html);
8888
awaitUninterruptibly(latch);
8989
}
9090

examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchMouseEvents.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ public void windowClosing(WindowEvent e) {
9696

9797
private static void loadHtmlAndWait(Browser browser, String html) {
9898
CountDownLatch latch = new CountDownLatch(1);
99-
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(html));
10099
browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown());
100+
browser.navigation().loadHtml(html);
101101
awaitUninterruptibly(latch);
102102
}
103103
}

examples/src/main/java/com/teamdev/jxbrowser/examples/DomForm.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,10 @@ public void windowClosing(WindowEvent e) {
6767
element.findElementByName("lastName").ifPresent(lastName ->
6868
lastName.putAttribute("value", "Doe"));
6969
}));
70-
browser.mainFrame().ifPresent(mainFrame ->
71-
mainFrame.loadHtml("<html><body><form name=\"myForm\">" +
70+
browser.navigation().loadHtml("<html><body><form name=\"myForm\">" +
7271
"First name: <input type=\"text\" name=\"firstName\"/><br/>" +
7372
"Last name: <input type=\"text\" name=\"lastName\"/><br/>" +
7473
"<input type=\"button\" value=\"Save\"/>" +
75-
"</form></body></html>"));
74+
"</form></body></html>");
7675
}
7776
}

examples/src/main/java/com/teamdev/jxbrowser/examples/DomGetAttributes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public static void main(String[] args) {
3737
try (Engine engine = Engine.newInstance(OFF_SCREEN)) {
3838
Browser browser = engine.newBrowser();
3939

40-
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(
41-
"<html><body><a href='#' id='link' title='link title'>Link</a></body></html>"));
40+
browser.navigation().loadHtml(
41+
"<html><body><a href='#' id='link' title='link title'>Link</a></body></html>");
4242
browser.mainFrame()
4343
.flatMap(Frame::document)
4444
.flatMap(Document::documentElement)

examples/src/main/java/com/teamdev/jxbrowser/examples/DomKeyEvents.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private static void printEventDetails(Event event) {
9393
private static void loadHtmlAndWait(Browser browser) {
9494
CountDownLatch latch = new CountDownLatch(1);
9595
browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown());
96-
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(HTML));
96+
browser.navigation().loadHtml(HTML);
9797
awaitUninterruptibly(latch);
9898
}
9999

examples/src/main/java/com/teamdev/jxbrowser/examples/DomMouseEvents.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private static void printEventDetails(Event event) {
9595
private static void loadHtmlAndWait(Browser browser) {
9696
CountDownLatch latch = new CountDownLatch(1);
9797
browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown());
98-
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(HTML));
98+
browser.navigation().loadHtml(HTML);
9999
awaitUninterruptibly(latch);
100100
}
101101

examples/src/main/java/com/teamdev/jxbrowser/examples/DomQuerySelector.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,10 @@ public void windowClosing(WindowEvent e) {
6464
event.frame().document().flatMap(Document::documentElement).ifPresent(element ->
6565
element.findElementsByCssSelector("p").forEach(paragraph ->
6666
System.out.println("innerHTML " + paragraph.innerHtml()))));
67-
browser.mainFrame().ifPresent(mainFrame ->
68-
mainFrame.loadHtml("<html><body><div id='root'>" +
67+
browser.navigation().loadHtml("<html><body><div id='root'>" +
6968
"<p>paragraph1</p>" +
7069
"<p>paragraph2</p>" +
7170
"<p>paragraph3</p>" +
72-
"</div></body></html>"));
71+
"</div></body></html>");
7372
}
7473
}

examples/src/main/java/com/teamdev/jxbrowser/examples/DomSelectOption.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,11 @@ public void windowClosing(WindowEvent e) {
7171
((OptionElement) options[2]).select();
7272
System.out.println(selectElement.innerHtml());
7373
}));
74-
browser.mainFrame().ifPresent(mainFrame ->
75-
mainFrame.loadHtml("<html><body><select id='select-tag'>\n" +
74+
browser.navigation().loadHtml("<html><body><select id='select-tag'>\n" +
7675
" <option value=\"volvo\">Volvo</option>\n" +
7776
" <option value=\"saab\">Saab</option>\n" +
7877
" <option value=\"opel\">Opel</option>\n" +
7978
" <option value=\"audi\">Audi</option>\n" +
80-
"</select></body></html>"));
79+
"</select></body></html>");
8180
}
8281
}

examples/src/main/java/com/teamdev/jxbrowser/examples/FileUpload.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ public void windowClosing(WindowEvent e) {
6565
browser.set(OpenFileCallback.class, (params, tell) ->
6666
tell.open(Paths.get("file.txt")));
6767

68-
browser.mainFrame().ifPresent(mainFrame ->
69-
mainFrame.loadHtml("Please specify a file, or a set of files:<br>\n" +
70-
"<input type='file' name='datafile' size='40'>"));
68+
browser.navigation().loadHtml("Please specify a file, or a set of files:<br>\n" +
69+
"<input type='file' name='datafile' size='40'>");
7170
}
7271
}

examples/src/main/java/com/teamdev/jxbrowser/examples/LoadHtml.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public void windowClosing(WindowEvent e) {
5858
frame.setVisible(true);
5959
});
6060

61-
browser.mainFrame().ifPresent(mainFrame ->
62-
mainFrame.loadHtml("<html><body><h1>Hello there!</h1></body></html>"));
61+
browser.navigation().loadHtml("<html><body><h1>Hello there!</h1></body></html>");
6362
}
6463
}

0 commit comments

Comments
 (0)