Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git
keenwrite / Commits / 55f5d97

Migrate constants into package to hide accessor method

Author DaveJarvis <email>
Date 2021-04-05 18:21:29 GMT-0700
Commit 55f5d9712e82241211979cda814354c095273737
Parent aa6f8ca
Delta 354 lines added, 350 lines removed, 4-line increase
src/main/java/com/keenwrite/AbstractFileFactory.java
import java.nio.file.Path;
-import static com.keenwrite.Constants.GLOB_PREFIX_FILE;
-import static com.keenwrite.Constants.sSettings;
+import static com.keenwrite.constants.Constants.GLOB_PREFIX_FILE;
+import static com.keenwrite.constants.Constants.sSettings;
import static com.keenwrite.io.FileType.UNKNOWN;
import static com.keenwrite.predicates.PredicateFactory.createFileTypePredicate;
src/main/java/com/keenwrite/Bootstrap.java
package com.keenwrite;
+import com.keenwrite.constants.Constants;
+
import java.io.InputStream;
import java.util.Calendar;
src/main/java/com/keenwrite/Caret.java
import java.util.Collection;
-import static com.keenwrite.Constants.STATUS_BAR_LINE;
+import static com.keenwrite.constants.Constants.STATUS_BAR_LINE;
import static com.keenwrite.Messages.get;
src/main/java/com/keenwrite/Constants.java
-/* Copyright 2020-2021 White Magic Software, Ltd. -- All rights reserved. */
-package com.keenwrite;
-
-import com.keenwrite.service.Settings;
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.util.Locale;
-
-import static com.keenwrite.Bootstrap.APP_TITLE_LOWERCASE;
-import static com.keenwrite.preferences.LocaleScripts.withScript;
-import static java.io.File.separator;
-import static java.lang.String.format;
-import static java.lang.System.getProperty;
-
-/**
- * Defines application-wide default values.
- */
-public final class Constants {
-
- /**
- * Used by the default settings to load the {@link Settings} service. This
- * must come before any attempt is made to create a {@link Settings} object.
- * The reference to {@link Bootstrap#APP_TITLE_LOWERCASE} should cause the
- * JVM to load {@link Bootstrap} prior to proceeding. Loading that class
- * beforehand will read the bootstrap properties file to determine the
- * application name, which is then used to locate the settings properties.
- */
- public static final String PATH_PROPERTIES_SETTINGS =
- format( "/com/%s/settings.properties", APP_TITLE_LOWERCASE );
-
- /**
- * The {@link Settings} uses {@link #PATH_PROPERTIES_SETTINGS}.
- */
- public static final Settings sSettings = Services.load( Settings.class );
-
- public static final double WINDOW_X_DEFAULT = 0;
- public static final double WINDOW_Y_DEFAULT = 0;
- public static final double WINDOW_W_DEFAULT = 1200;
- public static final double WINDOW_H_DEFAULT = 800;
-
- public static final File DOCUMENT_DEFAULT = getFile( "document" );
- public static final File DEFINITION_DEFAULT = getFile( "definition" );
-
- public static final String APP_BUNDLE_NAME = get( "application.messages" );
-
- public static final String STYLESHEET_APPLICATION_BASE =
- get( "file.stylesheet.application.base" );
- public static final String STYLESHEET_APPLICATION_SKIN =
- get( "file.stylesheet.application.skin" );
- public static final String STYLESHEET_MARKDOWN =
- get( "file.stylesheet.markdown" );
- public static final String STYLESHEET_MARKDOWN_LOCALE =
- "file.stylesheet.markdown.locale";
- public static final String STYLESHEET_PREVIEW =
- get( "file.stylesheet.preview" );
- public static final String STYLESHEET_PREVIEW_LOCALE =
- "file.stylesheet.preview.locale";
-
- public static final String FILE_PREFERENCES = getPreferencesFilename();
-
- /**
- * Refer to file name extension settings in the configuration file. Do not
- * terminate with a period.
- */
- public static final String GLOB_PREFIX_FILE = "file.ext";
-
- /**
- * Three parameters: line number, column number, and offset.
- */
- public static final String STATUS_BAR_LINE = "Main.status.line";
-
- public static final String STATUS_BAR_OK = "Main.status.state.default";
-
- /**
- * Used to show an error while parsing, usually syntactical.
- */
- public static final String STATUS_PARSE_ERROR = "Main.status.error.parse";
- public static final String STATUS_DEFINITION_BLANK =
- "Main.status.error.def.blank";
- public static final String STATUS_DEFINITION_EMPTY =
- "Main.status.error.def.empty";
-
- /**
- * One parameter: the word under the cursor that could not be found.
- */
- public static final String STATUS_DEFINITION_MISSING =
- "Main.status.error.def.missing";
-
- /**
- * Used when creating flat maps relating to resolved variables.
- */
- public static final int MAP_SIZE_DEFAULT = 128;
-
- /**
- * Default image extension order to use when scanning.
- */
- public static final String PERSIST_IMAGES_DEFAULT =
- get( "file.ext.image.order" );
-
- /**
- * Default working directory to use for R startup script.
- */
- public static final File USER_DIRECTORY =
- new File( System.getProperty( "user.dir" ) );
-
- public static final String NEWLINE = System.lineSeparator();
-
- /**
- * Default path to use for an untitled (pathless) file.
- */
- public static final Path DEFAULT_DIRECTORY = USER_DIRECTORY.toPath();
-
- /**
- * Default character set to use when reading/writing files.
- */
- public static final Charset DEFAULT_CHARSET = Charset.defaultCharset();
-
- /**
- * Default starting delimiter for definition variables. This value must
- * not overlap math delimiters, so do not use $ tokens as the first
- * delimiter.
- */
- public static final String DEF_DELIM_BEGAN_DEFAULT = "{{";
-
- /**
- * Default ending delimiter for definition variables.
- */
- public static final String DEF_DELIM_ENDED_DEFAULT = "}}";
-
- /**
- * Default starting delimiter when inserting R variables.
- */
- public static final String R_DELIM_BEGAN_DEFAULT = "x( ";
-
- /**
- * Default ending delimiter when inserting R variables.
- */
- public static final String R_DELIM_ENDED_DEFAULT = " )";
-
- /**
- * Resource directory where different language lexicons are located.
- */
- public static final String LEXICONS_DIRECTORY = "lexicons";
-
- /**
- * Absolute location of true type font files within the Java archive file.
- */
- public static final String FONT_DIRECTORY = "/fonts";
-
- /**
- * Default text editor font name.
- */
- public static final String FONT_NAME_EDITOR_DEFAULT = "Noto Sans Regular";
-
- /**
- * Default text editor font size, in points.
- */
- public static final float FONT_SIZE_EDITOR_DEFAULT = 12f;
-
- /**
- * Default preview font name.
- */
- public static final String FONT_NAME_PREVIEW_DEFAULT = "Source Serif 4";
-
- /**
- * Default preview font size, in points.
- */
- public static final float FONT_SIZE_PREVIEW_DEFAULT = 13f;
-
- /**
- * Default monospace preview font name.
- */
- public static final String FONT_NAME_PREVIEW_MONO_NAME_DEFAULT =
- "Source Code Pro";
-
- /**
- * Default monospace preview font size, in points.
- */
- public static final float FONT_SIZE_PREVIEW_MONO_SIZE_DEFAULT = 13f;
-
- /**
- * Default locale for font loading, including ISO 15924 alpha-4 script code.
- */
- public static final Locale LOCALE_DEFAULT = withScript( Locale.getDefault() );
-
- /**
- * Default CSS to apply (resolves to a minimal implementation).
- */
- public static final String SKIN_DEFAULT = "Modena Light";
-
- /**
- * Custom CSS to apply.
- */
- public static final File SKIN_CUSTOM_DEFAULT = null;
-
- /**
- * Default identifier to use for synchronized scrolling.
- */
- public static final String CARET_ID = "caret";
-
- /**
- * Default spacing for UI items (e.g., toolbars).
- */
- public static final int UI_CONTROL_SPACING = 10;
-
- /**
- * Default server name for rendering diagrams.
- * <p>
- * TODO: Make this a preference so that local installs are possible.
- */
- public static final String DIAGRAM_SERVER_NAME = "kroki.io";
-
- /**
- * Application action messages properties prefix.
- */
- public static final String ACTION_PREFIX = "Action.";
-
- /**
- * Prevent instantiation.
- */
- private Constants() {
- }
-
- /**
- * Converts from points to pixels because FlyingSaucer cannot handle points
- * properly. This is used to convert font sizes.
- *
- * @param points The points to convert to pixels.
- * @return The given number of points in equivalent pixels.
- */
- public static int toPixels( final double points ) {
- return (int) (points * (1 + 1 / 3f));
- }
-
- static String get( final String key ) {
- return sSettings.getSetting( key, "" );
- }
-
- /**
- * Returns a default {@link File} instance based on the given key suffix.
- *
- * @param suffix Appended to {@code "file.default."}.
- * @return A new {@link File} instance that references the settings file name.
- */
- private static File getFile( final String suffix ) {
- return new File( get( "file.default." + suffix ) );
- }
-
- /**
- * Returns the equivalent of {@code $HOME/.filename.xml}.
- */
- private static String getPreferencesFilename() {
- return format(
- "%s%s.%s.xml",
- getProperty( "user.home" ),
- separator,
- APP_TITLE_LOWERCASE
- );
- }
-}
src/main/java/com/keenwrite/DefinitionNameInjector.java
import com.keenwrite.sigils.SigilOperator;
-import static com.keenwrite.Constants.*;
+import static com.keenwrite.constants.Constants.*;
import static com.keenwrite.events.StatusEvent.clue;
src/main/java/com/keenwrite/GraphicsConstants.java
-/* Copyright 2020-2021 White Magic Software, Ltd. -- All rights reserved. */
-package com.keenwrite;
-
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.keenwrite.Constants.get;
-
-/**
- * Defines application-wide default values for GUI-related items. This helps
- * ensure that unit tests that have no graphical dependencies will pass.
- */
-public class GraphicsConstants {
- public static final List<Image> LOGOS = createImages(
- "file.logo.16",
- "file.logo.32",
- "file.logo.128",
- "file.logo.256",
- "file.logo.512"
- );
-
- public static final Image ICON_DIALOG = LOGOS.get( 1 );
-
- public static final ImageView ICON_DIALOG_NODE = new ImageView( ICON_DIALOG );
-
- /**
- * Converts the given file names to images, such as application icons.
- *
- * @param keys The file names to convert to images.
- * @return The images loaded from the file name references.
- */
- private static List<Image> createImages( final String... keys ) {
- final List<Image> images = new ArrayList<>( keys.length );
-
- for( final var key : keys ) {
- images.add( new Image( get( key ) ) );
- }
-
- return images;
- }
-}
src/main/java/com/keenwrite/MainApp.java
import static com.keenwrite.Bootstrap.APP_TITLE;
-import static com.keenwrite.GraphicsConstants.LOGOS;
+import static com.keenwrite.constants.GraphicsConstants.LOGOS;
import static com.keenwrite.preferences.WorkspaceKeys.*;
import static com.keenwrite.util.FontLoader.initFonts;
src/main/java/com/keenwrite/MainPane.java
import java.util.stream.Collectors;
-import static com.keenwrite.Constants.*;
+import static com.keenwrite.constants.Constants.*;
import static com.keenwrite.ExportFormat.NONE;
import static com.keenwrite.Messages.get;
src/main/java/com/keenwrite/MainScene.java
import java.io.File;
-import static com.keenwrite.Constants.*;
+import static com.keenwrite.constants.Constants.*;
import static com.keenwrite.Messages.get;
import static com.keenwrite.events.ScrollLockEvent.fireScrollLockEvent;
src/main/java/com/keenwrite/Messages.java
import java.util.Stack;
-import static com.keenwrite.Constants.APP_BUNDLE_NAME;
+import static com.keenwrite.constants.Constants.APP_BUNDLE_NAME;
import static java.util.ResourceBundle.getBundle;
src/main/java/com/keenwrite/constants/Constants.java
+/* Copyright 2020-2021 White Magic Software, Ltd. -- All rights reserved. */
+package com.keenwrite.constants;
+
+import com.keenwrite.Bootstrap;
+import com.keenwrite.Services;
+import com.keenwrite.service.Settings;
+
+import java.io.File;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.Locale;
+
+import static com.keenwrite.Bootstrap.APP_TITLE_LOWERCASE;
+import static com.keenwrite.preferences.LocaleScripts.withScript;
+import static java.io.File.separator;
+import static java.lang.String.format;
+import static java.lang.System.getProperty;
+
+/**
+ * Defines application-wide default values.
+ */
+public final class Constants {
+
+ /**
+ * Used by the default settings to load the {@link Settings} service. This
+ * must come before any attempt is made to create a {@link Settings} object.
+ * The reference to {@link Bootstrap#APP_TITLE_LOWERCASE} should cause the
+ * JVM to load {@link Bootstrap} prior to proceeding. Loading that class
+ * beforehand will read the bootstrap properties file to determine the
+ * application name, which is then used to locate the settings properties.
+ */
+ public static final String PATH_PROPERTIES_SETTINGS =
+ format( "/com/%s/settings.properties", APP_TITLE_LOWERCASE );
+
+ /**
+ * The {@link Settings} uses {@link #PATH_PROPERTIES_SETTINGS}.
+ */
+ public static final Settings sSettings = Services.load( Settings.class );
+
+ public static final double WINDOW_X_DEFAULT = 0;
+ public static final double WINDOW_Y_DEFAULT = 0;
+ public static final double WINDOW_W_DEFAULT = 1200;
+ public static final double WINDOW_H_DEFAULT = 800;
+
+ public static final File DOCUMENT_DEFAULT = getFile( "document" );
+ public static final File DEFINITION_DEFAULT = getFile( "definition" );
+
+ public static final String APP_BUNDLE_NAME = get( "application.messages" );
+
+ public static final String STYLESHEET_APPLICATION_BASE =
+ get( "file.stylesheet.application.base" );
+ public static final String STYLESHEET_APPLICATION_SKIN =
+ get( "file.stylesheet.application.skin" );
+ public static final String STYLESHEET_MARKDOWN =
+ get( "file.stylesheet.markdown" );
+ public static final String STYLESHEET_MARKDOWN_LOCALE =
+ "file.stylesheet.markdown.locale";
+ public static final String STYLESHEET_PREVIEW =
+ get( "file.stylesheet.preview" );
+ public static final String STYLESHEET_PREVIEW_LOCALE =
+ "file.stylesheet.preview.locale";
+
+ public static final String FILE_PREFERENCES = getPreferencesFilename();
+
+ /**
+ * Refer to file name extension settings in the configuration file. Do not
+ * terminate with a period.
+ */
+ public static final String GLOB_PREFIX_FILE = "file.ext";
+
+ /**
+ * Three parameters: line number, column number, and offset.
+ */
+ public static final String STATUS_BAR_LINE = "Main.status.line";
+
+ public static final String STATUS_BAR_OK = "Main.status.state.default";
+
+ /**
+ * Used to show an error while parsing, usually syntactical.
+ */
+ public static final String STATUS_PARSE_ERROR = "Main.status.error.parse";
+ public static final String STATUS_DEFINITION_BLANK =
+ "Main.status.error.def.blank";
+ public static final String STATUS_DEFINITION_EMPTY =
+ "Main.status.error.def.empty";
+
+ /**
+ * One parameter: the word under the cursor that could not be found.
+ */
+ public static final String STATUS_DEFINITION_MISSING =
+ "Main.status.error.def.missing";
+
+ /**
+ * Used when creating flat maps relating to resolved variables.
+ */
+ public static final int MAP_SIZE_DEFAULT = 128;
+
+ /**
+ * Default image extension order to use when scanning.
+ */
+ public static final String PERSIST_IMAGES_DEFAULT =
+ get( "file.ext.image.order" );
+
+ /**
+ * Default working directory to use for R startup script.
+ */
+ public static final File USER_DIRECTORY =
+ new File( System.getProperty( "user.dir" ) );
+
+ public static final String NEWLINE = System.lineSeparator();
+
+ /**
+ * Default path to use for an untitled (pathless) file.
+ */
+ public static final Path DEFAULT_DIRECTORY = USER_DIRECTORY.toPath();
+
+ /**
+ * Default character set to use when reading/writing files.
+ */
+ public static final Charset DEFAULT_CHARSET = Charset.defaultCharset();
+
+ /**
+ * Default starting delimiter for definition variables. This value must
+ * not overlap math delimiters, so do not use $ tokens as the first
+ * delimiter.
+ */
+ public static final String DEF_DELIM_BEGAN_DEFAULT = "{{";
+
+ /**
+ * Default ending delimiter for definition variables.
+ */
+ public static final String DEF_DELIM_ENDED_DEFAULT = "}}";
+
+ /**
+ * Default starting delimiter when inserting R variables.
+ */
+ public static final String R_DELIM_BEGAN_DEFAULT = "x( ";
+
+ /**
+ * Default ending delimiter when inserting R variables.
+ */
+ public static final String R_DELIM_ENDED_DEFAULT = " )";
+
+ /**
+ * Resource directory where different language lexicons are located.
+ */
+ public static final String LEXICONS_DIRECTORY = "lexicons";
+
+ /**
+ * Absolute location of true type font files within the Java archive file.
+ */
+ public static final String FONT_DIRECTORY = "/fonts";
+
+ /**
+ * Default text editor font name.
+ */
+ public static final String FONT_NAME_EDITOR_DEFAULT = "Noto Sans Regular";
+
+ /**
+ * Default text editor font size, in points.
+ */
+ public static final float FONT_SIZE_EDITOR_DEFAULT = 12f;
+
+ /**
+ * Default preview font name.
+ */
+ public static final String FONT_NAME_PREVIEW_DEFAULT = "Source Serif 4";
+
+ /**
+ * Default preview font size, in points.
+ */
+ public static final float FONT_SIZE_PREVIEW_DEFAULT = 13f;
+
+ /**
+ * Default monospace preview font name.
+ */
+ public static final String FONT_NAME_PREVIEW_MONO_NAME_DEFAULT =
+ "Source Code Pro";
+
+ /**
+ * Default monospace preview font size, in points.
+ */
+ public static final float FONT_SIZE_PREVIEW_MONO_SIZE_DEFAULT = 13f;
+
+ /**
+ * Default locale for font loading, including ISO 15924 alpha-4 script code.
+ */
+ public static final Locale LOCALE_DEFAULT = withScript( Locale.getDefault() );
+
+ /**
+ * Default CSS to apply (resolves to a minimal implementation).
+ */
+ public static final String SKIN_DEFAULT = "Modena Light";
+
+ /**
+ * Custom CSS to apply.
+ */
+ public static final File SKIN_CUSTOM_DEFAULT = null;
+
+ /**
+ * Default identifier to use for synchronized scrolling.
+ */
+ public static final String CARET_ID = "caret";
+
+ /**
+ * Default spacing for UI items (e.g., toolbars).
+ */
+ public static final int UI_CONTROL_SPACING = 10;
+
+ /**
+ * Default server name for rendering diagrams.
+ * <p>
+ * TODO: Make this a preference so that local installs are possible.
+ */
+ public static final String DIAGRAM_SERVER_NAME = "kroki.io";
+
+ /**
+ * Application action messages properties prefix.
+ */
+ public static final String ACTION_PREFIX = "Action.";
+
+ /**
+ * Prevent instantiation.
+ */
+ private Constants() {
+ }
+
+ /**
+ * Converts from points to pixels because FlyingSaucer cannot handle points
+ * properly. This is used to convert font sizes.
+ *
+ * @param points The points to convert to pixels.
+ * @return The given number of points in equivalent pixels.
+ */
+ public static int toPixels( final double points ) {
+ return (int) (points * (1 + 1 / 3f));
+ }
+
+ static String get( final String key ) {
+ return sSettings.getSetting( key, "" );
+ }
+
+ /**
+ * Returns a default {@link File} instance based on the given key suffix.
+ *
+ * @param suffix Appended to {@code "file.default."}.
+ * @return A new {@link File} instance that references the settings file name.
+ */
+ private static File getFile( final String suffix ) {
+ return new File( get( "file.default." + suffix ) );
+ }
+
+ /**
+ * Returns the equivalent of {@code $HOME/.filename.xml}.
+ */
+ private static String getPreferencesFilename() {
+ return format(
+ "%s%s.%s.xml",
+ getProperty( "user.home" ),
+ separator,
+ APP_TITLE_LOWERCASE
+ );
+ }
+}
src/main/java/com/keenwrite/constants/GraphicsConstants.java
+/* Copyright 2020-2021 White Magic Software, Ltd. -- All rights reserved. */
+package com.keenwrite.constants;
+
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.keenwrite.constants.Constants.get;
+
+/**
+ * Defines application-wide default values for GUI-related items. This helps
+ * ensure that unit tests that have no graphical dependencies will pass.
+ */
+public class GraphicsConstants {
+ public static final List<Image> LOGOS = createImages(
+ "file.logo.16",
+ "file.logo.32",
+ "file.logo.128",
+ "file.logo.256",
+ "file.logo.512"
+ );
+
+ public static final Image ICON_DIALOG = LOGOS.get( 1 );
+
+ public static final ImageView ICON_DIALOG_NODE = new ImageView( ICON_DIALOG );
+
+ /**
+ * Converts the given file names to images, such as application icons.
+ *
+ * @param keys The file names to convert to images.
+ * @return The images loaded from the file name references.
+ */
+ private static List<Image> createImages( final String... keys ) {
+ final List<Image> images = new ArrayList<>( keys.length );
+
+ for( final var key : keys ) {
+ images.add( new Image( get( key ) ) );
+ }
+
+ return images;
+ }
+}
src/main/java/com/keenwrite/editors/TextResource.java
import java.nio.file.Path;
-import static com.keenwrite.Constants.DEFAULT_CHARSET;
+import static com.keenwrite.constants.Constants.DEFAULT_CHARSET;
import static com.keenwrite.events.StatusEvent.clue;
import static java.nio.charset.Charset.forName;
src/main/java/com/keenwrite/editors/definition/DefinitionEditor.java
package com.keenwrite.editors.definition;
-import com.keenwrite.Constants;
+import com.keenwrite.constants.Constants;
import com.keenwrite.editors.TextDefinition;
import com.keenwrite.sigils.Tokens;
import java.util.regex.Pattern;
-import static com.keenwrite.Constants.*;
+import static com.keenwrite.constants.Constants.*;
import static com.keenwrite.Messages.get;
import static com.keenwrite.events.StatusEvent.clue;
src/main/java/com/keenwrite/editors/definition/TreeItemMapper.java
import java.util.Stack;
-import static com.keenwrite.Constants.MAP_SIZE_DEFAULT;
+import static com.keenwrite.constants.Constants.MAP_SIZE_DEFAULT;
/**
src/main/java/com/keenwrite/editors/markdown/MarkdownEditor.java
import com.keenwrite.Caret;
-import com.keenwrite.Constants;
+import com.keenwrite.constants.Constants;
import com.keenwrite.editors.TextEditor;
import com.keenwrite.preferences.LocaleProperty;
import java.util.regex.Pattern;
-import static com.keenwrite.Constants.*;
+import static com.keenwrite.constants.Constants.*;
import static com.keenwrite.MainApp.keyDown;
import static com.keenwrite.Messages.get;
src/main/java/com/keenwrite/events/StatusEvent.java
import java.util.stream.Collectors;
-import static com.keenwrite.Constants.NEWLINE;
-import static com.keenwrite.Constants.STATUS_BAR_OK;
+import static com.keenwrite.constants.Constants.NEWLINE;
+import static com.keenwrite.constants.Constants.STATUS_BAR_OK;
import static com.keenwrite.Messages.get;
import static java.util.Arrays.stream;
src/main/java/com/keenwrite/preferences/LocaleProperty.java
import java.util.Objects;
-import static com.keenwrite.Constants.LOCALE_DEFAULT;
+import static com.keenwrite.constants.Constants.LOCALE_DEFAULT;
import static com.keenwrite.preferences.Workspace.listProperty;
import static java.util.Locale.forLanguageTag;
src/main/java/com/keenwrite/preferences/PreferencesController.java
import static com.dlsc.formsfx.model.structure.Field.ofStringType;
import static com.dlsc.preferencesfx.PreferencesFxEvent.EVENT_PREFERENCES_SAVED;
-import static com.keenwrite.GraphicsConstants.ICON_DIALOG;
+import static com.keenwrite.constants.GraphicsConstants.ICON_DIALOG;
import static com.keenwrite.Messages.get;
import static com.keenwrite.preferences.LocaleProperty.localeListProperty;
src/main/java/com/keenwrite/preferences/SimpleFontControl.java
import org.controlsfx.dialog.FontSelectorDialog;
-import static com.keenwrite.GraphicsConstants.ICON_DIALOG;
+import static com.keenwrite.constants.GraphicsConstants.ICON_DIALOG;
import static com.keenwrite.events.StatusEvent.clue;
import static java.lang.System.currentTimeMillis;
src/main/java/com/keenwrite/preferences/SkinProperty.java
package com.keenwrite.preferences;
-import com.keenwrite.Constants;
+import com.keenwrite.constants.Constants;
import javafx.beans.property.SimpleObjectProperty;
import javafx.collections.ObservableList;
import java.util.LinkedHashSet;
import java.util.Set;
-import static com.keenwrite.Constants.SKIN_DEFAULT;
+import static com.keenwrite.constants.Constants.SKIN_DEFAULT;
import static com.keenwrite.preferences.Workspace.listProperty;
src/main/java/com/keenwrite/preferences/Workspace.java
package com.keenwrite.preferences;
-import com.keenwrite.Constants;
+import com.keenwrite.constants.Constants;
import com.keenwrite.sigils.Tokens;
import javafx.application.Platform;
import static com.keenwrite.Bootstrap.APP_TITLE_LOWERCASE;
-import static com.keenwrite.Constants.*;
+import static com.keenwrite.constants.Constants.*;
import static com.keenwrite.Launcher.getVersion;
import static com.keenwrite.events.StatusEvent.clue;
src/main/java/com/keenwrite/preview/HtmlPreview.java
import java.util.Locale;
-import static com.keenwrite.Constants.*;
+import static com.keenwrite.constants.Constants.*;
import static com.keenwrite.Messages.get;
import static com.keenwrite.events.Bus.register;
src/main/java/com/keenwrite/processors/ProcessorContext.java
import com.keenwrite.Caret;
-import com.keenwrite.Constants;
+import com.keenwrite.constants.Constants;
import com.keenwrite.ExportFormat;
import com.keenwrite.io.FileType;
import com.keenwrite.preferences.Workspace;
import com.keenwrite.preview.HtmlPreview;
import java.nio.file.Path;
import java.util.Map;
import static com.keenwrite.AbstractFileFactory.lookup;
-import static com.keenwrite.Constants.DEFAULT_DIRECTORY;
+import static com.keenwrite.constants.Constants.DEFAULT_DIRECTORY;
/**
src/main/java/com/keenwrite/processors/markdown/extensions/CaretExtension.java
import com.keenwrite.Caret;
-import com.keenwrite.Constants;
+import com.keenwrite.constants.Constants;
import com.keenwrite.processors.ProcessorContext;
import com.vladsch.flexmark.ext.tables.TableBlock;
import org.jetbrains.annotations.NotNull;
-import static com.keenwrite.Constants.CARET_ID;
+import static com.keenwrite.constants.Constants.CARET_ID;
import static com.keenwrite.processors.markdown.extensions.EmptyNode.EMPTY_NODE;
import static com.vladsch.flexmark.html.HtmlRenderer.Builder;
src/main/java/com/keenwrite/processors/markdown/extensions/fences/FencedBlockExtension.java
import java.util.zip.Deflater;
-import static com.keenwrite.Constants.DIAGRAM_SERVER_NAME;
+import static com.keenwrite.constants.Constants.DIAGRAM_SERVER_NAME;
import static com.keenwrite.events.StatusEvent.clue;
import static com.vladsch.flexmark.html.HtmlRenderer.Builder;
src/main/java/com/keenwrite/processors/r/InlineRProcessor.java
import java.util.concurrent.atomic.AtomicBoolean;
-import static com.keenwrite.Constants.STATUS_PARSE_ERROR;
+import static com.keenwrite.constants.Constants.STATUS_PARSE_ERROR;
import static com.keenwrite.Messages.get;
import static com.keenwrite.events.StatusEvent.clue;
src/main/java/com/keenwrite/service/events/impl/ButtonOrderPane.java
import javafx.scene.control.DialogPane;
-import static com.keenwrite.Constants.sSettings;
+import static com.keenwrite.constants.Constants.sSettings;
import static javafx.scene.control.ButtonBar.BUTTON_ORDER_WINDOWS;
src/main/java/com/keenwrite/service/events/impl/DefaultNotifier.java
import java.nio.file.Path;
-import static com.keenwrite.GraphicsConstants.ICON_DIALOG_NODE;
+import static com.keenwrite.constants.GraphicsConstants.ICON_DIALOG_NODE;
import static com.keenwrite.Messages.get;
import static javafx.scene.control.Alert.AlertType.CONFIRMATION;
src/main/java/com/keenwrite/service/impl/DefaultSettings.java
import java.util.List;
-import static com.keenwrite.Constants.PATH_PROPERTIES_SETTINGS;
+import static com.keenwrite.constants.Constants.PATH_PROPERTIES_SETTINGS;
/**
src/main/java/com/keenwrite/spelling/impl/SymSpellSpeller.java
import java.util.stream.Collectors;
-import static com.keenwrite.Constants.LEXICONS_DIRECTORY;
+import static com.keenwrite.constants.Constants.LEXICONS_DIRECTORY;
import static com.keenwrite.events.StatusEvent.clue;
import static io.gitlab.rxp90.jsymspell.SymSpell.Verbosity;
src/main/java/com/keenwrite/typesetting/Typesetter.java
import java.util.concurrent.ExecutorService;
-import static com.keenwrite.Constants.DEFAULT_DIRECTORY;
+import static com.keenwrite.constants.Constants.DEFAULT_DIRECTORY;
import static com.keenwrite.Messages.get;
import static com.keenwrite.events.StatusEvent.clue;
src/main/java/com/keenwrite/ui/actions/Action.java
import java.util.List;
-import static com.keenwrite.Constants.ACTION_PREFIX;
+import static com.keenwrite.constants.Constants.ACTION_PREFIX;
import static com.keenwrite.ui.fonts.IconFactory.createGraphic;
import static javafx.scene.input.KeyCombination.valueOf;
src/main/java/com/keenwrite/ui/actions/ApplicationActions.java
import static com.keenwrite.Bootstrap.*;
-import static com.keenwrite.GraphicsConstants.ICON_DIALOG_NODE;
+import static com.keenwrite.constants.GraphicsConstants.ICON_DIALOG_NODE;
import static com.keenwrite.ExportFormat.*;
import static com.keenwrite.Messages.get;
src/main/java/com/keenwrite/ui/actions/FileChooserCommand.java
import java.util.Optional;
-import static com.keenwrite.Constants.*;
+import static com.keenwrite.constants.Constants.*;
import static com.keenwrite.Messages.get;
import static com.keenwrite.io.FileType.*;
src/main/java/com/keenwrite/ui/dialogs/AbstractDialog.java
import javafx.stage.Window;
-import static com.keenwrite.GraphicsConstants.ICON_DIALOG;
+import static com.keenwrite.constants.GraphicsConstants.ICON_DIALOG;
import static com.keenwrite.Messages.get;
import static javafx.scene.control.ButtonType.CANCEL;
src/main/java/com/keenwrite/ui/explorer/FilesView.java
import java.util.Locale;
-import static com.keenwrite.Constants.UI_CONTROL_SPACING;
+import static com.keenwrite.constants.Constants.UI_CONTROL_SPACING;
import static com.keenwrite.events.FileOpenEvent.fireFileOpenEvent;
import static com.keenwrite.events.StatusEvent.clue;
src/main/java/com/keenwrite/ui/logging/LogView.java
import static com.keenwrite.Bootstrap.APP_TITLE_LOWERCASE;
-import static com.keenwrite.Constants.ACTION_PREFIX;
-import static com.keenwrite.GraphicsConstants.ICON_DIALOG;
+import static com.keenwrite.constants.Constants.ACTION_PREFIX;
+import static com.keenwrite.constants.GraphicsConstants.ICON_DIALOG;
import static com.keenwrite.Messages.get;
import static com.keenwrite.events.Bus.register;
src/main/java/com/keenwrite/util/FontLoader.java
import java.util.Map;
-import static com.keenwrite.Constants.FONT_DIRECTORY;
+import static com.keenwrite.constants.Constants.FONT_DIRECTORY;
import static com.keenwrite.events.StatusEvent.clue;
import static com.keenwrite.util.ProtocolScheme.valueFrom;
src/test/java/com/keenwrite/processors/markdown/ImageLinkExtensionTest.java
import java.util.Map;
-import static com.keenwrite.Constants.DOCUMENT_DEFAULT;
+import static com.keenwrite.constants.Constants.DOCUMENT_DEFAULT;
import static com.keenwrite.ExportFormat.NONE;
import static java.lang.String.format;