Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Fix variable dereference issue when no initial filename is set
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-05-30 09:08:21 GMT-0700 |
| Commit | e25539693aaea2ee8a5e7b143fed81887e5131d1 |
| Parent | 41b65df |
| Delta | 14 lines added, 12 lines removed, 2-line increase |
src/main/resources/com/scrivenvar/messages.properties
| # ######################################################################## | ||
| -Pane.defintion.node.root.title=Definitions | ||
| +Pane.definition.node.root.title=Definitions | ||
| # Controls ############################################################### |
src/main/resources/com/scrivenvar/settings.properties
| # ######################################################################## | ||
| # | ||
| -# File References | ||
| +# File and Path References | ||
| # | ||
| # ######################################################################## | ||
 | ||
| # Startup script for R | ||
| file.r.startup=/${application.package}/startup.R | ||
| + | ||
| +# Default filename when a new file is created. | ||
| +# This ensures that the file type can always be | ||
| +# discerned so that the correct type of variable | ||
| +# reference can be inserted. | ||
| +file.default=untitled.md | ||
| # ######################################################################## | ||
src/main/java/com/scrivenvar/Messages.java
| package com.scrivenvar; | ||
| -import static com.scrivenvar.Constants.APP_BUNDLE_NAME; | ||
| - | ||
| import java.text.MessageFormat; | ||
| import java.util.ResourceBundle; | ||
| import java.util.Stack; | ||
| + | ||
| +import static com.scrivenvar.Constants.APP_BUNDLE_NAME; | ||
| +import static java.util.ResourceBundle.getBundle; | ||
| /** | ||
| ||
| private static final ResourceBundle RESOURCE_BUNDLE = | ||
| - ResourceBundle.getBundle( | ||
| - APP_BUNDLE_NAME ); | ||
| + getBundle( APP_BUNDLE_NAME ); | ||
| private Messages() { | ||
| ||
| */ | ||
| public static String get( String key ) { | ||
| - String result; | ||
| - | ||
| try { | ||
| - result = resolve( RESOURCE_BUNDLE, RESOURCE_BUNDLE.getString( key ) ); | ||
| + return resolve( RESOURCE_BUNDLE, RESOURCE_BUNDLE.getString( key ) ); | ||
| } catch( final Exception ex ) { | ||
| - result = key; | ||
| + return key; | ||
| } | ||
| - | ||
| - return result; | ||
| } | ||