Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Upgrade libraries, JDK18, GTK3, native file chooser
| Author | DaveJarvis <email> |
|---|---|
| Date | 2022-08-06 12:52:35 GMT-0700 |
| Commit | d980df28178499df70018fc81a4efeccb4d6ed7a |
| Parent | b74d82e |
| Delta | 33 lines added, 4 lines removed, 29-line increase |
src/main/resources/com/keenwrite/messages.properties
| Dialog.file.choose.save.title=Save File | ||
| Dialog.file.choose.export.title=Export File | ||
| +Dialog.file.choose.import.title=Import File | ||
| Dialog.file.choose.filter.title.source=Source Files |
src/main/java/com/keenwrite/MainApp.java
| import org.greenrobot.eventbus.Subscribe; | ||
| +import java.io.PrintStream; | ||
| import java.util.function.BooleanSupplier; | ||
| +import java.util.logging.LogManager; | ||
| import static com.keenwrite.Bootstrap.APP_TITLE; | ||
 | ||
| private Workspace mWorkspace; | ||
| private MainScene mMainScene; | ||
| + | ||
| + /** | ||
| + * Suppress writing to standard error, suppresses writing log messages. | ||
| + */ | ||
| + static void disableLogging() { | ||
| + LogManager.getLogManager().reset(); | ||
| + stderrDisable(); | ||
| + } | ||
| + | ||
| + /** | ||
| + * TODO: Delete this after JavaFX/GTK 3 no longer barfs useless warnings. | ||
| + */ | ||
| + private static void stderrDisable() { | ||
| + System.err.close(); | ||
| + } | ||
| + | ||
| + /** | ||
| + * TODO: Delete this after JavaFX/GTK 3 no longer barfs useless warnings. | ||
| + */ | ||
| + @SuppressWarnings( "SameParameterValue" ) | ||
| + private static void stderrRedirect( final PrintStream stream ) { | ||
| + System.setErr( stream ); | ||
| + } | ||
| /** | ||
| ||
| @Override | ||
| public void start( final Stage stage ) { | ||
| + stderrDisable(); | ||
| + | ||
| // Must be instantiated after the UI is initialized (i.e., not in main) | ||
| // because it interacts with GUI properties. | ||
| ||
| stage.show(); | ||
| + | ||
| + stderrRedirect( System.out ); | ||
| + | ||
| register( this ); | ||
| } | ||
installer.sh
| readonly FILE_APP_JAR="${APP_NAME}.jar" | ||
| -# For GTK version, see https://bugs.openjdk.java.net/browse/JDK-8156779 | ||
| readonly OPT_JAVA=$(cat << END_OF_ARGS | ||
| --Djdk.gtk.version=2 \ | ||
| --add-opens=javafx.controls/javafx.scene.control=ALL-UNNAMED \ | ||
| --add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED \ | ||
| ||
| ARG_JAVA_OS="linux" | ||
| ARG_JAVA_ARCH="amd64" | ||
| -ARG_JAVA_VERSION="17.0.1" | ||
| -ARG_JAVA_UPDATE="12" | ||
| +ARG_JAVA_VERSION="18.0.2" | ||
| +ARG_JAVA_UPDATE="10" | ||
| ARG_JAVA_DIR="java" | ||