Dave Jarvis' Repositories

Author	DaveJarvis <email>
Date	2020-12-20 22:29:03 GMT-0800
Commit	e2c9038e1d978bea76d1dfcbb2fff35e0b5650b1
Parent	50d8ef5
Delta	6 lines added, 70 lines removed, 64-line decrease

src/main/java/com/keenwrite/preferences/UserPreferences.java


		import com.dlsc.preferencesfx.PreferencesFx;
		-import javafx.beans.property.*;
		+import javafx.beans.property.ObjectProperty;
		+import javafx.beans.property.SimpleObjectProperty;
		+import javafx.beans.property.SimpleStringProperty;
		+import javafx.beans.property.StringProperty;

		import java.io.File;
		-import java.nio.file.Path;
		-import java.util.Locale;

		import static com.keenwrite.Constants.*;

		}

		- private final ObjectProperty<File> mPropRDirectory;
		- private final StringProperty mPropRScript;
		private final ObjectProperty<File> mPropImagesDirectory;
		private final StringProperty mPropImagesOrder;
		private final ObjectProperty<File> mPropDefinitionPath;
		private final StringProperty mPropRDelimBegan;
		private final StringProperty mPropRDelimEnded;
		private final StringProperty mPropDefDelimBegan;
		private final StringProperty mPropDefDelimEnded;
		- private final IntegerProperty mPropFontsSizeEditor;
		- private final ObjectProperty<Locale> mPropFontsLocale;

		private UserPreferences() {
		mPropImagesDirectory = new SimpleObjectProperty<>( USER_DIRECTORY );
		mPropImagesOrder = new SimpleStringProperty( PERSIST_IMAGES_DEFAULT );

		mPropDefinitionPath = new SimpleObjectProperty<>( DEFINITION_DEFAULT );
		mPropDefDelimBegan = new SimpleStringProperty( DEF_DELIM_BEGAN_DEFAULT );
		mPropDefDelimEnded = new SimpleStringProperty( DEF_DELIM_ENDED_DEFAULT );

		- mPropRDirectory = new SimpleObjectProperty<>( USER_DIRECTORY );
		- mPropRScript = new SimpleStringProperty( "" );
		mPropRDelimBegan = new SimpleStringProperty( R_DELIM_BEGAN_DEFAULT );
		mPropRDelimEnded = new SimpleStringProperty( R_DELIM_ENDED_DEFAULT );
		-
		- mPropFontsLocale = new SimpleObjectProperty<>( LOCALE_DEFAULT );
		- mPropFontsSizeEditor =
		- new SimpleIntegerProperty( (int) FONT_SIZE_EDITOR_DEFAULT );
		}

		public ObjectProperty<File> definitionPathProperty() {
		return mPropDefinitionPath;
		- }
		-
		- public Path getDefinitionPath() {
		- return definitionPathProperty().getValue().toPath();
		}


		public String getDefDelimiterEnded() {
		return defDelimiterEndedProperty().get();
		- }
		-
		- public ObjectProperty<File> rDirectoryProperty() {
		- return mPropRDirectory;
		- }
		-
		- public File getRDirectory() {
		- return rDirectoryProperty().get();
		- }
		-
		- public StringProperty rScriptProperty() {
		- return mPropRScript;
		- }
		-
		- public String getRScript() {
		- return rScriptProperty().get();
		}

		public StringProperty rDelimiterBeganProperty() {
		return mPropRDelimBegan;
		- }
		-
		- public String getRDelimiterBegan() {
		- return rDelimiterBeganProperty().get();
		}

		public StringProperty rDelimiterEndedProperty() {
		return mPropRDelimEnded;
		- }
		-
		- public String getRDelimiterEnded() {
		- return rDelimiterEndedProperty().get();
		}


		public String getImagesOrder() {
		return imagesOrderProperty().get();
		- }
		-
		- public IntegerProperty fontsSizeEditorProperty() {
		- return mPropFontsSizeEditor;
		- }
		-
		- /**
		- * Returns the preferred font size of the text editor.
		- *
		- * @return A non-negative integer, in points.
		- */
		- public int getFontsSizeEditor() {
		- return mPropFontsSizeEditor.intValue();
		- }
		-
		- public ObjectProperty<Locale> fontsLocaleProperty() {
		- return mPropFontsLocale;
		- }
		-
		- /**
		- * Returns the user's preferred locale.
		- *
		- * @return A non-null {@link Locale} instance.
		- */
		- public Locale getFontsLocale() {
		- return mPropFontsLocale.get();
		}
		}

src/main/java/com/keenwrite/preferences/UserPreferencesView.java

		)
		)
		- ).instantPersistent( false )
		- .dialogIcon( ICON_DIALOG );
		+ ).instantPersistent( false ).dialogIcon( ICON_DIALOG );
		}

src/main/java/com/keenwrite/preferences/Workspace.java

		private final Map<Key, Property<?>> VALUES = Map.ofEntries(
		entry( KEY_META_VERSION, new SimpleStringProperty( getVersion() ) ),
		- entry( KEY_META_NAME, new SimpleStringProperty( "defaullt" ) ),
		+ entry( KEY_META_NAME, new SimpleStringProperty( "default" ) ),

		entry( KEY_R_SCRIPT, new SimpleStringProperty( "" ) ),

Remove unused UserPreferences, fix typo, axe duplication