Improve parsing

This commit is contained in:
azakhi
2018-08-20 20:12:45 +03:00
parent 7fb9378304
commit 387f08db85
9 changed files with 218 additions and 173 deletions

View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Linq;
using System.Windows.Media;
using Filtration.ObjectModel.BlockItemBaseTypes;
@@ -28,6 +29,8 @@ namespace Filtration.ObjectModel
public interface IItemFilterBlockBase
{
bool IsEdited { get; set; }
string OriginalText { get; set; }
}
public abstract class ItemFilterBlockBase : IItemFilterBlockBase
@@ -44,6 +47,8 @@ namespace Filtration.ObjectModel
public ICommandManager CommandManager { get; }
public IItemFilterScript ParentScript { get; set; }
public bool IsEdited { get; set; }
public string OriginalText { get; set; }
}
public interface IItemFilterCommentBlock : IItemFilterBlockBase
@@ -53,29 +58,60 @@ namespace Filtration.ObjectModel
public class ItemFilterCommentBlock : ItemFilterBlockBase, IItemFilterCommentBlock
{
private string _comment;
public ItemFilterCommentBlock(IItemFilterScript parentScript) : base(parentScript)
{
}
public string Comment { get; set; }
public string Comment
{
get { return _comment; }
set
{
_comment = value;
IsEdited = true;
}
}
}
public class ItemFilterBlock : ItemFilterBlockBase, IItemFilterBlock
{
private ItemFilterBlockGroup _blockGroup;
private bool _enabled;
private string _description;
internal ItemFilterBlock()
{
BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
BlockItems.CollectionChanged += new NotifyCollectionChangedEventHandler(OnBlockItemsChanged);
_enabled = true;
}
public ItemFilterBlock(IItemFilterScript parentScript) : base(parentScript)
{
BlockItems = new ObservableCollection<IItemFilterBlockItem> { ActionBlockItem };
BlockItems.CollectionChanged += new NotifyCollectionChangedEventHandler(OnBlockItemsChanged);
_enabled = true;
}
public bool Enabled { get; set; } = true;
public string Description { get; set; }
public bool Enabled
{
get { return _enabled; }
set
{
_enabled = value;
IsEdited = true;
}
}
public string Description
{
get { return _description; }
set
{
_description = value;
IsEdited = true;
}
}
public ItemFilterBlockGroup BlockGroup
{
@@ -114,12 +150,17 @@ namespace Filtration.ObjectModel
{
var actionBlock = BlockItems.OfType<ActionBlockItem>().First();
actionBlock.Action = value;
IsEdited = true;
}
}
public ActionBlockItem ActionBlockItem { get; } = new ActionBlockItem(BlockAction.Show);
public ObservableCollection<IItemFilterBlockItem> BlockItems { get; }
private void OnBlockItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
{
IsEdited = true;
}
public bool AddBlockItemAllowed(Type type)
{