Browse Source

revert previous change

pull/1645/head
Christopher Brown 8 years ago
parent
commit
8246a44020
  1. 10
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs

10
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs

@ -117,7 +117,7 @@ namespace Xceed.Wpf.Toolkit
{ {
get get
{ {
return this._collectionControl; return _collectionControl;
} }
} }
@ -175,14 +175,14 @@ namespace Xceed.Wpf.Toolkit
} }
} }
this._collectionControl.PersistChanges(); _collectionControl.PersistChanges();
this.DialogResult = true; this.DialogResult = true;
this.Close(); this.Close();
} }
private void CancelButton_Click( object sender, RoutedEventArgs e ) private void CancelButton_Click( object sender, RoutedEventArgs e )
{ {
this._collectionControl.PersistChanges( originalData ); _collectionControl.PersistChanges( originalData );
this.DialogResult = false; this.DialogResult = false;
this.Close(); this.Close();
} }
@ -329,7 +329,7 @@ namespace Xceed.Wpf.Toolkit
private bool AreDictionaryKeysValid() private bool AreDictionaryKeysValid()
{ {
var keys = this._collectionControl.Items.Select( x => var keys = _collectionControl.Items.Select( x =>
{ {
var keyType = x.GetType().GetProperty( "Key" ); var keyType = x.GetType().GetProperty( "Key" );
if( keyType != null ) if( keyType != null )
@ -339,7 +339,7 @@ namespace Xceed.Wpf.Toolkit
return null; return null;
} ); } );
return ( keys.Distinct().Count() == this._collectionControl.Items.Count ) return ( keys.Distinct().Count() == _collectionControl.Items.Count )
&& keys.All( x => x != null ); && keys.All( x => x != null );
} }

Loading…
Cancel
Save