diff --git a/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj index 280602d..012b86a 100644 --- a/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj +++ b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj @@ -95,6 +95,14 @@ {4aac3beb-1dc1-483e-9d11-0e9334e80227} Filtration.ObjectModel + + {46383F20-02DF-48B4-B092-9088FA4ACD5A} + Filtration.Parser.Interface + + + {10a7c2bc-ec6f-4a38-bdda-e35935004c02} + Filtration.Parser + {55e0a34c-e039-43d7-a024-a4045401cdda} Filtration diff --git a/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs b/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs index b6be80c..cb4874f 100644 --- a/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs +++ b/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs @@ -7,7 +7,7 @@ using Filtration.ItemFilterPreview.Tests.Properties; using Filtration.ObjectModel; using Filtration.ObjectModel.BlockItemTypes; using Filtration.ObjectModel.Enums; -using Filtration.Translators; +using Filtration.Parser.Services; using Moq; using NUnit.Framework; diff --git a/Filtration.Parser.Interface/Filtration.Parser.Interface.csproj b/Filtration.Parser.Interface/Filtration.Parser.Interface.csproj new file mode 100644 index 0000000..4b1496f --- /dev/null +++ b/Filtration.Parser.Interface/Filtration.Parser.Interface.csproj @@ -0,0 +1,64 @@ + + + + + Debug + AnyCPU + {46383F20-02DF-48B4-B092-9088FA4ACD5A} + Library + Properties + Filtration.Parser.Interface + Filtration.Parser.Interface + v4.6.1 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + {4aac3beb-1dc1-483e-9d11-0e9334e80227} + Filtration.ObjectModel + + + + + \ No newline at end of file diff --git a/Filtration.Parser.Interface/Properties/AssemblyInfo.cs b/Filtration.Parser.Interface/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a1768a3 --- /dev/null +++ b/Filtration.Parser.Interface/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Filtration.Parser.Interface")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Filtration.Parser.Interface")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("46383f20-02df-48b4-b092-9088fa4acd5a")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Filtration.Parser.Interface/Services/IBlockGroupHierarchyBuilder.cs b/Filtration.Parser.Interface/Services/IBlockGroupHierarchyBuilder.cs new file mode 100644 index 0000000..8487640 --- /dev/null +++ b/Filtration.Parser.Interface/Services/IBlockGroupHierarchyBuilder.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Filtration.ObjectModel; + +namespace Filtration.Parser.Interface.Services +{ + public interface IBlockGroupHierarchyBuilder + { + void Initialise(ItemFilterBlockGroup rootBlockGroup); + void Cleanup(); + ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable groupStrings); + } +} \ No newline at end of file diff --git a/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs b/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs new file mode 100644 index 0000000..c17fcec --- /dev/null +++ b/Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs @@ -0,0 +1,14 @@ +using System.Collections.ObjectModel; +using Filtration.ObjectModel; +using Filtration.ObjectModel.ThemeEditor; + +namespace Filtration.Parser.Interface.Services +{ + public interface IItemFilterBlockTranslator + { + IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, + ThemeComponentCollection masterComponentCollection); + string TranslateItemFilterBlockToString(IItemFilterBlock block); + void ReplaceColorBlockItemsFromString(ObservableCollection blockItems, string inputString); + } +} \ No newline at end of file diff --git a/Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs b/Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs new file mode 100644 index 0000000..6cb2e70 --- /dev/null +++ b/Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs @@ -0,0 +1,10 @@ +using Filtration.ObjectModel; + +namespace Filtration.Parser.Interface.Services +{ + public interface IItemFilterScriptTranslator + { + ItemFilterScript TranslateStringToItemFilterScript(string inputString); + string TranslateItemFilterScriptToString(ItemFilterScript script); + } +} \ No newline at end of file diff --git a/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj b/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj new file mode 100644 index 0000000..ecadafe --- /dev/null +++ b/Filtration.Parser.Tests/Filtration.Parser.Tests.csproj @@ -0,0 +1,139 @@ + + + + Debug + AnyCPU + {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5} + Library + Properties + Filtration.Parser.Tests + Filtration.Parser.Tests + v4.6.1 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.dll + True + + + ..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.Core.dll + True + + + ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll + True + + + ..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll + True + + + + + + + + + + + + + + + + + + + + + + True + True + Resources.resx + + + + + + + + + + + {4aac3beb-1dc1-483e-9d11-0e9334e80227} + Filtration.ObjectModel + + + {46383f20-02df-48b4-b092-9088fa4acd5a} + Filtration.Parser.Interface + + + {10a7c2bc-ec6f-4a38-bdda-e35935004c02} + Filtration.Parser + + + + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + + + + + + + + + False + + + False + + + False + + + False + + + + + + + + \ No newline at end of file diff --git a/Filtration.Parser.Tests/Properties/AssemblyInfo.cs b/Filtration.Parser.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..ed56caa --- /dev/null +++ b/Filtration.Parser.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Filtration.Parser.Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Filtration.Parser.Tests")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("1f30cf6d-a5bf-4777-b8ba-e34f439fe8e5")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Filtration.Parser.Tests/Properties/Resources.Designer.cs b/Filtration.Parser.Tests/Properties/Resources.Designer.cs new file mode 100644 index 0000000..b4a2cb0 --- /dev/null +++ b/Filtration.Parser.Tests/Properties/Resources.Designer.cs @@ -0,0 +1,120 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Filtration.Parser.Tests.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Filtration.Parser.Tests.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to # Item Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration + ///# Begin Script Description + ///# This is a test script + ///# + ///# End Script Description + /// + ///# First test condition booyah + ///Show + /// ItemLevel = 32 + /// DropLevel >= 85 + /// Quality >= 15 + /// Sockets < 4 + /// LinkedSockets >= 3 + /// SetFontSize 12 + /// + ///# Section: Gud stuff u shud pick up m9 + /// + ///# Second test condition + ///Show + /// ItemLevel > 50 + /// Quality >= 15 + /// Rarity > Magic + /// Class "Test Class 1" "Test Class 2" "Test Class [rest of string was truncated]";. + /// + public static string testscript { + get { + return ResourceManager.GetString("testscript", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ###BETA VERSION 1.0.0.1-8 + ///#Please test and let me know via pm on reddit /u/brute_force or @Thiole in game if i am online + /// + ///#------------------------------------------------------------------ + ///#Fishing Rods First OFC + ///Show + /// Class Fishing Rods + /// SetTextColor 0 0 0 + /// SetBorderColor 0 0 0 + /// SetBackgroundColor 255 255 255 + /// + ///Show + /// Class "Quest Items" + /// + ///#####Shows better currency differently from lower currency for efficiency + ///##### skill gems + ///Show + /// Class "Active Skill Gems" "Support Skil [rest of string was truncated]";. + /// + public static string ThioleItemFilter { + get { + return ResourceManager.GetString("ThioleItemFilter", resourceCulture); + } + } + } +} diff --git a/Filtration.Parser.Tests/Properties/Resources.resx b/Filtration.Parser.Tests/Properties/Resources.resx new file mode 100644 index 0000000..9797aeb --- /dev/null +++ b/Filtration.Parser.Tests/Properties/Resources.resx @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\ThioleItemFilter.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + + ..\Resources\testscript.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + \ No newline at end of file diff --git a/Filtration.Tests/Resources/ThioleItemFilter.txt b/Filtration.Parser.Tests/Resources/ThioleItemFilter.txt similarity index 100% rename from Filtration.Tests/Resources/ThioleItemFilter.txt rename to Filtration.Parser.Tests/Resources/ThioleItemFilter.txt diff --git a/Filtration.Tests/Resources/testscript.txt b/Filtration.Parser.Tests/Resources/testscript.txt similarity index 100% rename from Filtration.Tests/Resources/testscript.txt rename to Filtration.Parser.Tests/Resources/testscript.txt diff --git a/Filtration.Tests/Translators/TestBlockGroupHierarchyBuilder.cs b/Filtration.Parser.Tests/Services/TestBlockGroupHierarchyBuilder.cs similarity index 98% rename from Filtration.Tests/Translators/TestBlockGroupHierarchyBuilder.cs rename to Filtration.Parser.Tests/Services/TestBlockGroupHierarchyBuilder.cs index 724741e..246615d 100644 --- a/Filtration.Tests/Translators/TestBlockGroupHierarchyBuilder.cs +++ b/Filtration.Parser.Tests/Services/TestBlockGroupHierarchyBuilder.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using Filtration.ObjectModel; -using Filtration.Translators; +using Filtration.Parser.Services; using NUnit.Framework; -namespace Filtration.Tests.Translators +namespace Filtration.Parser.Tests.Services { [TestFixture] public class TestBlockGroupHierarchyBuilder diff --git a/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs similarity index 99% rename from Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs rename to Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs index 06d966a..f34cd4a 100644 --- a/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs +++ b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs @@ -8,11 +8,12 @@ using Filtration.ObjectModel.BlockItemBaseTypes; using Filtration.ObjectModel.BlockItemTypes; using Filtration.ObjectModel.Enums; using Filtration.ObjectModel.ThemeEditor; -using Filtration.Translators; +using Filtration.Parser.Interface.Services; +using Filtration.Parser.Services; using Moq; using NUnit.Framework; -namespace Filtration.Tests.Translators +namespace Filtration.Parser.Tests.Services { [TestFixture] public class TestItemFilterBlockTranslator diff --git a/Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs similarity index 99% rename from Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs rename to Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs index 683c51e..bec3bd6 100644 --- a/Filtration.Tests/Translators/TestItemFilterScriptTranslator.cs +++ b/Filtration.Parser.Tests/Services/TestItemFilterScriptTranslator.cs @@ -1,19 +1,18 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Reflection; using Filtration.ObjectModel; using Filtration.ObjectModel.BlockItemTypes; using Filtration.ObjectModel.Enums; using Filtration.ObjectModel.ThemeEditor; +using Filtration.Parser.Interface.Services; +using Filtration.Parser.Services; +using Filtration.Parser.Tests.Properties; using Filtration.Properties; -using Filtration.Translators; using Moq; using NUnit.Framework; -using Resources = Filtration.Tests.Properties.Resources; -namespace Filtration.Tests.Translators +namespace Filtration.Parser.Tests.Services { [TestFixture] public class TestItemFilterScriptTranslator @@ -48,6 +47,7 @@ namespace Filtration.Tests.Translators { // Arrange var testInput = Resources.testscript; + var expectedDescription = "Item Filter Script created by Filtration v0.1 - www.github.com/XVar/filtration" + Environment.NewLine + "Begin Script Description" + Environment.NewLine + "This is a test script" + Environment.NewLine + diff --git a/Filtration.Parser.Tests/packages.config b/Filtration.Parser.Tests/packages.config new file mode 100644 index 0000000..6063400 --- /dev/null +++ b/Filtration.Parser.Tests/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Filtration.Parser/Filtration.Parser.csproj b/Filtration.Parser/Filtration.Parser.csproj new file mode 100644 index 0000000..c685197 --- /dev/null +++ b/Filtration.Parser/Filtration.Parser.csproj @@ -0,0 +1,95 @@ + + + + + Debug + AnyCPU + {10A7C2BC-EC6F-4A38-BDDA-E35935004C02} + Library + Properties + Filtration.Parser + Filtration.Parser + v4.6.1 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll + True + + + ..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll + True + + + + + + + + + + + + + + Properties\Settings.Designer.cs + True + True + Settings.settings + + + + + + + + + + Properties\Settings.settings + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + {8cb44f28-2956-4c2a-9314-72727262edd4} + Filtration.Common + + + {4aac3beb-1dc1-483e-9d11-0e9334e80227} + Filtration.ObjectModel + + + {46383f20-02df-48b4-b092-9088fa4acd5a} + Filtration.Parser.Interface + + + + + \ No newline at end of file diff --git a/Filtration.Parser/Properties/AssemblyInfo.cs b/Filtration.Parser/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..d123c0c --- /dev/null +++ b/Filtration.Parser/Properties/AssemblyInfo.cs @@ -0,0 +1,39 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Filtration.Parser")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Filtration.Parser")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("10a7c2bc-ec6f-4a38-bdda-e35935004c02")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")] +[assembly: InternalsVisibleTo("Filtration.Parser.Tests")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file diff --git a/Filtration/Translators/BlockGroupHierarchyBuilder.cs b/Filtration.Parser/Services/BlockGroupHierarchyBuilder.cs similarity index 90% rename from Filtration/Translators/BlockGroupHierarchyBuilder.cs rename to Filtration.Parser/Services/BlockGroupHierarchyBuilder.cs index 1ece508..8ad3df4 100644 --- a/Filtration/Translators/BlockGroupHierarchyBuilder.cs +++ b/Filtration.Parser/Services/BlockGroupHierarchyBuilder.cs @@ -2,16 +2,10 @@ using System.Collections.Generic; using System.Linq; using Filtration.ObjectModel; +using Filtration.Parser.Interface.Services; -namespace Filtration.Translators +namespace Filtration.Parser.Services { - internal interface IBlockGroupHierarchyBuilder - { - void Initialise(ItemFilterBlockGroup rootBlockGroup); - void Cleanup(); - ItemFilterBlockGroup IntegrateStringListIntoBlockGroupHierarchy(IEnumerable groupStrings); - } - internal class BlockGroupHierarchyBuilder : IBlockGroupHierarchyBuilder { private ItemFilterBlockGroup _rootBlockGroup; diff --git a/Filtration/Translators/ItemFilterBlockTranslator.cs b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs similarity index 97% rename from Filtration/Translators/ItemFilterBlockTranslator.cs rename to Filtration.Parser/Services/ItemFilterBlockTranslator.cs index 6428add..64fe825 100644 --- a/Filtration/Translators/ItemFilterBlockTranslator.cs +++ b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs @@ -12,17 +12,10 @@ using Filtration.ObjectModel.BlockItemTypes; using Filtration.ObjectModel.Enums; using Filtration.ObjectModel.Extensions; using Filtration.ObjectModel.ThemeEditor; +using Filtration.Parser.Interface.Services; -namespace Filtration.Translators +namespace Filtration.Parser.Services { - internal interface IItemFilterBlockTranslator - { - IItemFilterBlock TranslateStringToItemFilterBlock(string inputString, - ThemeComponentCollection masterComponentCollection); - string TranslateItemFilterBlockToString(IItemFilterBlock block); - void ReplaceColorBlockItemsFromString(ObservableCollection blockItems, string inputString); - } - internal class ItemFilterBlockTranslator : IItemFilterBlockTranslator { private readonly IBlockGroupHierarchyBuilder _blockGroupHierarchyBuilder; diff --git a/Filtration/Translators/ItemFilterScriptTranslator.cs b/Filtration.Parser/Services/ItemFilterScriptTranslator.cs similarity index 96% rename from Filtration/Translators/ItemFilterScriptTranslator.cs rename to Filtration.Parser/Services/ItemFilterScriptTranslator.cs index 4298170..03dccde 100644 --- a/Filtration/Translators/ItemFilterScriptTranslator.cs +++ b/Filtration.Parser/Services/ItemFilterScriptTranslator.cs @@ -5,16 +5,11 @@ using System.Linq; using System.Text.RegularExpressions; using Filtration.Common.Utilities; using Filtration.ObjectModel; +using Filtration.Parser.Interface.Services; using Filtration.Properties; -namespace Filtration.Translators +namespace Filtration.Parser.Services { - internal interface IItemFilterScriptTranslator - { - ItemFilterScript TranslateStringToItemFilterScript(string inputString); - string TranslateItemFilterScriptToString(ItemFilterScript script); - } - internal class ItemFilterScriptTranslator : IItemFilterScriptTranslator { private readonly IItemFilterBlockTranslator _blockTranslator; diff --git a/Filtration.Parser/WindsorInstaller.cs b/Filtration.Parser/WindsorInstaller.cs new file mode 100644 index 0000000..2cea132 --- /dev/null +++ b/Filtration.Parser/WindsorInstaller.cs @@ -0,0 +1,29 @@ +using Castle.MicroKernel.Registration; +using Castle.MicroKernel.SubSystems.Configuration; +using Castle.Windsor; +using Filtration.Parser.Interface.Services; +using Filtration.Parser.Services; + +namespace Filtration.Parser +{ + public class WindsorInstaller : IWindsorInstaller + { + public void Install(IWindsorContainer container, IConfigurationStore store) + { + container.Register(Component + .For() + .ImplementedBy() + .LifestyleSingleton()); + + container.Register(Component + .For() + .ImplementedBy() + .LifestyleSingleton()); + + container.Register(Component + .For() + .ImplementedBy() + .LifestyleSingleton()); + } + } +} diff --git a/Filtration.Parser/packages.config b/Filtration.Parser/packages.config new file mode 100644 index 0000000..866ff2c --- /dev/null +++ b/Filtration.Parser/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Filtration.Tests/Filtration.Tests.csproj b/Filtration.Tests/Filtration.Tests.csproj index c8bea23..861daa9 100644 --- a/Filtration.Tests/Filtration.Tests.csproj +++ b/Filtration.Tests/Filtration.Tests.csproj @@ -68,9 +68,6 @@ - - - @@ -78,6 +75,8 @@ + + @@ -93,6 +92,10 @@ {4aac3beb-1dc1-483e-9d11-0e9334e80227} Filtration.ObjectModel + + {46383F20-02DF-48B4-B092-9088FA4ACD5A} + Filtration.Parser.Interface + {55e0a34c-e039-43d7-a024-a4045401cdda} Filtration @@ -104,12 +107,6 @@ Resources.Designer.cs - - - - - -