Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Formatting, provide default values for XmlStorageHandler
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-12-20 19:44:37 GMT-0800 |
| Commit | 349ad9724c8416f0b17494be03e9fdb951e3706b |
| Parent | b361455 |
src/main/java/com/keenwrite/preferences/UserPreferences.java
| mPropFontsLocale = new SimpleObjectProperty<>( LOCALE_DEFAULT ); | ||
| - mPropFontsSizeEditor = new SimpleIntegerProperty( (int) FONT_SIZE_EDITOR_DEFAULT ); | ||
| + mPropFontsSizeEditor = | ||
| + new SimpleIntegerProperty( (int) FONT_SIZE_EDITOR_DEFAULT ); | ||
| } | ||
src/main/java/com/keenwrite/preferences/UserPreferencesView.java
| private final PreferencesFx mPreferencesFx; | ||
| - public UserPreferencesView(final Workspace workspace) { | ||
| + public UserPreferencesView( final Workspace workspace ) { | ||
| mWorkspace = workspace; | ||
 | ||
| */ | ||
| public void addSaveEventHandler( | ||
| - final EventHandler<? super PreferencesFxEvent> eventHandler ) { | ||
| + final EventHandler<? super PreferencesFxEvent> eventHandler ) { | ||
| final var eventType = PreferencesFxEvent.EVENT_PREFERENCES_SAVED; | ||
| getPreferencesFx().addEventHandler( eventType, eventHandler ); | ||
| ||
| private PreferencesFx createPreferencesFx() { | ||
| final Setting<StringField, StringProperty> scriptSetting = | ||
| - Setting.of( "Script", stringProperty( KEY_R_SCRIPT ) ); | ||
| + Setting.of( "Script", stringProperty( KEY_R_SCRIPT ) ); | ||
| final StringField field = scriptSetting.getElement(); | ||
| field.multiline( true ); | ||
| return PreferencesFx.of( | ||
| - new XmlStorageHandler(), | ||
| - Category.of( | ||
| - get( "Preferences.r" ), | ||
| - Group.of( | ||
| - get( "Preferences.r.directory" ), | ||
| - Setting.of( label( "Preferences.r.directory.desc", false ) ), | ||
| - Setting.of( "Directory", fileProperty( KEY_R_DIR ), true ) | ||
| - ), | ||
| - Group.of( | ||
| - get( "Preferences.r.script" ), | ||
| - Setting.of( label( "Preferences.r.script.desc" ) ), | ||
| - scriptSetting | ||
| - ), | ||
| - Group.of( | ||
| - get( "Preferences.r.delimiter.began" ), | ||
| - Setting.of( label( "Preferences.r.delimiter.began.desc" ) ), | ||
| - Setting.of( "Opening", stringProperty( KEY_R_DELIM_BEGAN ) ) | ||
| - ), | ||
| - Group.of( | ||
| - get( "Preferences.r.delimiter.ended" ), | ||
| - Setting.of( label( "Preferences.r.delimiter.ended.desc" ) ), | ||
| - Setting.of( "Closing", stringProperty( KEY_R_DELIM_ENDED ) ) | ||
| - ) | ||
| + new XmlStorageHandler(), | ||
| + Category.of( | ||
| + get( "Preferences.r" ), | ||
| + Group.of( | ||
| + get( "Preferences.r.directory" ), | ||
| + Setting.of( label( "Preferences.r.directory.desc", false ) ), | ||
| + Setting.of( "Directory", fileProperty( KEY_R_DIR ), true ) | ||
| ), | ||
| - Category.of( | ||
| - get( "Preferences.images" ), | ||
| - Group.of( | ||
| - get( "Preferences.images.directory" ), | ||
| - Setting.of( label( "Preferences.images.directory.desc" ) ), | ||
| - Setting.of( "Directory", fileProperty( KEY_IMAGES_DIR ), true ) | ||
| - ), | ||
| - Group.of( | ||
| - get( "Preferences.images.suffixes" ), | ||
| - Setting.of( label( "Preferences.images.suffixes.desc" ) ), | ||
| - Setting.of( "Extensions", stringProperty( KEY_IMAGES_ORDER ) ) | ||
| - ) | ||
| + Group.of( | ||
| + get( "Preferences.r.script" ), | ||
| + Setting.of( label( "Preferences.r.script.desc" ) ), | ||
| + scriptSetting | ||
| ), | ||
| - Category.of( | ||
| - get( "Preferences.definitions" ), | ||
| - Group.of( | ||
| - get( "Preferences.definitions.path" ), | ||
| - Setting.of( label( "Preferences.definitions.path.desc" ) ), | ||
| - Setting.of( "Path", fileProperty( KEY_DEF_PATH ), false ) | ||
| - ), | ||
| - Group.of( | ||
| - get( "Preferences.definitions.delimiter.began" ), | ||
| - Setting.of( label( | ||
| - "Preferences.definitions.delimiter.began.desc" ) ), | ||
| - Setting.of( "Opening", stringProperty( KEY_DEF_DELIM_BEGAN ) ) | ||
| - ), | ||
| - Group.of( | ||
| - get( "Preferences.definitions.delimiter.ended" ), | ||
| - Setting.of( label( | ||
| - "Preferences.definitions.delimiter.ended.desc" ) ), | ||
| - Setting.of( "Closing", stringProperty( KEY_DEF_DELIM_ENDED ) ) | ||
| - ) | ||
| + Group.of( | ||
| + get( "Preferences.r.delimiter.began" ), | ||
| + Setting.of( label( "Preferences.r.delimiter.began.desc" ) ), | ||
| + Setting.of( "Opening", stringProperty( KEY_R_DELIM_BEGAN ) ) | ||
| ), | ||
| - Category.of( | ||
| - get( "Preferences.fonts" ), | ||
| - Group.of( | ||
| - get( "Preferences.fonts.size_editor" ), | ||
| - Setting.of( label( "Preferences.fonts.size_editor.desc" ) ), | ||
| - Setting.of( "Points", doubleProperty( KEY_UI_FONT_EDITOR_SIZE ) ) | ||
| - ) | ||
| + Group.of( | ||
| + get( "Preferences.r.delimiter.ended" ), | ||
| + Setting.of( label( "Preferences.r.delimiter.ended.desc" ) ), | ||
| + Setting.of( "Closing", stringProperty( KEY_R_DELIM_ENDED ) ) | ||
| + ) | ||
| + ), | ||
| + Category.of( | ||
| + get( "Preferences.images" ), | ||
| + Group.of( | ||
| + get( "Preferences.images.directory" ), | ||
| + Setting.of( label( "Preferences.images.directory.desc" ) ), | ||
| + Setting.of( "Directory", fileProperty( KEY_IMAGES_DIR ), true ) | ||
| + ), | ||
| + Group.of( | ||
| + get( "Preferences.images.suffixes" ), | ||
| + Setting.of( label( "Preferences.images.suffixes.desc" ) ), | ||
| + Setting.of( "Extensions", stringProperty( KEY_IMAGES_ORDER ) ) | ||
| + ) | ||
| + ), | ||
| + Category.of( | ||
| + get( "Preferences.definitions" ), | ||
| + Group.of( | ||
| + get( "Preferences.definitions.path" ), | ||
| + Setting.of( label( "Preferences.definitions.path.desc" ) ), | ||
| + Setting.of( "Path", fileProperty( KEY_DEF_PATH ), false ) | ||
| + ), | ||
| + Group.of( | ||
| + get( "Preferences.definitions.delimiter.began" ), | ||
| + Setting.of( label( | ||
| + "Preferences.definitions.delimiter.began.desc" ) ), | ||
| + Setting.of( "Opening", stringProperty( KEY_DEF_DELIM_BEGAN ) ) | ||
| + ), | ||
| + Group.of( | ||
| + get( "Preferences.definitions.delimiter.ended" ), | ||
| + Setting.of( label( | ||
| + "Preferences.definitions.delimiter.ended.desc" ) ), | ||
| + Setting.of( "Closing", stringProperty( KEY_DEF_DELIM_ENDED ) ) | ||
| + ) | ||
| + ), | ||
| + Category.of( | ||
| + get( "Preferences.fonts" ), | ||
| + Group.of( | ||
| + get( "Preferences.fonts.size_editor" ), | ||
| + Setting.of( label( "Preferences.fonts.size_editor.desc" ) ), | ||
| + Setting.of( "Points", doubleProperty( KEY_UI_FONT_EDITOR_SIZE ) ) | ||
| ) | ||
| + ) | ||
| ).instantPersistent( false ) | ||
| .dialogIcon( ICON_DIALOG ); | ||
src/main/java/com/keenwrite/preferences/XmlStorageHandler.java
| @Override | ||
| public String loadSelectedCategory() { | ||
| - return null; | ||
| + return ""; | ||
| } | ||
| ||
| @Override | ||
| public Object loadObject( | ||
| - final String breadcrumb, final Object defaultObject ) { | ||
| - return null; | ||
| + final String breadcrumb, final Object defaultObject ) { | ||
| + return defaultObject; | ||
| } | ||
| @Override | ||
| public <T> T loadObject( | ||
| - final String breadcrumb, final Class<T> type, final T defaultObject ) { | ||
| - return null; | ||
| + final String breadcrumb, final Class<T> type, final T defaultObject ) { | ||
| + return defaultObject; | ||
| } | ||
| @Override | ||
| + @SuppressWarnings("rawtypes") | ||
| public ObservableList loadObservableList( | ||
| - final String breadcrumb, final ObservableList defaultObservableList ) { | ||
| - return null; | ||
| + final String breadcrumb, final ObservableList defaultObservableList ) { | ||
| + return defaultObservableList; | ||
| } | ||
| @Override | ||
| public <T> ObservableList<T> loadObservableList( | ||
| - final String breadcrumb, | ||
| - final Class<T> type, | ||
| - final ObservableList<T> defaultObservableList ) { | ||
| - return null; | ||
| + final String breadcrumb, | ||
| + final Class<T> type, | ||
| + final ObservableList<T> defaultObservableList ) { | ||
| + return defaultObservableList; | ||
| } | ||
src/main/java/com/keenwrite/processors/InlineRProcessor.java
| @Override | ||
| protected boolean removeEldestEntry( | ||
| - final Map.Entry<String, String> eldest ) { | ||
| + final Map.Entry<String, String> eldest ) { | ||
| return size() > MAX_CACHED_R_STATEMENTS; | ||
| } | ||
| }; | ||
| /** | ||
| * Only one editor is open at a time. | ||
| */ | ||
| private static final ScriptEngine ENGINE = | ||
| - (new ScriptEngineManager()).getEngineByName( "Renjin" ); | ||
| + (new ScriptEngineManager()).getEngineByName( "Renjin" ); | ||
| private static final int PREFIX_LENGTH = PREFIX.length(); | ||
| ||
| */ | ||
| public InlineRProcessor( | ||
| - final Processor<String> successor, | ||
| - final ProcessorContext context ) { | ||
| + final Processor<String> successor, | ||
| + final ProcessorContext context ) { | ||
| super( successor, context ); | ||
| mWorkspace = context.getWorkspace(); | ||
| mMarkdownProcessor = MarkdownProcessor.create( context ); | ||
| bootstrapScriptProperty().addListener( | ||
| - ( __, oldScript, newScript ) -> setDirty( true ) ); | ||
| + ( __, oldScript, newScript ) -> setDirty( true ) ); | ||
| workingDirectoryProperty().addListener( | ||
| - ( __, oldScript, newScript ) -> setDirty( true ) ); | ||
| + ( __, oldScript, newScript ) -> setDirty( true ) ); | ||
| // TODO: Watch the "R" property keys in the workspace, directly. | ||
src/main/java/com/keenwrite/ui/actions/ApplicationMenuBar.java
| */ | ||
| private Action addAction( | ||
| - final String key, final EventHandler<ActionEvent> handler ) { | ||
| + final String key, final EventHandler<ActionEvent> handler ) { | ||
| assert key != null; | ||
| assert handler != null; | ||
| final var action = Action | ||
| - .builder() | ||
| - .setId( key ) | ||
| - .setHandler( handler ) | ||
| - .build(); | ||
| + .builder() | ||
| + .setId( key ) | ||
| + .setHandler( handler ) | ||
| + .build(); | ||
| mMap.put( key, action ); | ||
| ||
| public static Menu createMenu( | ||
| - final String text, final MenuAction... actions ) { | ||
| + final String text, final MenuAction... actions ) { | ||
| return new Menu( text, null, createMenuItems( actions ) ); | ||
| } | ||
src/main/java/com/keenwrite/ui/actions/MarkdownCommands.java
| return createHyperlinkModel( | ||
| - link, selectedText, "https://localhost" | ||
| + link, selectedText, "https://localhost" | ||
| ); | ||
| } | ||
| @SuppressWarnings("SameParameterValue") | ||
| private HyperlinkModel createHyperlinkModel( | ||
| - final Link link, final String selection, final String url ) { | ||
| + final Link link, final String selection, final String url ) { | ||
| return link == null | ||
| - ? new HyperlinkModel( selection, url ) | ||
| - : new HyperlinkModel( link ); | ||
| + ? new HyperlinkModel( selection, url ) | ||
| + : new HyperlinkModel( link ); | ||
| } | ||
| private Dialog<String> createLinkDialog( | ||
| - final StyleClassedTextArea textArea ) { | ||
| + final StyleClassedTextArea textArea ) { | ||
| return new LinkDialog( getWindow(), getHyperlink( textArea ) ); | ||
| } | ||
| private Dialog<String> createImageDialog() { | ||
| return new ImageDialog( getWindow(), getParentPath() ); | ||
| } | ||
| private void insertObject( | ||
| - final Dialog<String> dialog, final StyleClassedTextArea textArea ) { | ||
| + final Dialog<String> dialog, final StyleClassedTextArea textArea ) { | ||
| dialog.showAndWait().ifPresent( textArea::replaceSelection ); | ||
| } |
| Delta | 96 lines added, 94 lines removed, 2-line increase |
|---|