Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git

Add JSON to Renjin, fix NPE

AuthorDaveJarvis <email>
Date2022-09-09 10:51:16 GMT-0700
Commitc62d577836b4e324194b72fce380c29520244c58
Parent0556821
build.gradle
// R
implementation 'org.renjin:renjin-script-engine:3.5-beta76'
+ implementation 'org.renjin.cran:rjson:0.2.15-renjin-21'
// SVG
- implementation "io.sf.carte:echosvg-anim:${v_echosvg}"
implementation "io.sf.carte:echosvg-awt-util:${v_echosvg}"
implementation "io.sf.carte:echosvg-bridge:${v_echosvg}"
implementation "io.sf.carte:echosvg-svggen:${v_echosvg}"
implementation "io.sf.carte:echosvg-transcoder:${v_echosvg}"
- implementation "io.sf.carte:echosvg-svgrasterizer:${v_echosvg}"
implementation "io.sf.carte:echosvg-util:${v_echosvg}"
implementation "io.sf.carte:echosvg-xml:${v_echosvg}"
src/main/java/com/keenwrite/ui/explorer/FilePickerFactory.java
public Optional<List<File>> choose() {
if( mType == FILE_OPEN_MULTIPLE ) {
- return Optional.of( mChooser.showOpenMultipleDialog( mOwner ) );
+ return Optional.ofNullable( mChooser.showOpenMultipleDialog( mOwner ) );
}
Delta2 lines added, 3 lines removed, 1-line decrease