Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Remove extraneous header levels, log R init exceptions, interpolate map on treeview changes
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-06-07 22:57:41 GMT-0700 |
| Commit | 40e2964e28751c4a12cbe65ace1f608c8de9a437 |
| Parent | 2782132 |
| Delta | 6 lines added, 13 lines removed, 7-line decrease |
src/main/java/com/scrivenvar/processors/DefinitionProcessor.java
| package com.scrivenvar.processors; | ||
| -import com.scrivenvar.definition.MapInterpolator; | ||
| - | ||
| -import java.util.HashMap; | ||
| import java.util.Map; | ||
 | ||
| */ | ||
| protected Map<String, String> getDefinitions() { | ||
| - final Map<String, String> map = new HashMap<>( mDefinitions ); | ||
| - MapInterpolator.interpolate( map ); | ||
| - return map; | ||
| + return mDefinitions; | ||
| } | ||
| } | ||
src/main/java/com/scrivenvar/processors/InlineRProcessor.java
| final Path wd = getWorkingDirectory(); | ||
| final String dir = wd.toString().replace( '\\', '/' ); | ||
| - final Map<String, String> definitions = getDefinitions(); | ||
| - definitions.put( "$application.r.working.directory$", dir ); | ||
| + final Map<String, String> map = getDefinitions(); | ||
| + map.put( "$application.r.working.directory$", dir ); | ||
| final String initScript = getInitScript(); | ||
| - if( !initScript.isEmpty() ) { | ||
| - final String rScript = replace( initScript, getDefinitions() ); | ||
| - eval( rScript ); | ||
| + if( !initScript.isBlank() ) { | ||
| + eval( replace( initScript, map ) ); | ||
| } | ||
| } catch( final Exception e ) { | ||
| - // Tell the user that there was a problem. | ||
| - getNotifier().notify( e.getMessage() ); | ||
| + getNotifier().notify( e ); | ||
| } | ||
| } |