Skip to content

Commit b4554d3

Browse files
author
Todd Berman
committed
Remove serialization cruft
1 parent 339162c commit b4554d3

9 files changed

+5
-77
lines changed

‎ReactiveUI.Platforms/Cocoa/ReactiveCollectionViewCell.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public abstract class ReactiveCollectionViewCell : UICollectionViewCell, IReacti
2626
public ReactiveCollectionViewCell() : base() { setupRxObj(); }
2727
public ReactiveCollectionViewCell(RectangleF frame) : base (frame) { setupRxObj(); }
2828

29-
[field:IgnoreDataMember]
3029
public event PropertyChangingEventHandler PropertyChanging;
3130

3231
void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs args) {
@@ -36,7 +35,6 @@ void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs ar
3635
}
3736
}
3837

39-
[field:IgnoreDataMember]
4038
public event PropertyChangedEventHandler PropertyChanged;
4139

4240
void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args) {
@@ -50,25 +48,19 @@ void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args
5048
/// Represents an Observable that fires *before* a property is about to
5149
/// be changed.
5250
/// </summary>
53-
[IgnoreDataMember]
5451
public IObservable<IObservedChange<object, object>> Changing {
5552
get { return this.getChangingObservable(); }
5653
}
5754

5855
/// <summary>
5956
/// Represents an Observable that fires *after* a property has changed.
6057
/// </summary>
61-
[IgnoreDataMember]
6258
public IObservable<IObservedChange<object, object>> Changed {
6359
get { return this.getChangedObservable(); }
6460
}
6561

66-
[IgnoreDataMember]
6762
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
6863

69-
[OnDeserialized]
70-
void setupRxObj(StreamingContext sc) { setupRxObj(); }
71-
7264
void setupRxObj()
7365
{
7466
this.setupReactiveExtension();

‎ReactiveUI.Platforms/Cocoa/ReactiveCollectionViewController.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public abstract class ReactiveCollectionViewController : UICollectionViewControl
2828
protected ReactiveCollectionViewController(NSCoder coder) : base(coder) { setupRxObj(); }
2929
protected ReactiveCollectionViewController() { setupRxObj(); }
3030

31-
[field:IgnoreDataMember]
3231
public event PropertyChangingEventHandler PropertyChanging;
3332

3433
void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs args) {
@@ -38,7 +37,6 @@ void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs ar
3837
}
3938
}
4039

41-
[field:IgnoreDataMember]
4240
public event PropertyChangedEventHandler PropertyChanged;
4341

4442
void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args) {
@@ -52,25 +50,19 @@ void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args
5250
/// Represents an Observable that fires *before* a property is about to
5351
/// be changed.
5452
/// </summary>
55-
[IgnoreDataMember]
5653
public IObservable<IObservedChange<object, object>> Changing {
5754
get { return this.getChangingObservable(); }
5855
}
5956

6057
/// <summary>
6158
/// Represents an Observable that fires *after* a property has changed.
6259
/// </summary>
63-
[IgnoreDataMember]
6460
public IObservable<IObservedChange<object, object>> Changed {
6561
get { return this.getChangedObservable(); }
6662
}
6763

68-
[IgnoreDataMember]
6964
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
7065

71-
[OnDeserialized]
72-
void setupRxObj(StreamingContext sc) { setupRxObj(); }
73-
7466
void setupRxObj()
7567
{
7668
this.setupReactiveExtension();

‎ReactiveUI.Platforms/Cocoa/ReactiveCollectionViewSource.cs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ public IReadOnlyList<CollectionViewSectionInformation> Data {
9898
set {
9999
if (commonSource.SectionInfo == value) return;
100100

101-
raisePropertyChanging("Data");
101+
this.raisePropertyChanging("Data");
102102
commonSource.SectionInfo = value;
103-
raisePropertyChanged("Data");
103+
this.raisePropertyChanged("Data");
104104
}
105105
}
106106

@@ -146,7 +146,6 @@ protected override void Dispose(bool disposing)
146146
base.Dispose(disposing);
147147
}
148148

149-
[field:IgnoreDataMember]
150149
public event PropertyChangingEventHandler PropertyChanging;
151150

152151
void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs args) {
@@ -156,7 +155,6 @@ void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs ar
156155
}
157156
}
158157

159-
[field:IgnoreDataMember]
160158
public event PropertyChangedEventHandler PropertyChanged;
161159

162160
void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args) {
@@ -170,25 +168,19 @@ void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args
170168
/// Represents an Observable that fires *before* a property is about to
171169
/// be changed.
172170
/// </summary>
173-
[IgnoreDataMember]
174171
public IObservable<IObservedChange<object, object>> Changing {
175172
get { return this.getChangingObservable(); }
176173
}
177174

178175
/// <summary>
179176
/// Represents an Observable that fires *after* a property has changed.
180177
/// </summary>
181-
[IgnoreDataMember]
182178
public IObservable<IObservedChange<object, object>> Changed {
183179
get { return this.getChangedObservable(); }
184180
}
185181

186-
[IgnoreDataMember]
187182
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
188183

189-
[OnDeserialized]
190-
void setupRxObj(StreamingContext sc) { setupRxObj(); }
191-
192184
void setupRxObj()
193185
{
194186
this.setupReactiveExtension();

‎ReactiveUI.Platforms/Cocoa/ReactiveImageView.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyCh
3939
public ReactiveImageView(NSCoder coder) : base(coder) { this.setupReactiveExtension(); }
4040
#endif
4141

42-
[field:IgnoreDataMember]
4342
public event PropertyChangingEventHandler PropertyChanging;
4443

4544
void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs args) {
@@ -49,7 +48,6 @@ void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs ar
4948
}
5049
}
5150

52-
[field:IgnoreDataMember]
5351
public event PropertyChangedEventHandler PropertyChanged;
5452

5553
void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args) {
@@ -63,15 +61,13 @@ void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args
6361
/// Represents an Observable that fires *before* a property is about to
6462
/// be changed.
6563
/// </summary>
66-
[IgnoreDataMember]
6764
public IObservable<IObservedChange<object, object>> Changing {
6865
get { return this.getChangingObservable(); }
6966
}
7067

7168
/// <summary>
7269
/// Represents an Observable that fires *after* a property has changed.
7370
/// </summary>
74-
[IgnoreDataMember]
7571
public IObservable<IObservedChange<object, object>> Changed {
7672
get { return this.getChangedObservable(); }
7773
}
@@ -80,11 +76,7 @@ public IDisposable SuppressChangeNotifications() {
8076
return this.suppressChangeNotifications();
8177
}
8278

83-
[IgnoreDataMember]
8479
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
85-
86-
[OnDeserialized]
87-
void setupRxObj(StreamingContext sc) { this.setupReactiveExtension(); }
8880
}
8981
}
9082

‎ReactiveUI.Platforms/Cocoa/ReactiveNSView.cs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ protected ReactiveView(RectangleF size) : base(size)
5454
{
5555
this.setupReactiveExtension();
5656
}
57-
58-
[field:IgnoreDataMember]
57+
5958
public event PropertyChangingEventHandler PropertyChanging;
6059

6160
void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs args) {
@@ -65,7 +64,6 @@ void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs ar
6564
}
6665
}
6766

68-
[field:IgnoreDataMember]
6967
public event PropertyChangedEventHandler PropertyChanged;
7068

7169
void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args) {
@@ -79,22 +77,17 @@ void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args
7977
/// Represents an Observable that fires *before* a property is about to
8078
/// be changed.
8179
/// </summary>
82-
[IgnoreDataMember]
8380
public IObservable<IObservedChange<object, object>> Changing {
8481
get { return this.getChangingObservable(); }
8582
}
8683

8784
/// <summary>
8885
/// Represents an Observable that fires *after* a property has changed.
8986
/// </summary>
90-
[IgnoreDataMember]
9187
public IObservable<IObservedChange<object, object>> Changed {
9288
get { return this.getChangedObservable(); }
9389
}
9490

95-
[OnDeserialized]
96-
void setupRxObj(StreamingContext sc) { this.setupReactiveExtension(); }
97-
9891
/// <summary>
9992
/// When this method is called, an object will not fire change
10093
/// notifications (neither traditional nor Observable notifications)
@@ -107,7 +100,6 @@ public IDisposable SuppressChangeNotifications()
107100
return this.suppressChangeNotifications();
108101
}
109102

110-
[IgnoreDataMember]
111103
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
112104
}
113105
}

‎ReactiveUI.Platforms/Cocoa/ReactiveNSViewController.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ protected ReactiveViewController(string nibNameOrNull, NSBundle nibBundleOrNull)
5555
this.setupReactiveExtension();
5656
}
5757

58-
[field:IgnoreDataMember]
5958
public event PropertyChangingEventHandler PropertyChanging;
6059

6160
void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs args) {
@@ -65,7 +64,6 @@ void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs ar
6564
}
6665
}
6766

68-
[field:IgnoreDataMember]
6967
public event PropertyChangedEventHandler PropertyChanged;
7068

7169
void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args) {
@@ -79,25 +77,19 @@ void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args
7977
/// Represents an Observable that fires *before* a property is about to
8078
/// be changed.
8179
/// </summary>
82-
[IgnoreDataMember]
8380
public IObservable<IObservedChange<object, object>> Changing {
8481
get { return this.getChangingObservable(); }
8582
}
8683

8784
/// <summary>
8885
/// Represents an Observable that fires *after* a property has changed.
8986
/// </summary>
90-
[IgnoreDataMember]
9187
public IObservable<IObservedChange<object, object>> Changed {
9288
get { return this.getChangedObservable(); }
9389
}
9490

95-
[IgnoreDataMember]
9691
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
9792

98-
[OnDeserialized]
99-
void setupRxObj(StreamingContext sc) { this.setupReactiveExtension(); }
100-
10193
/// <summary>
10294
/// When this method is called, an object will not fire change
10395
/// notifications (neither traditional nor Observable notifications)

‎ReactiveUI.Platforms/Cocoa/ReactiveTableViewCell.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public abstract class ReactiveTableViewCell : UITableViewCell, IReactiveNotifyPr
2828
public ReactiveTableViewCell(UITableViewCellStyle style, NSString reuseIdentifier) : base(style, reuseIdentifier) { setupRxObj(); }
2929
public ReactiveTableViewCell(RectangleF frame) : base (frame) { setupRxObj(); }
3030

31-
[field:IgnoreDataMember]
3231
public event PropertyChangingEventHandler PropertyChanging;
3332

3433
void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs args) {
@@ -38,7 +37,6 @@ void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs ar
3837
}
3938
}
4039

41-
[field:IgnoreDataMember]
4240
public event PropertyChangedEventHandler PropertyChanged;
4341

4442
void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args) {
@@ -52,25 +50,19 @@ void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args
5250
/// Represents an Observable that fires *before* a property is about to
5351
/// be changed.
5452
/// </summary>
55-
[IgnoreDataMember]
5653
public IObservable<IObservedChange<object, object>> Changing {
5754
get { return this.getChangingObservable(); }
5855
}
5956

6057
/// <summary>
6158
/// Represents an Observable that fires *after* a property has changed.
6259
/// </summary>
63-
[IgnoreDataMember]
6460
public IObservable<IObservedChange<object, object>> Changed {
6561
get { return this.getChangedObservable(); }
6662
}
6763

68-
[IgnoreDataMember]
6964
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
7065

71-
[OnDeserialized]
72-
void setupRxObj(StreamingContext sc) { setupRxObj(); }
73-
7466
void setupRxObj()
7567
{
7668
this.setupReactiveExtension();

‎ReactiveUI.Platforms/Cocoa/ReactiveTableViewController.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public abstract class ReactiveTableViewController : NSTableViewController, IReac
3030
protected ReactiveTableViewController(NSCoder coder) : base(coder) { setupRxObj(); }
3131
protected ReactiveTableViewController() { setupRxObj(); }
3232

33-
[field:IgnoreDataMember]
3433
public event PropertyChangingEventHandler PropertyChanging;
3534

3635
void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs args) {
@@ -40,7 +39,6 @@ void IReactiveObjectExtension.RaisePropertyChanging(PropertyChangingEventArgs ar
4039
}
4140
}
4241

43-
[field:IgnoreDataMember]
4442
public event PropertyChangedEventHandler PropertyChanged;
4543

4644
void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args) {
@@ -54,25 +52,19 @@ void IReactiveObjectExtension.RaisePropertyChanged(PropertyChangedEventArgs args
5452
/// Represents an Observable that fires *before* a property is about to
5553
/// be changed.
5654
/// </summary>
57-
[IgnoreDataMember]
5855
public IObservable<IObservedChange<object, object>> Changing {
5956
get { return this.getChangingObservable(); }
6057
}
6158

6259
/// <summary>
6360
/// Represents an Observable that fires *after* a property has changed.
6461
/// </summary>
65-
[IgnoreDataMember]
6662
public IObservable<IObservedChange<object, object>> Changed {
6763
get { return this.getChangedObservable(); }
6864
}
6965

70-
[IgnoreDataMember]
7166
public IObservable<Exception> ThrownExceptions { get { return this.getThrownExceptionsObservable(); } }
7267

73-
[OnDeserialized]
74-
void setupRxObj(StreamingContext sc) { setupRxObj(); }
75-
7668
void setupRxObj()
7769
{
7870
this.setupReactiveExtension();

0 commit comments

Comments
 (0)