From 8bfbe7cc663d5834f18ac09300b9ccbfe10bc964 Mon Sep 17 00:00:00 2001
From: Ben Wallis <atomyc+github@gmail.com>
Date: Sun, 31 Jan 2016 11:56:55 +0000
Subject: [PATCH] Refactored parsing services into separate project
---
.../Filtration.ItemFilterPreview.Tests.csproj | 8 +
.../Services/TestItemFilterProcessor.cs | 2 +-
.../Filtration.Parser.Interface.csproj | 64 ++++++++
.../Properties/AssemblyInfo.cs | 36 +++++
.../Services/IBlockGroupHierarchyBuilder.cs | 12 ++
.../Services/IItemFilterBlockTranslator.cs | 14 ++
.../Services/IItemFilterScriptTranslator.cs | 10 ++
.../Filtration.Parser.Tests.csproj | 139 ++++++++++++++++++
.../Properties/AssemblyInfo.cs | 36 +++++
.../Properties/Resources.Designer.cs | 120 +++++++++++++++
.../Properties/Resources.resx | 127 ++++++++++++++++
.../Resources/ThioleItemFilter.txt | 0
.../Resources/testscript.txt | 0
.../TestBlockGroupHierarchyBuilder.cs | 4 +-
.../TestItemFilterBlockTranslator.cs | 5 +-
.../TestItemFilterScriptTranslator.cs | 10 +-
Filtration.Parser.Tests/packages.config | 6 +
Filtration.Parser/Filtration.Parser.csproj | 95 ++++++++++++
Filtration.Parser/Properties/AssemblyInfo.cs | 39 +++++
.../Services}/BlockGroupHierarchyBuilder.cs | 10 +-
.../Services}/ItemFilterBlockTranslator.cs | 11 +-
.../Services}/ItemFilterScriptTranslator.cs | 9 +-
Filtration.Parser/WindsorInstaller.cs | 29 ++++
Filtration.Parser/packages.config | 5 +
Filtration.Tests/Filtration.Tests.csproj | 15 +-
.../Properties/Resources.Designer.cs | 57 -------
Filtration.Tests/Properties/Resources.resx | 7 +-
.../TestItemFilterPersistenceService.cs | 2 +-
Filtration.sln | 54 +++++++
Filtration/App.xaml.cs | 11 +-
Filtration/Filtration.csproj | 16 +-
.../Services/ItemFilterPersistenceService.cs | 2 +-
.../ViewModels/ItemFilterScriptViewModel.cs | 2 +-
Filtration/ViewModels/MainWindowViewModel.cs | 2 +-
.../ToolPanes/BlockOutputPreviewViewModel.cs | 2 +-
.../WindsorInstallers/TranslatorsInstaller.cs | 28 ----
36 files changed, 842 insertions(+), 147 deletions(-)
create mode 100644 Filtration.Parser.Interface/Filtration.Parser.Interface.csproj
create mode 100644 Filtration.Parser.Interface/Properties/AssemblyInfo.cs
create mode 100644 Filtration.Parser.Interface/Services/IBlockGroupHierarchyBuilder.cs
create mode 100644 Filtration.Parser.Interface/Services/IItemFilterBlockTranslator.cs
create mode 100644 Filtration.Parser.Interface/Services/IItemFilterScriptTranslator.cs
create mode 100644 Filtration.Parser.Tests/Filtration.Parser.Tests.csproj
create mode 100644 Filtration.Parser.Tests/Properties/AssemblyInfo.cs
create mode 100644 Filtration.Parser.Tests/Properties/Resources.Designer.cs
create mode 100644 Filtration.Parser.Tests/Properties/Resources.resx
rename {Filtration.Tests => Filtration.Parser.Tests}/Resources/ThioleItemFilter.txt (100%)
rename {Filtration.Tests => Filtration.Parser.Tests}/Resources/testscript.txt (100%)
rename {Filtration.Tests/Translators => Filtration.Parser.Tests/Services}/TestBlockGroupHierarchyBuilder.cs (98%)
rename {Filtration.Tests/Translators => Filtration.Parser.Tests/Services}/TestItemFilterBlockTranslator.cs (99%)
rename {Filtration.Tests/Translators => Filtration.Parser.Tests/Services}/TestItemFilterScriptTranslator.cs (99%)
create mode 100644 Filtration.Parser.Tests/packages.config
create mode 100644 Filtration.Parser/Filtration.Parser.csproj
create mode 100644 Filtration.Parser/Properties/AssemblyInfo.cs
rename {Filtration/Translators => Filtration.Parser/Services}/BlockGroupHierarchyBuilder.cs (90%)
rename {Filtration/Translators => Filtration.Parser/Services}/ItemFilterBlockTranslator.cs (97%)
rename {Filtration/Translators => Filtration.Parser/Services}/ItemFilterScriptTranslator.cs (96%)
create mode 100644 Filtration.Parser/WindsorInstaller.cs
create mode 100644 Filtration.Parser/packages.config
delete mode 100644 Filtration/WindsorInstallers/TranslatorsInstaller.cs
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 @@
<Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
<Name>Filtration.ObjectModel</Name>
</ProjectReference>
+ <ProjectReference Include="..\Filtration.Parser.Interface\Filtration.Parser.Interface.csproj">
+ <Project>{46383F20-02DF-48B4-B092-9088FA4ACD5A}</Project>
+ <Name>Filtration.Parser.Interface</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Filtration.Parser\Filtration.Parser.csproj">
+ <Project>{10a7c2bc-ec6f-4a38-bdda-e35935004c02}</Project>
+ <Name>Filtration.Parser</Name>
+ </ProjectReference>
<ProjectReference Include="..\Filtration\Filtration.csproj">
<Project>{55e0a34c-e039-43d7-a024-a4045401cdda}</Project>
<Name>Filtration</Name>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{46383F20-02DF-48B4-B092-9088FA4ACD5A}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Filtration.Parser.Interface</RootNamespace>
+ <AssemblyName>Filtration.Parser.Interface</AssemblyName>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Services\IBlockGroupHierarchyBuilder.cs" />
+ <Compile Include="Services\IItemFilterBlockTranslator.cs" />
+ <Compile Include="Services\IItemFilterScriptTranslator.cs" />
+ </ItemGroup>
+ <ItemGroup />
+ <ItemGroup>
+ <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+ <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+ <Name>Filtration.ObjectModel</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ 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<string> 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<IItemFilterBlockItem> 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Filtration.Parser.Tests</RootNamespace>
+ <AssemblyName>Filtration.Parser.Tests</AssemblyName>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+ <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+ <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+ <IsCodedUITest>False</IsCodedUITest>
+ <TestProjectType>UnitTest</TestProjectType>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+ <HintPath>..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+ <HintPath>..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.Core.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+ <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="nunit.framework, Version=3.0.5813.39031, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="PresentationCore" />
+ <Reference Include="System" />
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Xml.Linq" />
+ </ItemGroup>
+ <Choose>
+ <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+ <ItemGroup>
+ <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ </ItemGroup>
+ </When>
+ <Otherwise>
+ <ItemGroup>
+ <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
+ </ItemGroup>
+ </Otherwise>
+ </Choose>
+ <ItemGroup>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="Services\TestBlockGroupHierarchyBuilder.cs" />
+ <Compile Include="Services\TestItemFilterBlockTranslator.cs" />
+ <Compile Include="Services\TestItemFilterScriptTranslator.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+ <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+ <Name>Filtration.ObjectModel</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Filtration.Parser.Interface\Filtration.Parser.Interface.csproj">
+ <Project>{46383f20-02df-48b4-b092-9088fa4acd5a}</Project>
+ <Name>Filtration.Parser.Interface</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Filtration.Parser\Filtration.Parser.csproj">
+ <Project>{10a7c2bc-ec6f-4a38-bdda-e35935004c02}</Project>
+ <Name>Filtration.Parser</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\ThioleItemFilter.txt" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>PublicResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\testscript.txt" />
+ </ItemGroup>
+ <Choose>
+ <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+ <ItemGroup>
+ <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ </ItemGroup>
+ </When>
+ </Choose>
+ <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ 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 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// 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.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Filtration.Parser.Tests.Properties {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // 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() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [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;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// 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]";.
+ /// </summary>
+ public static string testscript {
+ get {
+ return ResourceManager.GetString("testscript", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// 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]";.
+ /// </summary>
+ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="ThioleItemFilter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ThioleItemFilter.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="testscript" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\testscript.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+</root>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="FluentAssertions" version="4.2.1" targetFramework="net46" />
+ <package id="Moq" version="4.2.1510.2205" targetFramework="net46" />
+ <package id="NUnit" version="3.0.1" targetFramework="net46" />
+</packages>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Filtration.Parser</RootNamespace>
+ <AssemblyName>Filtration.Parser</AssemblyName>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="PresentationCore" />
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\Filtration\Properties\Settings.Designer.cs">
+ <Link>Properties\Settings.Designer.cs</Link>
+ <AutoGen>True</AutoGen>
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ <DependentUpon>Settings.settings</DependentUpon>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Services\BlockGroupHierarchyBuilder.cs" />
+ <Compile Include="Services\ItemFilterBlockTranslator.cs" />
+ <Compile Include="Services\ItemFilterScriptTranslator.cs" />
+ <Compile Include="WindsorInstaller.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\Filtration\Properties\Settings.settings">
+ <Link>Properties\Settings.settings</Link>
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+ </None>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Filtration.Common\Filtration.Common.csproj">
+ <Project>{8cb44f28-2956-4c2a-9314-72727262edd4}</Project>
+ <Name>Filtration.Common</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Filtration.ObjectModel\Filtration.ObjectModel.csproj">
+ <Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
+ <Name>Filtration.ObjectModel</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Filtration.Parser.Interface\Filtration.Parser.Interface.csproj">
+ <Project>{46383f20-02df-48b4-b092-9088fa4acd5a}</Project>
+ <Name>Filtration.Parser.Interface</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ 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<string> 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<IItemFilterBlockItem> 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<IBlockGroupHierarchyBuilder>()
+ .ImplementedBy<BlockGroupHierarchyBuilder>()
+ .LifestyleSingleton());
+
+ container.Register(Component
+ .For<IItemFilterBlockTranslator>()
+ .ImplementedBy<ItemFilterBlockTranslator>()
+ .LifestyleSingleton());
+
+ container.Register(Component
+ .For<IItemFilterScriptTranslator>()
+ .ImplementedBy<ItemFilterScriptTranslator>()
+ .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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Castle.Core" version="3.3.0" targetFramework="net461" />
+ <package id="Castle.Windsor" version="3.3.0" targetFramework="net461" />
+</packages>
\ 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 @@
<Compile Include="Services\TestItemFilterPersistenceService.cs" />
<Compile Include="Services\TestStaticDataService.cs" />
<Compile Include="Services\TestUpdateService.cs" />
- <Compile Include="Translators\TestBlockGroupHierarchyBuilder.cs" />
- <Compile Include="Translators\TestItemFilterBlockTranslator.cs" />
- <Compile Include="Translators\TestItemFilterScriptTranslator.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
@@ -78,6 +75,8 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Models\" />
+ <Folder Include="Resources\" />
+ <Folder Include="Translators\" />
<Folder Include="ViewModels\" />
</ItemGroup>
<ItemGroup>
@@ -93,6 +92,10 @@
<Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
<Name>Filtration.ObjectModel</Name>
</ProjectReference>
+ <ProjectReference Include="..\Filtration.Parser.Interface\Filtration.Parser.Interface.csproj">
+ <Project>{46383F20-02DF-48B4-B092-9088FA4ACD5A}</Project>
+ <Name>Filtration.Parser.Interface</Name>
+ </ProjectReference>
<ProjectReference Include="..\Filtration\Filtration.csproj">
<Project>{55e0a34c-e039-43d7-a024-a4045401cdda}</Project>
<Name>Filtration</Name>
@@ -104,12 +107,6 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
- <ItemGroup>
- <None Include="Resources\ThioleItemFilter.txt" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\testscript.txt" />
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Filtration.Tests/Properties/Resources.Designer.cs b/Filtration.Tests/Properties/Resources.Designer.cs
index fd8de9b..27d2857 100644
--- a/Filtration.Tests/Properties/Resources.Designer.cs
+++ b/Filtration.Tests/Properties/Resources.Designer.cs
@@ -59,62 +59,5 @@ namespace Filtration.Tests.Properties {
resourceCulture = value;
}
}
-
- /// <summary>
- /// 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]";.
- /// </summary>
- internal static string testscript {
- get {
- return ResourceManager.GetString("testscript", resourceCulture);
- }
- }
-
- /// <summary>
- /// 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]";.
- /// </summary>
- internal static string ThioleItemFilter {
- get {
- return ResourceManager.GetString("ThioleItemFilter", resourceCulture);
- }
- }
}
}
diff --git a/Filtration.Tests/Properties/Resources.resx b/Filtration.Tests/Properties/Resources.resx
index 718b601..b086c0e 100644
--- a/Filtration.Tests/Properties/Resources.resx
+++ b/Filtration.Tests/Properties/Resources.resx
@@ -118,10 +118,5 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="testscript" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\testscript.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
- </data>
- <data name="ThioleItemFilter" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ThioleItemFilter.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
- </data>
+
</root>
\ No newline at end of file
diff --git a/Filtration.Tests/Services/TestItemFilterPersistenceService.cs b/Filtration.Tests/Services/TestItemFilterPersistenceService.cs
index bdfc4ea..6e27f0b 100644
--- a/Filtration.Tests/Services/TestItemFilterPersistenceService.cs
+++ b/Filtration.Tests/Services/TestItemFilterPersistenceService.cs
@@ -2,8 +2,8 @@
using System.Threading.Tasks;
using Filtration.Common.Services;
using Filtration.ObjectModel;
+using Filtration.Parser.Interface.Services;
using Filtration.Services;
-using Filtration.Translators;
using Moq;
using NUnit.Framework;
diff --git a/Filtration.sln b/Filtration.sln
index f404c6f..663beac 100644
--- a/Filtration.sln
+++ b/Filtration.sln
@@ -25,6 +25,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.ItemFilterPrevie
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.ItemFilterPreview.Tests", "Filtration.ItemFilterPreview.Tests\Filtration.ItemFilterPreview.Tests.csproj", "{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.Parser", "Filtration.Parser\Filtration.Parser.csproj", "{10A7C2BC-EC6F-4A38-BDDA-E35935004C02}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.Parser.Interface", "Filtration.Parser.Interface\Filtration.Parser.Interface.csproj", "{46383F20-02DF-48B4-B092-9088FA4ACD5A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.Parser.Tests", "Filtration.Parser.Tests\Filtration.Parser.Tests.csproj", "{1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -213,6 +219,54 @@ Global
{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x64.Build.0 = Release|Any CPU
{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x86.ActiveCfg = Release|Any CPU
{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x86.Build.0 = Release|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|ARM.Build.0 = Debug|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|x64.Build.0 = Debug|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Debug|x86.Build.0 = Debug|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|Any CPU.Build.0 = Release|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|ARM.ActiveCfg = Release|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|ARM.Build.0 = Release|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|x64.ActiveCfg = Release|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|x64.Build.0 = Release|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|x86.ActiveCfg = Release|Any CPU
+ {10A7C2BC-EC6F-4A38-BDDA-E35935004C02}.Release|x86.Build.0 = Release|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|ARM.Build.0 = Debug|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|x64.Build.0 = Debug|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Debug|x86.Build.0 = Debug|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|ARM.ActiveCfg = Release|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|ARM.Build.0 = Release|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|x64.ActiveCfg = Release|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|x64.Build.0 = Release|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|x86.ActiveCfg = Release|Any CPU
+ {46383F20-02DF-48B4-B092-9088FA4ACD5A}.Release|x86.Build.0 = Release|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|ARM.Build.0 = Debug|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|x64.Build.0 = Debug|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Debug|x86.Build.0 = Debug|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|ARM.ActiveCfg = Release|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|ARM.Build.0 = Release|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|x64.ActiveCfg = Release|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|x64.Build.0 = Release|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|x86.ActiveCfg = Release|Any CPU
+ {1F30CF6D-A5BF-4777-B8BA-E34F439FE8E5}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Filtration/App.xaml.cs b/Filtration/App.xaml.cs
index c471c85..abe7826 100644
--- a/Filtration/App.xaml.cs
+++ b/Filtration/App.xaml.cs
@@ -1,10 +1,13 @@
using System;
+using System.IO;
using System.Linq;
+using System.Reflection;
using System.Windows;
using System.Windows.Threading;
using AutoMapper;
using Castle.Facilities.TypedFactory;
using Castle.MicroKernel.ModelBuilder.Inspectors;
+using Castle.MicroKernel.Registration;
using Castle.Windsor;
using Castle.Windsor.Installer;
using Filtration.ObjectModel;
@@ -35,10 +38,12 @@ namespace Filtration
.Single();
_container.Kernel.ComponentModelBuilder.RemoveContributor(propInjector);
-
+
_container.AddFacility<TypedFactoryFacility>();
_container.Install(FromAssembly.InThisApplication());
-
+ _container.Install(FromAssembly.Named("Filtration.Parser")); // Not directly referenced so manually call its installers
+
+
Mapper.Configuration.ConstructServicesUsing(_container.Resolve);
Mapper.CreateMap<ItemFilterBlockGroup, ItemFilterBlockGroupViewModel>()
@@ -68,7 +73,7 @@ namespace Filtration
mainWindow.Show();
}
- public void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
+ private static void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
{
Logger.Fatal(e.Exception);
var exception = e.Exception.Message + Environment.NewLine + e.Exception.StackTrace;
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index 54f05d7..9e21326 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -166,9 +166,6 @@
<Compile Include="Services\StaticDataService.cs" />
<Compile Include="Services\UpdateCheckService.cs" />
<Compile Include="Settings.cs" />
- <Compile Include="Translators\BlockGroupHierarchyBuilder.cs" />
- <Compile Include="Translators\ItemFilterBlockTranslator.cs" />
- <Compile Include="Translators\ItemFilterScriptTranslator.cs" />
<Compile Include="UserControls\AutoScrollingListBox.cs" />
<Compile Include="UserControls\BlockItemControl.xaml.cs">
<DependentUpon>BlockItemControl.xaml</DependentUpon>
@@ -261,7 +258,6 @@
</Compile>
<Compile Include="WindsorInstallers\RepositoriesInstaller.cs" />
<Compile Include="WindsorInstallers\ServicesInstaller.cs" />
- <Compile Include="WindsorInstallers\TranslatorsInstaller.cs" />
<Compile Include="WindsorInstallers\ViewModelsInstaller.cs" />
<Compile Include="WindsorInstallers\ViewsInstaller.cs" />
<Page Include="UserControls\ItemPreviewControl.xaml">
@@ -507,12 +503,22 @@
<Project>{4aac3beb-1dc1-483e-9d11-0e9334e80227}</Project>
<Name>Filtration.ObjectModel</Name>
</ProjectReference>
+ <ProjectReference Include="..\Filtration.Parser.Interface\Filtration.Parser.Interface.csproj">
+ <Project>{46383f20-02df-48b4-b092-9088fa4acd5a}</Project>
+ <Name>Filtration.Parser.Interface</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Filtration.Parser\Filtration.Parser.csproj">
+ <Project>{10a7c2bc-ec6f-4a38-bdda-e35935004c02}</Project>
+ <Name>Filtration.Parser</Name>
+ </ProjectReference>
<ProjectReference Include="..\Filtration.ThemeEditor\Filtration.ThemeEditor.csproj">
<Project>{41b8f5c2-65aa-42f0-a20b-6f95b13a9f48}</Project>
<Name>Filtration.ThemeEditor</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <Folder Include="Translators\" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(XamlSpyInstallPath)MSBuild\FirstFloor.XamlSpy.WPF.targets" Condition="'$(XamlSpyInstallPath)' != '' and '$(Configuration)' == 'DEBUG'" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Filtration/Services/ItemFilterPersistenceService.cs b/Filtration/Services/ItemFilterPersistenceService.cs
index 21ef655..27646ec 100644
--- a/Filtration/Services/ItemFilterPersistenceService.cs
+++ b/Filtration/Services/ItemFilterPersistenceService.cs
@@ -2,8 +2,8 @@
using System.Threading.Tasks;
using Filtration.Common.Services;
using Filtration.ObjectModel;
+using Filtration.Parser.Interface.Services;
using Filtration.Properties;
-using Filtration.Translators;
namespace Filtration.Services
{
diff --git a/Filtration/ViewModels/ItemFilterScriptViewModel.cs b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
index f3660d7..739241b 100644
--- a/Filtration/ViewModels/ItemFilterScriptViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterScriptViewModel.cs
@@ -14,8 +14,8 @@ using Filtration.Common.ViewModels;
using Filtration.Interface;
using Filtration.ObjectModel;
using Filtration.ObjectModel.BlockItemBaseTypes;
+using Filtration.Parser.Interface.Services;
using Filtration.Services;
-using Filtration.Translators;
using GalaSoft.MvvmLight.CommandWpf;
using GalaSoft.MvvmLight.Messaging;
using NLog;
diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs
index 0a9ae41..0452e95 100644
--- a/Filtration/ViewModels/MainWindowViewModel.cs
+++ b/Filtration/ViewModels/MainWindowViewModel.cs
@@ -15,6 +15,7 @@ using Filtration.Interface;
using Filtration.Models;
using Filtration.ObjectModel.Enums;
using Filtration.ObjectModel.ThemeEditor;
+using Filtration.Parser.Interface.Services;
using Filtration.Properties;
using Filtration.Repositories;
using Filtration.Services;
@@ -22,7 +23,6 @@ using Filtration.ThemeEditor.Messages;
using Filtration.ThemeEditor.Providers;
using Filtration.ThemeEditor.Services;
using Filtration.ThemeEditor.ViewModels;
-using Filtration.Translators;
using Filtration.Views;
using GalaSoft.MvvmLight.CommandWpf;
using GalaSoft.MvvmLight.Messaging;
diff --git a/Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs b/Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs
index 4370b4d..4942333 100644
--- a/Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs
+++ b/Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs
@@ -1,6 +1,6 @@
using System;
using System.Windows.Media.Imaging;
-using Filtration.Translators;
+using Filtration.Parser.Interface.Services;
using GalaSoft.MvvmLight.Messaging;
namespace Filtration.ViewModels.ToolPanes
diff --git a/Filtration/WindsorInstallers/TranslatorsInstaller.cs b/Filtration/WindsorInstallers/TranslatorsInstaller.cs
deleted file mode 100644
index 549b9b5..0000000
--- a/Filtration/WindsorInstallers/TranslatorsInstaller.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Castle.MicroKernel.Registration;
-using Castle.MicroKernel.SubSystems.Configuration;
-using Castle.Windsor;
-using Filtration.Translators;
-
-namespace Filtration.WindsorInstallers
-{
- public class TranslatorsInstaller : IWindsorInstaller
- {
- public void Install(IWindsorContainer container, IConfigurationStore store)
- {
- container.Register(
- Component.For<IItemFilterScriptTranslator>()
- .ImplementedBy<ItemFilterScriptTranslator>()
- .LifeStyle.Singleton);
-
- container.Register(
- Component.For<IItemFilterBlockTranslator>()
- .ImplementedBy<ItemFilterBlockTranslator>()
- .LifeStyle.Singleton);
-
- container.Register(
- Component.For<IBlockGroupHierarchyBuilder>()
- .ImplementedBy<BlockGroupHierarchyBuilder>()
- .LifeStyle.Singleton);
- }
- }
-}