Dave Jarvis' Repositories

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

Uncomment code to activate R delimiter preferences

AuthorDaveJarvis <email>
Date2020-07-05 18:52:48 GMT-0700
Commit62c99afceddb3ae0acd3922f69f04fa9697850f4
Parent357bf42
src/main/java/com/scrivenvar/Main.java
}
+ /**
+ * Must be static, otherwise instant crash.
+ */
private final static Notifier sNotifier = Services.load( Notifier.class );
private final Options mOptions = Services.load( Options.class );
src/main/java/com/scrivenvar/decorators/RVariableDecorator.java
*/
public class RVariableDecorator implements VariableDecorator {
- //private static final Options sOptions = Services.load( Options.class );
+ private static final Options sOptions = Services.load( Options.class );
public static final String PREFIX = "`r#";
public static final char SUFFIX = '`';
- private final String mDelimiterBegan = "x( ";
- private final String mDelimiterEnded = " )";
+ private final String mDelimiterBegan;
+ private final String mDelimiterEnded;
public RVariableDecorator() {
- //final var prefs = getUserPreferences();
-// mDelimiterBegan = prefs.getRDelimiterBegan();
-// mDelimiterEnded = prefs.getRDelimiterEnded();
+ final var prefs = getUserPreferences();
+ mDelimiterBegan = prefs.getRDelimiterBegan();
+ mDelimiterEnded = prefs.getRDelimiterEnded();
}
}
-// private UserPreferences getUserPreferences() {
-// return sOptions.getUserPreferences();
-// }
+ private UserPreferences getUserPreferences() {
+ return sOptions.getUserPreferences();
+ }
}
Delta12 lines added, 9 lines removed, 3-line increase