Skip to content

Commit

Permalink
Merge pull request #1 from eschmar/feature/java13
Browse files Browse the repository at this point in the history
Upgrade to java 13
  • Loading branch information
eschmar authored Oct 19, 2019
2 parents 694e67a + 45d320d commit 55ed14f
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 35 deletions.
16 changes: 8 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ local.properties
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
.idea/modules.xml
.idea/*.iml
.idea/modules
*.iml
*.ipr

# CMake
cmake-build-*/
Expand Down Expand Up @@ -143,10 +143,10 @@ fabric.properties
### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
*.iml
modules.xml
# .idea/misc.xml
# *.ipr
*.ipr

# Sonarlint plugin
.idea/sonarlint
Expand Down
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
}

javafx {
version = "12.0.2"
version = "13"
modules = [ 'javafx.controls' ]
}

Expand Down
19 changes: 0 additions & 19 deletions javafx-boilerplate.iml

This file was deleted.

4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ The result:

## requirements

* OpenJFX 12
* OpenJDK 12
* OpenJFX 13
* OpenJDK 13
* Gradle

## usage
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/com/example/pew/App.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.example.pew;

import javafx.application.Application;
import javafx.application.Platform;
import javafx.scene.Scene;
import javafx.scene.control.Label;
import javafx.scene.layout.VBox;
Expand Down Expand Up @@ -40,17 +41,19 @@ public void start(Stage stage) {

if (Operator.getOpenFile() == null && !Operator.chooseNewFile()) {
// Failed...
Platform.exit();
return;
}

String javaVersion = System.getProperty("java.version");
String javafxVersion = System.getProperty("javafx.version");
Label l = new Label("Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".");
// TODO: Show which file was opened.

String chosenFile = "Opened file: " + Operator.getOpenFile().getAbsolutePath();

Scene scene = new Scene(new VBox(l, new Label(chosenFile)), 320, 240);
Scene scene = new Scene(new VBox(
new Label("Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + "."),
new Label(chosenFile)
), 320, 240);

stage.setScene(scene);
stage.show();
}
Expand Down

0 comments on commit 55ed14f

Please sign in to comment.