From 7213035d69c6da2aee4e71ec98efe25cd7229b3f Mon Sep 17 00:00:00 2001 From: Kam Figy Date: Thu, 9 Jul 2015 18:31:13 -0700 Subject: [PATCH] refactoring --- Packages/repositories.config | 1 + Unicorn.sln | 6 ----- src/Unicorn.Tests/Unicorn.Tests.csproj | 4 +++ .../Data/ISerializableItemExtensions.cs | 9 ------- .../Comparison/DefaultComparison.cs | 17 ------------- .../Evaluators/Comparison/IFieldComparer.cs | 12 --------- .../Evaluators/Comparison/XmlComparison.cs | 25 ------------------- src/Unicorn/Unicorn.csproj | 7 ------ 8 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 src/Unicorn/Evaluators/Comparison/DefaultComparison.cs delete mode 100644 src/Unicorn/Evaluators/Comparison/IFieldComparer.cs delete mode 100644 src/Unicorn/Evaluators/Comparison/XmlComparison.cs diff --git a/Packages/repositories.config b/Packages/repositories.config index d3691e7d..9c54a54d 100644 --- a/Packages/repositories.config +++ b/Packages/repositories.config @@ -1,5 +1,6 @@  + diff --git a/Unicorn.sln b/Unicorn.sln index 5008fb23..3551022d 100644 --- a/Unicorn.sln +++ b/Unicorn.sln @@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rainbow.Storage.Sc", "..\Ra EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rainbow.Storage.Yaml", "..\Rainbow\src\Rainbow.Storage.Yaml\Rainbow.Storage.Yaml.csproj", "{371181C9-45DC-4885-8894-43FFC235D124}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rainbow.Diff", "..\Rainbow\src\Rainbow.Diff\Rainbow.Diff.csproj", "{A2259642-5E6B-4E80-8F48-269693A4DBE5}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -47,10 +45,6 @@ Global {371181C9-45DC-4885-8894-43FFC235D124}.Debug|Any CPU.Build.0 = Debug|Any CPU {371181C9-45DC-4885-8894-43FFC235D124}.Release|Any CPU.ActiveCfg = Release|Any CPU {371181C9-45DC-4885-8894-43FFC235D124}.Release|Any CPU.Build.0 = Release|Any CPU - {A2259642-5E6B-4E80-8F48-269693A4DBE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2259642-5E6B-4E80-8F48-269693A4DBE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2259642-5E6B-4E80-8F48-269693A4DBE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2259642-5E6B-4E80-8F48-269693A4DBE5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Unicorn.Tests/Unicorn.Tests.csproj b/src/Unicorn.Tests/Unicorn.Tests.csproj index e0973287..968a7bfd 100644 --- a/src/Unicorn.Tests/Unicorn.Tests.csproj +++ b/src/Unicorn.Tests/Unicorn.Tests.csproj @@ -76,6 +76,10 @@ + + {8ff75c8b-2a9e-4d95-91ad-333071813199} + Rainbow + {82c4441b-e11e-4601-b6b7-c5ad71b2ab70} Unicorn diff --git a/src/Unicorn/Data/ISerializableItemExtensions.cs b/src/Unicorn/Data/ISerializableItemExtensions.cs index 455cfd39..1da9df41 100644 --- a/src/Unicorn/Data/ISerializableItemExtensions.cs +++ b/src/Unicorn/Data/ISerializableItemExtensions.cs @@ -6,15 +6,6 @@ namespace Unicorn.Data { public static class SerializableItemExtensions { - /// - /// Helper method to get a specific version from a source item, if it exists - /// - /// Null if the version does not exist or the version if it exists - public static ISerializableVersion GetVersion(this ISerializableItem sourceItem, string language, int versionNumber) - { - return sourceItem.Versions.FirstOrDefault(x => x.Language.Name.Equals(language, StringComparison.OrdinalIgnoreCase) && x.VersionNumber == versionNumber); - } - public static string GetDisplayIdentifier(this ISerializableItem item) { return string.Format("{0}:{1} ({2})", item.DatabaseName, item.Path, item.Id); diff --git a/src/Unicorn/Evaluators/Comparison/DefaultComparison.cs b/src/Unicorn/Evaluators/Comparison/DefaultComparison.cs deleted file mode 100644 index c45ad397..00000000 --- a/src/Unicorn/Evaluators/Comparison/DefaultComparison.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Rainbow.Model; - -namespace Unicorn.Evaluators.Comparison -{ - public class DefaultComparison : IFieldComparer - { - public bool CanCompare(ISerializableFieldValue field1, ISerializableFieldValue field2) - { - return field1 != null && field2 != null; - } - - public bool AreEqual(ISerializableFieldValue field1, ISerializableFieldValue field2) - { - return field1.Value.Equals(field2.Value); - } - } -} diff --git a/src/Unicorn/Evaluators/Comparison/IFieldComparer.cs b/src/Unicorn/Evaluators/Comparison/IFieldComparer.cs deleted file mode 100644 index 34176ae1..00000000 --- a/src/Unicorn/Evaluators/Comparison/IFieldComparer.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Rainbow.Model; - -namespace Unicorn.Evaluators.Comparison -{ - public interface IFieldComparer - { - /// The field passed may have a null type value. - bool CanCompare(ISerializableFieldValue field1, ISerializableFieldValue field2); - - bool AreEqual(ISerializableFieldValue field1, ISerializableFieldValue field2); - } -} diff --git a/src/Unicorn/Evaluators/Comparison/XmlComparison.cs b/src/Unicorn/Evaluators/Comparison/XmlComparison.cs deleted file mode 100644 index 7e912f20..00000000 --- a/src/Unicorn/Evaluators/Comparison/XmlComparison.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Xml.Linq; -using Rainbow.Model; - -namespace Unicorn.Evaluators.Comparison -{ - public class XmlComparison : IFieldComparer - { - public bool CanCompare(ISerializableFieldValue field1, ISerializableFieldValue field2) - { - return (field1.FieldType != null && field1.FieldType.Equals("Layout", StringComparison.OrdinalIgnoreCase)) || - (field2.FieldType != null && field2.FieldType.Equals("Layout", StringComparison.OrdinalIgnoreCase)); - } - - public bool AreEqual(ISerializableFieldValue field1, ISerializableFieldValue field2) - { - if (string.IsNullOrWhiteSpace(field1.Value) || string.IsNullOrWhiteSpace(field2.Value)) return false; - - var x1 = XElement.Parse(field1.Value); - var x2 = XElement.Parse(field2.Value); - - return XNode.DeepEquals(x1, x2); - } - } -} diff --git a/src/Unicorn/Unicorn.csproj b/src/Unicorn/Unicorn.csproj index cc549c9a..4c560682 100644 --- a/src/Unicorn/Unicorn.csproj +++ b/src/Unicorn/Unicorn.csproj @@ -81,9 +81,6 @@ - - - @@ -149,10 +146,6 @@ - - {a2259642-5e6b-4e80-8f48-269693a4dbe5} - Rainbow.Diff - {956afe8b-51cd-4d61-b8c1-bffdc749fd82} Rainbow.Storage.Sc