Skip to content

Commit 55b9f05

Browse files
Dmytro-FedoryshynDmytro-Fedoryshyn
authored
Use Java 17 features in examples (#158)
In this changeset, we have utilized Java 17 features in our examples. Issue: TeamDev-IP/JxBrowser-Docs#2022
1 parent d5e51f9 commit 55b9f05

File tree

66 files changed

+321
-416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+321
-416
lines changed

‎examples/src/main/java/com/teamdev/jxbrowser/examples/CustomCss.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import static com.teamdev.jxbrowser.engine.RenderingMode.HARDWARE_ACCELERATED;
2424

25-
import com.teamdev.jxbrowser.browser.Browser;
2625
import com.teamdev.jxbrowser.browser.callback.InjectCssCallback;
2726
import com.teamdev.jxbrowser.engine.Engine;
2827
import com.teamdev.jxbrowser.view.swing.BrowserView;
@@ -39,13 +38,13 @@
3938
public final class CustomCss {
4039

4140
public static void main(String[] args) {
42-
Engine engine = Engine.newInstance(HARDWARE_ACCELERATED);
43-
Browser browser = engine.newBrowser();
41+
var engine = Engine.newInstance(HARDWARE_ACCELERATED);
42+
var browser = engine.newBrowser();
4443

4544
SwingUtilities.invokeLater(() -> {
46-
BrowserView view = BrowserView.newInstance(browser);
45+
var view = BrowserView.newInstance(browser);
4746

48-
JFrame frame = new JFrame("Custom CSS");
47+
var frame = new JFrame("Custom CSS");
4948
frame.addWindowListener(new WindowAdapter() {
5049
@Override
5150
public void windowClosing(WindowEvent e) {

‎examples/src/main/java/com/teamdev/jxbrowser/examples/CustomProtocol.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static com.teamdev.jxbrowser.engine.RenderingMode.HARDWARE_ACCELERATED;
2424
import static javax.swing.SwingUtilities.invokeLater;
2525

26-
import com.teamdev.jxbrowser.browser.Browser;
2726
import com.teamdev.jxbrowser.engine.Engine;
2827
import com.teamdev.jxbrowser.engine.EngineOptions;
2928
import com.teamdev.jxbrowser.net.HttpHeader;
@@ -48,16 +47,16 @@ public final class CustomProtocol {
4847
private static final String CONTENT_TYPE_HEADER_VALUE = "text/html";
4948

5049
public static void main(String[] args) {
51-
Engine engine = Engine.newInstance(
50+
var engine = Engine.newInstance(
5251
EngineOptions.newBuilder(HARDWARE_ACCELERATED)
5352
.addScheme(Scheme.of(PROTOCOL), new InterceptCustomSchemeCallback())
5453
.build());
55-
Browser browser = engine.newBrowser();
54+
var browser = engine.newBrowser();
5655

5756
invokeLater(() -> {
58-
BrowserView view = BrowserView.newInstance(browser);
57+
var view = BrowserView.newInstance(browser);
5958

60-
JFrame frame = new JFrame("Custom Protocol Handler");
59+
var frame = new JFrame("Custom Protocol Handler");
6160
frame.addWindowListener(new WindowAdapter() {
6261
@Override
6362
public void windowClosing(WindowEvent e) {
@@ -79,7 +78,7 @@ private static final class InterceptCustomSchemeCallback implements
7978

8079
@Override
8180
public Response on(Params params) {
82-
UrlRequestJob job = params.newUrlRequestJob(
81+
var job = params.newUrlRequestJob(
8382
UrlRequestJob.Options.newBuilder(HttpStatus.OK)
8483
.addHttpHeader(HttpHeader.of(
8584
CONTENT_TYPE_HEADER_NAME,

‎examples/src/main/java/com/teamdev/jxbrowser/examples/DefaultZoomLevel.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import static com.teamdev.jxbrowser.engine.RenderingMode.HARDWARE_ACCELERATED;
2424

25-
import com.teamdev.jxbrowser.browser.Browser;
2625
import com.teamdev.jxbrowser.engine.Engine;
2726
import com.teamdev.jxbrowser.view.swing.BrowserView;
2827
import com.teamdev.jxbrowser.zoom.ZoomLevel;
@@ -39,13 +38,13 @@
3938
public final class DefaultZoomLevel {
4039

4140
public static void main(String[] args) {
42-
Engine engine = Engine.newInstance(HARDWARE_ACCELERATED);
43-
Browser browser = engine.newBrowser();
41+
var engine = Engine.newInstance(HARDWARE_ACCELERATED);
42+
var browser = engine.newBrowser();
4443

4544
SwingUtilities.invokeLater(() -> {
46-
BrowserView view = BrowserView.newInstance(browser);
45+
var view = BrowserView.newInstance(browser);
4746

48-
JFrame frame = new JFrame("Change Default Zoom Level");
47+
var frame = new JFrame("Change Default Zoom Level");
4948
frame.addWindowListener(new WindowAdapter() {
5049
@Override
5150
public void windowClosing(WindowEvent e) {

‎examples/src/main/java/com/teamdev/jxbrowser/examples/DisablePdfViewer.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import com.teamdev.jxbrowser.browser.Browser;
2727
import com.teamdev.jxbrowser.engine.Engine;
28-
import com.teamdev.jxbrowser.plugin.Plugins;
2928
import com.teamdev.jxbrowser.view.swing.BrowserView;
3029
import java.awt.BorderLayout;
3130
import java.awt.event.WindowAdapter;
@@ -40,14 +39,14 @@
4039
public final class DisablePdfViewer {
4140

4241
public static void main(String[] args) {
43-
Engine engine = Engine.newInstance(HARDWARE_ACCELERATED);
44-
Plugins plugins = engine.plugins();
42+
var engine = Engine.newInstance(HARDWARE_ACCELERATED);
43+
var plugins = engine.plugins();
4544

4645
// #docfragment "disabling-pdf-viewer"
4746
plugins.settings().disablePdfViewer();
4847
// #enddocfragment "disabling-pdf-viewer"
4948

50-
Browser browser = engine.newBrowser();
49+
var browser = engine.newBrowser();
5150

5251
invokeLater(() -> {
5352
// Display a Swing frame with embedded BrowserView.
@@ -60,9 +59,9 @@ public static void main(String[] args) {
6059
}
6160

6261
private static void showGui(Browser browser) {
63-
BrowserView view = BrowserView.newInstance(browser);
62+
var view = BrowserView.newInstance(browser);
6463

65-
JFrame frame = new JFrame("Disabling PDF Viewer");
64+
var frame = new JFrame("Disabling PDF Viewer");
6665
frame.addWindowListener(new WindowAdapter() {
6766
@Override
6867
public void windowClosing(WindowEvent e) {

‎examples/src/main/java/com/teamdev/jxbrowser/examples/DisableZoom.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import static com.teamdev.jxbrowser.engine.RenderingMode.HARDWARE_ACCELERATED;
2424

25-
import com.teamdev.jxbrowser.browser.Browser;
2625
import com.teamdev.jxbrowser.engine.Engine;
2726
import com.teamdev.jxbrowser.view.swing.BrowserView;
2827
import com.teamdev.jxbrowser.zoom.ZoomLevel;
@@ -39,13 +38,13 @@
3938
public final class DisableZoom {
4039

4140
public static void main(String[] args) {
42-
Engine engine = Engine.newInstance(HARDWARE_ACCELERATED);
43-
Browser browser = engine.newBrowser();
41+
var engine = Engine.newInstance(HARDWARE_ACCELERATED);
42+
var browser = engine.newBrowser();
4443

4544
SwingUtilities.invokeLater(() -> {
46-
BrowserView view = BrowserView.newInstance(browser);
45+
var view = BrowserView.newInstance(browser);
4746

48-
JFrame frame = new JFrame("Disable Zoom");
47+
var frame = new JFrame("Disable Zoom");
4948
frame.addWindowListener(new WindowAdapter() {
5049
@Override
5150
public void windowClosing(WindowEvent e) {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public final class DispatchKeyEvents {
5050
private static final Map<Character, KeyCode> charToKeyCode;
5151

5252
public static void main(String[] args) {
53-
Engine engine = Engine.newInstance(HARDWARE_ACCELERATED);
54-
Browser browser = engine.newBrowser();
53+
var engine = Engine.newInstance(HARDWARE_ACCELERATED);
54+
var browser = engine.newBrowser();
5555

5656
SwingUtilities.invokeLater(() -> {
57-
BrowserView view = BrowserView.newInstance(browser);
58-
JFrame frame = new JFrame("Dispatch key events");
57+
var view = BrowserView.newInstance(browser);
58+
var frame = new JFrame("Dispatch key events");
5959
frame.addWindowListener(new WindowAdapter() {
6060
@Override
6161
public void windowClosing(WindowEvent e) {
@@ -82,7 +82,7 @@ public void windowClosing(WindowEvent e) {
8282
}
8383

8484
private static void loadHtmlAndWait(Browser browser, String html) {
85-
CountDownLatch latch = new CountDownLatch(1);
85+
var latch = new CountDownLatch(1);
8686
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(html));
8787
browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown());
8888
awaitUninterruptibly(latch);
@@ -93,13 +93,13 @@ private static void dispatchKey(Browser browser, char character) {
9393
}
9494

9595
private static void dispatchKeyEvent(Browser browser, char character, KeyCode keyCode) {
96-
KeyPressed keyPressed = KeyPressed.newBuilder(keyCode)
96+
var keyPressed = KeyPressed.newBuilder(keyCode)
9797
.keyChar(character)
9898
.build();
99-
KeyTyped keyTyped = KeyTyped.newBuilder(keyCode)
99+
var keyTyped = KeyTyped.newBuilder(keyCode)
100100
.keyChar(character)
101101
.build();
102-
KeyReleased keyReleased = KeyReleased.newBuilder(keyCode)
102+
var keyReleased = KeyReleased.newBuilder(keyCode)
103103
.build();
104104

105105
browser.dispatch(keyPressed);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ public final class DispatchMouseEvents {
5656
+ "</body></html>";
5757

5858
public static void main(String[] args) {
59-
Engine engine = Engine.newInstance(HARDWARE_ACCELERATED);
60-
Browser browser = engine.newBrowser();
59+
var engine = Engine.newInstance(HARDWARE_ACCELERATED);
60+
var browser = engine.newBrowser();
6161

6262
displayBrowserView(browser);
6363
loadHtmlAndWait(browser, HTML);
6464
}
6565

6666
private static void displayBrowserView(Browser browser) {
6767
SwingUtilities.invokeLater(() -> {
68-
BrowserView view = BrowserView.newInstance(browser);
68+
var view = BrowserView.newInstance(browser);
6969

7070
JButton dispatchMouseEventBtn = new JButton("Dispatch Mouse Right Click");
7171
dispatchMouseEventBtn.addActionListener(e -> {
@@ -78,7 +78,7 @@ private static void displayBrowserView(Browser browser) {
7878
.build());
7979
});
8080

81-
JFrame frame = new JFrame("Dispatch mouse events");
81+
var frame = new JFrame("Dispatch mouse events");
8282
frame.addWindowListener(new WindowAdapter() {
8383
@Override
8484
public void windowClosing(WindowEvent e) {
@@ -95,7 +95,7 @@ public void windowClosing(WindowEvent e) {
9595
}
9696

9797
private static void loadHtmlAndWait(Browser browser, String html) {
98-
CountDownLatch latch = new CountDownLatch(1);
98+
var latch = new CountDownLatch(1);
9999
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(html));
100100
browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown());
101101
awaitUninterruptibly(latch);

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static com.teamdev.jxbrowser.engine.RenderingMode.HARDWARE_ACCELERATED;
2424
import static javax.swing.SwingUtilities.invokeLater;
2525

26-
import com.teamdev.jxbrowser.browser.Browser;
2726
import com.teamdev.jxbrowser.dom.Document;
2827
import com.teamdev.jxbrowser.engine.Engine;
2928
import com.teamdev.jxbrowser.navigation.event.FrameLoadFinished;
@@ -40,13 +39,13 @@
4039
public final class DomForm {
4140

4241
public static void main(String[] args) {
43-
Engine engine = Engine.newInstance(HARDWARE_ACCELERATED);
44-
Browser browser = engine.newBrowser();
42+
var engine = Engine.newInstance(HARDWARE_ACCELERATED);
43+
var browser = engine.newBrowser();
4544

4645
invokeLater(() -> {
47-
BrowserView view = BrowserView.newInstance(browser);
46+
var view = BrowserView.newInstance(browser);
4847

49-
JFrame frame = new JFrame("DOM HTML Form");
48+
var frame = new JFrame("DOM HTML Form");
5049
frame.addWindowListener(new WindowAdapter() {
5150
@Override
5251
public void windowClosing(WindowEvent e) {
@@ -75,4 +74,3 @@ public void windowClosing(WindowEvent e) {
7574
"</form></body></html>"));
7675
}
7776
}
78-

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import static com.teamdev.jxbrowser.engine.RenderingMode.OFF_SCREEN;
2424

25-
import com.teamdev.jxbrowser.browser.Browser;
2625
import com.teamdev.jxbrowser.dom.Document;
2726
import com.teamdev.jxbrowser.engine.Engine;
2827
import com.teamdev.jxbrowser.frame.Frame;
@@ -34,8 +33,8 @@
3433
public final class DomGetAttributes {
3534

3635
public static void main(String[] args) {
37-
try (Engine engine = Engine.newInstance(OFF_SCREEN)) {
38-
Browser browser = engine.newBrowser();
36+
try (var engine = Engine.newInstance(OFF_SCREEN)) {
37+
var browser = engine.newBrowser();
3938

4039
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(
4140
"<html><body><a href='#' id='link' title='link title'>Link</a></body></html>"));

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ public class DomKeyEvents {
5454
private static final String HTML = "<input type='text' id='" + INPUT_FIELD_ID + "' />";
5555

5656
public static void main(String[] args) {
57-
EngineOptions options = EngineOptions.newBuilder(HARDWARE_ACCELERATED).build();
58-
Engine engine = Engine.newInstance(options);
59-
Browser browser = engine.newBrowser();
57+
var options = EngineOptions.newBuilder(HARDWARE_ACCELERATED).build();
58+
var engine = Engine.newInstance(options);
59+
var browser = engine.newBrowser();
6060

6161
SwingUtilities.invokeLater(() -> {
62-
BrowserView view = BrowserView.newInstance(browser);
62+
var view = BrowserView.newInstance(browser);
6363

64-
JFrame frame = new JFrame("DOM Keyboard Event Listener ");
64+
var frame = new JFrame("DOM Keyboard Event Listener ");
6565
frame.addWindowListener(new WindowAdapter() {
6666
@Override
6767
public void windowClosing(WindowEvent e) {
@@ -84,14 +84,14 @@ public void windowClosing(WindowEvent e) {
8484
}
8585

8686
private static void printEventDetails(Event event) {
87-
KeyEvent keyEvent = (KeyEvent) event;
87+
var keyEvent = (KeyEvent) event;
8888
String message = format("Event type: %s. Typed character (if applicable): %s. Key: %s",
8989
keyEvent.type().value(), keyEvent.character(), keyEvent.domKeyCode());
9090
System.out.println(message);
9191
}
9292

9393
private static void loadHtmlAndWait(Browser browser) {
94-
CountDownLatch latch = new CountDownLatch(1);
94+
var latch = new CountDownLatch(1);
9595
browser.navigation().on(FrameLoadFinished.class, event -> latch.countDown());
9696
browser.mainFrame().ifPresent(mainFrame -> mainFrame.loadHtml(HTML));
9797
awaitUninterruptibly(latch);

0 commit comments

Comments
 (0)