Skip to content

Commit

Permalink
#983 Remove INotifyPropertyChanging and only support INotifyPropertyC…
Browse files Browse the repository at this point in the history
…hanged
  • Loading branch information
GeertvanHorrik committed Jun 13, 2017
1 parent f569c16 commit e19c206
Show file tree
Hide file tree
Showing 41 changed files with 43 additions and 846 deletions.
3 changes: 1 addition & 2 deletions doc/catel rules.txt
Expand Up @@ -3,10 +3,9 @@ Defines

All debug versions have DEBUG

NET35 NET, NET35
NET40 NET, NET40
NET45 NET, NET45
NET46 NET, NET46
NET47 NET, NET47
PCL PCL

Note that defines must be set for Debug and Release configurations
Expand Down
1 change: 1 addition & 0 deletions doc/history.txt
Expand Up @@ -106,6 +106,7 @@ Added/fixed:
(-) #131 Remove ISplashScreenService
(-) #916 Remove IXmlSerializer.OptimalizationMode in favor of ISerializationConfiguration.OptimalizationMode
(-) #974 Remove DynamicEventListener in favor of WeakEventListener
(-) #983 Remove INotifyPropertyChanging and only support INotifyPropertyChanged
(-) #1010 Remove PleaseWaitHelper and use busy indicator instead
(-) #1016 Remove CountCollapsedConverter since we already have CollectionToVisibilityConverter
(-) #1030 Remove CommandLineHelper in favor of Orc.CommandLine
Expand Down
8 changes: 0 additions & 8 deletions src/Catel.Core/Catel.Core.Shared/Catel.Core.Shared.projitems
Expand Up @@ -50,19 +50,13 @@
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\EventArgs\BeginEditEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\EventArgs\CancelEditCompletedEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\EventArgs\CancelEditEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\EventArgs\DataErrorsChangedEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\EventArgs\EditEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\EventArgs\EndEditEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\EventArgs\PropertyChangingEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\EventArgs\RunWorkerCompletedEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\Extensions\PropertyChangedEventArgsExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\IAdvancedEditableObject.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\IDataErrorInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\IDataWarningInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\INotifyDataErrorInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\INotifyDataWarningInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\INotifyPropertyChanging.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ComponentModel\RunWorkerCompletedEventHandler.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Configuration\ConfigurationContainer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Configuration\ConfigurationService.net.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Configuration\ConfigurationService.cs" />
Expand All @@ -86,7 +80,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Data\Validation\CompositeValidator.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Validation\CompositeValidatorProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\EventArgs\AdvancedPropertyChangedEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\EventArgs\AdvancedPropertyChangingEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\EventArgs\ValidationEventArgs.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Exceptions\InvalidPropertyException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Exceptions\InvalidPropertyValueException.cs" />
Expand All @@ -104,7 +97,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Data\Helpers\ValidationContextHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Helpers\XmlNameMapper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Interfaces\IAdvancedNotifyPropertyChanged.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Interfaces\IAdvancedNotifyPropertyChanging.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Interfaces\IModel.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Interfaces\IModelEditor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Interfaces\IModelEqualityComparer.cs" />
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion src/Catel.Core/Catel.Core.Shared/Data/Interfaces/IModel.cs
Expand Up @@ -15,7 +15,7 @@ namespace Catel.Data
/// <remarks>
/// This interface defines all the non-generic interfaces that the <see cref="ModelBase"/> class implements.
/// </remarks>
public interface IModel : INotifyPropertyChanging, INotifyPropertyChanged, IParent, IAdvancedEditableObject,
public interface IModel : INotifyPropertyChanged, IParent, IAdvancedEditableObject,
IModelEditor, IModelValidation, IModelSerialization
{
#region Properties
Expand Down
15 changes: 0 additions & 15 deletions src/Catel.Core/Catel.Core.Shared/Data/ModelBase.propertyediting.cs
Expand Up @@ -110,21 +110,6 @@ internal void SetValue(PropertyData property, object value, bool notifyOnChange,
oldValue = GetValueFast<object>(property.Name);
var areOldAndNewValuesEqual = ObjectHelper.AreEqualReferences(oldValue, value);

if (notifyOnChange && (AlwaysInvokeNotifyChanged || !areOldAndNewValuesEqual) && !LeanAndMeanModel)
{
if (changeNotificationsSuspensionContext == null)
{
var propertyChangingEventArgs = new AdvancedPropertyChangingEventArgs(property.Name);
RaisePropertyChanging(this, propertyChangingEventArgs);

if (propertyChangingEventArgs.Cancel)
{
Log.Debug("Change of property '{0}.{1}' is canceled in PropertyChanging event", GetType().FullName, property.Name);
return;
}
}
}

// Validate before assigning, dynamic properties will cause exception
if (validateAttributes && !LeanAndMeanModel)
{
Expand Down

0 comments on commit e19c206

Please sign in to comment.