dorkbox
/
SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Fixed migration for swt/javaFX to updated libraries

master
Robinson 2022-05-09 09:18:14 +02:00
parent a285b81b22
commit cbb4a6ba07
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test-javaFx/dorkbox/JavaFxProvider.java
View File

@ -51,7 +51,7 @@ class JavaFxProvider implements Renderer {
@Override
public
int getGtkVersion() {
if (!OS.isLinux()) {
if (!OS.INSTANCE.isLinux()) {
return 0;
}
@ -66,7 +66,7 @@ class JavaFxProvider implements Renderer {
// https://github.com/teamfx/openjfx-9-dev-rt/blob/master/modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java
if (OS.javaVersion < 9) {
if (OS.INSTANCE.getJavaVersion() < 9) {
// JavaFX from Oracle Java 8 is GTK2 only. Java9 can have it be GTK3 if -Djdk.gtk.version=3 is specified
// see http://mail.openjdk.java.net/pipermail/openjfx-dev/2016-May/019100.html
return 2;
@ -74,7 +74,7 @@ class JavaFxProvider implements Renderer {
// Only possible Java9+ (so our case, Java11+ since 9 is no longer available, 11 is officially LTS)
String version = OS.getProperty("jdk.gtk.version", "2");
String version = OS.INSTANCE.getProperty("jdk.gtk.version", "2");
if ("3".equals(version) || version.startsWith("3.")) {
return 3;
}

2
test-javaFx/dorkbox/TestTrayJavaFX.java
View File

@ -192,7 +192,7 @@ class TestTrayJavaFX {
mainMenu.add(new MenuItem("Temp Directory", e->{
try {
Desktop.browseDirectory(OS.TEMP_DIR.getAbsolutePath());
Desktop.browseDirectory(OS.INSTANCE.getTEMP_DIR().getAbsolutePath());
} catch (IOException e1) {
e1.printStackTrace();
}

4
test-swt/dorkbox/SwtProvider.java
View File

@ -65,14 +65,14 @@ public class SwtProvider implements Renderer {
@Override
public
int getGtkVersion() {
if (!OS.isLinux()) {
if (!OS.INSTANCE.isLinux()) {
return 0;
}
// Swt has a property that tells us the version information
// "org.eclipse.swt.internal.gtk.version=3.12.2"
// Only possible Java9+ (so our case, Java11+ since 9 is no longer available, 11 is officially LTS)
String version = OS.getProperty("org.eclipse.swt.internal.gtk.version", "2");
String version = OS.INSTANCE.getProperty("org.eclipse.swt.internal.gtk.version", "2");
if ("3".equals(version) || version.startsWith("3.")) {
return 3;
} else {

2
test-swt/dorkbox/TestTraySwt.java
View File

@ -165,7 +165,7 @@ class TestTraySwt {
mainMenu.add(new MenuItem("Temp Directory", e->{
try {
Desktop.browseDirectory(OS.TEMP_DIR.getAbsolutePath());
Desktop.browseDirectory(OS.INSTANCE.getTEMP_DIR().getAbsolutePath());
} catch (IOException e1) {
e1.printStackTrace();
}