Skip to content

Commit 55ed14f

Browse files
authored
Merge pull request #1 from eschmar/feature/java13
Upgrade to java 13
2 parents 694e67a + 45d320d commit 55ed14f

File tree

6 files changed

+19
-35
lines changed

6 files changed

+19
-35
lines changed

.gitignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ local.properties
101101
# When using Gradle or Maven with auto-import, you should exclude module files,
102102
# since they will be recreated, and may cause churn. Uncomment if using
103103
# auto-import.
104-
# .idea/modules.xml
105-
# .idea/*.iml
106-
# .idea/modules
107-
# *.iml
108-
# *.ipr
104+
.idea/modules.xml
105+
.idea/*.iml
106+
.idea/modules
107+
*.iml
108+
*.ipr
109109

110110
# CMake
111111
cmake-build-*/
@@ -143,10 +143,10 @@ fabric.properties
143143
### Intellij Patch ###
144144
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
145145

146-
# *.iml
147-
# modules.xml
146+
*.iml
147+
modules.xml
148148
# .idea/misc.xml
149-
# *.ipr
149+
*.ipr
150150

151151
# Sonarlint plugin
152152
.idea/sonarlint

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99
}
1010

1111
javafx {
12-
version = "12.0.2"
12+
version = "13"
1313
modules = [ 'javafx.controls' ]
1414
}
1515

javafx-boilerplate.iml

Lines changed: 0 additions & 19 deletions
This file was deleted.

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ The result:
1616

1717
## requirements
1818

19-
* OpenJFX 12
20-
* OpenJDK 12
19+
* OpenJFX 13
20+
* OpenJDK 13
2121
* Gradle
2222

2323
## usage

src/main/java/com/example/pew/App.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.example.pew;
22

33
import javafx.application.Application;
4+
import javafx.application.Platform;
45
import javafx.scene.Scene;
56
import javafx.scene.control.Label;
67
import javafx.scene.layout.VBox;
@@ -40,17 +41,19 @@ public void start(Stage stage) {
4041

4142
if (Operator.getOpenFile() == null && !Operator.chooseNewFile()) {
4243
// Failed...
44+
Platform.exit();
4345
return;
4446
}
4547

4648
String javaVersion = System.getProperty("java.version");
4749
String javafxVersion = System.getProperty("javafx.version");
48-
Label l = new Label("Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".");
49-
// TODO: Show which file was opened.
50-
5150
String chosenFile = "Opened file: " + Operator.getOpenFile().getAbsolutePath();
5251

53-
Scene scene = new Scene(new VBox(l, new Label(chosenFile)), 320, 240);
52+
Scene scene = new Scene(new VBox(
53+
new Label("Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + "."),
54+
new Label(chosenFile)
55+
), 320, 240);
56+
5457
stage.setScene(scene);
5558
stage.show();
5659
}

0 commit comments

Comments
 (0)