Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Add ability to set R boostrap directory, fix bugs unconvered by IDE changes
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-05-16 16:33:32 GMT-0700 |
| Commit | c8767c6aa7d538d3a42d9320aa1ca76515c45432 |
| Parent | 23afe9c |
| Delta | 24 lines added, 11 lines removed, 13-line increase |
src/main/resources/com/scrivenvar/messages.properties
| Main.menu.insert.ordered_list=Ordered List | ||
| Main.menu.insert.horizontal_rule=Horizontal Rule | ||
| - | ||
| -Main.menu.tools=_Tools | ||
| -Main.menu.tools.script=_R Script | ||
| +Main.menu.r=_R | ||
| +Main.menu.r.script=_Script | ||
| +Main.menu.r.directory=_Directory | ||
| Main.menu.help=_Help | ||
 | ||
| Dialog.about.title=About | ||
| Dialog.about.header=${Main.title} | ||
| -Dialog.about.content=Copyright 2017 White Magic Software, Ltd.\n\nBased on Markdown Writer FX by Karl Tauber | ||
| +Dialog.about.content=Copyright 2020 White Magic Software, Ltd.\n\nBased on Markdown Writer FX by Karl Tauber | ||
| + | ||
| +# R ################################################################ | ||
| # ######################################################################## | ||
| # | ||
| # R Script | ||
| # | ||
| # ######################################################################## | ||
| -Dialog.rScript.title=R Startup Script | ||
| -Dialog.rScript.content=Provide R statements to run prior to interpreting R statements embedded in the document. | ||
| +Dialog.r.script.title=R Startup Script | ||
| +Dialog.r.script.content=Provide R statements to run prior to interpreting R statements embedded in the document. | ||
| + | ||
| +# ######################################################################## | ||
| +# | ||
| +# R Directory | ||
| +# | ||
| +# ######################################################################## | ||
| + | ||
| +Dialog.r.directory.title=Bootstrap Working Directory | ||
| +Dialog.r.directory.header=Value for $application.r.working.directory$. | ||
| # Options ################################################################ | ||
src/main/java/com/scrivenvar/processors/ProcessorFactory.java
| final ObservableValue<Integer> caret = tab.caretPositionProperty(); | ||
| final Processor<String> tpc = getCommonProcessor(); | ||
| - final Processor<String> rp = new InlineRProcessor( | ||
| - tpc, getResolvedMap(), tab.getPath() ); | ||
| + final Processor<String> rp = new InlineRProcessor( tpc, getResolvedMap() ); | ||
| final Processor<String> rvp = new RVariableProcessor( | ||
| rp, getResolvedMap() ); | ||
| ||
| final Processor<String> tpc = getCommonProcessor(); | ||
| final Processor<String> xmlp = new XMLProcessor( tpc, tab.getPath() ); | ||
| - final Processor<String> rp = new InlineRProcessor( | ||
| - xmlp, getResolvedMap(), tab.getPath() ); | ||
| + final Processor<String> rp = new InlineRProcessor( xmlp, getResolvedMap() ); | ||
| final Processor<String> rvp = new RVariableProcessor( | ||
| rp, getResolvedMap() ); | ||
src/main/java/com/scrivenvar/Messages.java
| private static final ResourceBundle RESOURCE_BUNDLE = | ||
| ResourceBundle.getBundle( | ||
| - APP_BUNDLE_NAME ); | ||
| + APP_BUNDLE_NAME ); | ||
| private Messages() { | ||
| ||
| return result; | ||
| + } | ||
| + | ||
| + public static String getLiteral( final String key ) { | ||
| + return RESOURCE_BUNDLE.getString( key ); | ||
| } | ||