From 448bfc166f17543ec0744f9268c935f65c42becb Mon Sep 17 00:00:00 2001 From: jakobdyrby Date: Tue, 17 Jun 2014 07:12:59 +0200 Subject: [PATCH] revert to org files --- src/Umbraco.Core/Events/ExportEventArgs.cs | 2 +- src/Umbraco.Core/Services/DataTypeService.cs | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Core/Events/ExportEventArgs.cs b/src/Umbraco.Core/Events/ExportEventArgs.cs index ba464acee7..161a073615 100644 --- a/src/Umbraco.Core/Events/ExportEventArgs.cs +++ b/src/Umbraco.Core/Events/ExportEventArgs.cs @@ -2,7 +2,7 @@ using System.Xml.Linq; namespace Umbraco.Core.Events -{ +{ public class ExportEventArgs : CancellableObjectEventArgs> { /// diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs index 81d4cba48e..f1bf4d1321 100644 --- a/src/Umbraco.Core/Services/DataTypeService.cs +++ b/src/Umbraco.Core/Services/DataTypeService.cs @@ -76,23 +76,12 @@ namespace Umbraco.Core.Services /// Gets a by its control Id /// /// Id of the DataType control - /// /// Collection of objects with a matching contorl id - [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the overload GetDataTypeDefinitionByPropertyEditorAlias instead")] - public IEnumerable GetDataTypeDefinitionByControlId(Guid id, bool throwIfNotFound) - { - var alias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(id, throwIfNotFound); - if (alias == null) - { - return Enumerable.Empty(); - } - return GetDataTypeDefinitionByPropertyEditorAlias(alias); - } - [Obsolete("Property editor's are defined by a string alias from version 7 onwards, use the overload GetDataTypeDefinitionByPropertyEditorAlias instead")] public IEnumerable GetDataTypeDefinitionByControlId(Guid id) { - return GetDataTypeDefinitionByControlId(id, true); + var alias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(id, true); + return GetDataTypeDefinitionByPropertyEditorAlias(alias); } ///