From 63200592bf77fa4d8d5804185e787731ee3bec91 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Mon, 12 Dec 2022 08:34:10 -0700 Subject: [PATCH] Ensure mandatory character replacements remain marked mandatory --- Source/FileManager/ReplacementCharacters.cs | 6 +++--- .../LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/FileManager/ReplacementCharacters.cs b/Source/FileManager/ReplacementCharacters.cs index c3982286..cc93451b 100644 --- a/Source/FileManager/ReplacementCharacters.cs +++ b/Source/FileManager/ReplacementCharacters.cs @@ -12,9 +12,9 @@ namespace FileManager public const int FIXED_COUNT = 6; internal const char QUOTE_MARK = '"'; - [JsonIgnore] public bool Mandatory { get; internal set; } + [JsonIgnore] public bool Mandatory { get; set; } [JsonProperty] public char CharacterToReplace { get; private set; } - [JsonProperty] public string ReplacementString { get; set; } + [JsonProperty] public string ReplacementString { get; private set; } [JsonProperty] public string Description { get; set; } public override string ToString() => $"{CharacterToReplace} → {ReplacementString} ({Description})"; @@ -24,7 +24,7 @@ namespace FileManager ReplacementString = replacementString; Description = description; } - private Replacement(char charToReplace, string replacementString, string description, bool mandatory = false) + private Replacement(char charToReplace, string replacementString, string description, bool mandatory) : this(charToReplace, replacementString, description) { Mandatory = mandatory; diff --git a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs index 3d7921e2..5524678e 100644 --- a/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs @@ -51,7 +51,7 @@ namespace LibationAvalonia.Dialogs { var replacements = SOURCE .Where(r=> !r.IsDefault) - .Select(r => new Replacement(r.Character, r.ReplacementText, r.Description)) + .Select(r => new Replacement(r.Character, r.ReplacementText, r.Description) { Mandatory = r.Mandatory }) .ToList(); if (config is not null)