yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make static

Browse Source
This commit is contained in:
Ismail Mayat
2018-06-29 11:27:08 +01:00
parent 52a9fced07
commit 48362f50ba
2 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Umbraco.Core/Persistence/Factories/LanguageFactory.cs
View File

@@ -1,26 +1,26 @@
using System.Globalization;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence.Dtos;
namespace Umbraco.Core.Persistence.Factories
{
internal class LanguageFactory
{
public ILanguage BuildEntity(LanguageDto dto)
{
var lang = new Language(dto.IsoCode) { CultureName = dto.CultureName, Id = dto.Id, IsDefaultVariantLanguage = dto.IsDefaultVariantLanguage, Mandatory = dto.Mandatory };
// reset dirty initial properties (U4-1946)
lang.ResetDirtyProperties(false);
return lang;
}
public LanguageDto BuildDto(ILanguage entity)
{
var dto = new LanguageDto { CultureName = entity.CultureName, IsoCode = entity.IsoCode, IsDefaultVariantLanguage = entity.IsDefaultVariantLanguage, Mandatory = entity.Mandatory };
if (entity.HasIdentity)
dto.Id = short.Parse(entity.Id.ToString(CultureInfo.InvariantCulture));
return dto;
}
}
}
using System.Globalization;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence.Dtos;
namespace Umbraco.Core.Persistence.Factories
{
internal static class LanguageFactory
{
public static ILanguage BuildEntity(LanguageDto dto)
{
var lang = new Language(dto.IsoCode) { CultureName = dto.CultureName, Id = dto.Id, IsDefaultVariantLanguage = dto.IsDefaultVariantLanguage, Mandatory = dto.Mandatory };
// reset dirty initial properties (U4-1946)
lang.ResetDirtyProperties(false);
return lang;
}
public static LanguageDto BuildDto(ILanguage entity)
{
var dto = new LanguageDto { CultureName = entity.CultureName, IsoCode = entity.IsoCode, IsDefaultVariantLanguage = entity.IsDefaultVariantLanguage, Mandatory = entity.Mandatory };
if (entity.HasIdentity)
dto.Id = short.Parse(entity.Id.ToString(CultureInfo.InvariantCulture));
return dto;
}
}
}

12
src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
View File

@@ -139,8 +139,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
IsolatedCache.ClearAllCache();
}
var factory = new LanguageFactory();
var dto = factory.BuildDto(entity);
;
var dto = LanguageFactory.BuildDto(entity);
var id = Convert.ToInt32(Database.Insert(dto));
entity.Id = id;
@@ -163,9 +163,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
//We need to clear the whole cache since all languages will be updated
IsolatedCache.ClearAllCache();
}
var factory = new LanguageFactory();
var dto = factory.BuildDto(entity);
var dto = LanguageFactory.BuildDto(entity);
Database.Update(dto);
@@ -197,8 +196,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
protected ILanguage ConvertFromDto(LanguageDto dto)
{
var factory = new LanguageFactory();
var entity = factory.BuildEntity(dto);
var entity = LanguageFactory.BuildEntity(dto);
return entity;
}