Rename ICanActivateView -> ICanForceManualActivation

justin-factory · justin-factory · commit 435a6dcb6ccc · 2014-10-08T16:28:20.000-07:00
diff --git a/ReactiveUI/Cocoa/ReactiveCollectionView.cs b/ReactiveUI/Cocoa/ReactiveCollectionView.cs
@@ -21,7 +21,7 @@
 namespace ReactiveUI
 {
     public abstract class ReactiveCollectionView : UICollectionView, 
-        IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView
+        IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         protected ReactiveCollectionView(RectangleF frame, UICollectionViewLayout layout) : base(frame, layout) { setupRxObj(); }
         protected ReactiveCollectionView(IntPtr handle) : base(handle) { setupRxObj(); }
@@ -98,7 +98,7 @@ public override void RemoveFromSuperview()
             deactivated.OnNext(Unit.Default);
         }
 
-        void ICanActivateView.Activate(bool activate) {
+        void ICanForceManualActivation.Activate(bool activate) {
             RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));
         }
     }
diff --git a/ReactiveUI/Cocoa/ReactiveControl.cs b/ReactiveUI/Cocoa/ReactiveControl.cs
@@ -16,7 +16,7 @@
 
 namespace ReactiveUI
 {
-    public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView
+    public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         protected ReactiveControl() : base()
         {
@@ -106,7 +106,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
 
-        void ICanActivateView.Activate(bool activate) {
+        void ICanForceManualActivation.Activate(bool activate) {
             RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));
         }
     }
diff --git a/ReactiveUI/Cocoa/ReactiveImageView.cs b/ReactiveUI/Cocoa/ReactiveImageView.cs
@@ -28,7 +28,7 @@
 
 namespace ReactiveUI
 {
-    public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView
+    public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         public ReactiveImageView(RectangleF frame) : base(frame) { }
         public ReactiveImageView(IntPtr handle) : base(handle) { }
@@ -101,7 +101,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
 
-        void ICanActivateView.Activate(bool activate) {
+        void ICanForceManualActivation.Activate(bool activate) {
             RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));
         }
     }
diff --git a/ReactiveUI/Cocoa/ReactiveNSView.cs b/ReactiveUI/Cocoa/ReactiveNSView.cs
@@ -29,7 +29,7 @@ namespace ReactiveUI
     /// This is an View that is both an NSView and has ReactiveObject powers 
     /// (i.e. you can call RaiseAndSetIfChanged)
     /// </summary>
-    public class ReactiveView : NSView, IReactiveNotifyPropertyChanged<ReactiveView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView
+    public class ReactiveView : NSView, IReactiveNotifyPropertyChanged<ReactiveView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         protected ReactiveView() : base()
         {
@@ -122,7 +122,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
 
-        void ICanActivateView.Activate(bool activate) {
+        void ICanForceManualActivation.Activate(bool activate) {
             RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));
         }
     }
diff --git a/ReactiveUI/Cocoa/ReactiveTableView.cs b/ReactiveUI/Cocoa/ReactiveTableView.cs
@@ -21,7 +21,7 @@
 
 namespace ReactiveUI
 {
-    public abstract class ReactiveTableView : UITableView, IReactiveNotifyPropertyChanged<ReactiveTableView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView
+    public abstract class ReactiveTableView : UITableView, IReactiveNotifyPropertyChanged<ReactiveTableView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         public ReactiveTableView(RectangleF frame) : base(frame) { }
         public ReactiveTableView(IntPtr handle) : base(handle) { }
@@ -83,7 +83,7 @@ public override void WillMoveToSuperview(UIView newsuper)
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
 
-        void ICanActivateView.Activate(bool activate) {
+        void ICanForceManualActivation.Activate(bool activate) {
             RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));
         }
     }
diff --git a/ReactiveUI/Interfaces.cs b/ReactiveUI/Interfaces.cs
@@ -452,7 +452,7 @@ public interface ICanActivate
         IObservable<Unit> Deactivated { get; }
     }
 
-    internal interface ICanActivateView {
+    internal interface ICanForceManualActivation {
         void Activate(bool activate);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`namespace ReactiveUI`
`22`	`22`	`{`
`23`	`23`	`public abstract class ReactiveCollectionView : UICollectionView,`
`24`		`- IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView`
	`24`	`+ IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation`
`25`	`25`	`{`
`26`	`26`	`protected ReactiveCollectionView(RectangleF frame, UICollectionViewLayout layout) : base(frame, layout) { setupRxObj(); }`
`27`	`27`	`protected ReactiveCollectionView(IntPtr handle) : base(handle) { setupRxObj(); }`
`@@ -98,7 +98,7 @@ public override void RemoveFromSuperview()`
`98`	`98`	`deactivated.OnNext(Unit.Default);`
`99`	`99`	`}`
`100`	`100`
`101`		`- void ICanActivateView.Activate(bool activate) {`
	`101`	`+ void ICanForceManualActivation.Activate(bool activate) {`
`102`	`102`	`RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));`
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace ReactiveUI`
`18`	`18`	`{`
`19`		`- public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView`
	`19`	`+ public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation`
`20`	`20`	`{`
`21`	`21`	`protected ReactiveControl() : base()`
`22`	`22`	`{`
`@@ -106,7 +106,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)`
`106`	`106`	`RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));`
`107`	`107`	`}`
`108`	`108`
`109`		`- void ICanActivateView.Activate(bool activate) {`
	`109`	`+ void ICanForceManualActivation.Activate(bool activate) {`
`110`	`110`	`RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`
`29`	`29`	`namespace ReactiveUI`
`30`	`30`	`{`
`31`		`- public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView`
	`31`	`+ public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation`
`32`	`32`	`{`
`33`	`33`	`public ReactiveImageView(RectangleF frame) : base(frame) { }`
`34`	`34`	`public ReactiveImageView(IntPtr handle) : base(handle) { }`
`@@ -101,7 +101,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)`
`101`	`101`	`RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));`
`102`	`102`	`}`
`103`	`103`
`104`		`- void ICanActivateView.Activate(bool activate) {`
	`104`	`+ void ICanForceManualActivation.Activate(bool activate) {`
`105`	`105`	`RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace ReactiveUI`
`29`	`29`	`/// This is an View that is both an NSView and has ReactiveObject powers`
`30`	`30`	`/// (i.e. you can call RaiseAndSetIfChanged)`
`31`	`31`	`/// </summary>`
`32`		`- public class ReactiveView : NSView, IReactiveNotifyPropertyChanged<ReactiveView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanActivateView`
	`32`	`+ public class ReactiveView : NSView, IReactiveNotifyPropertyChanged<ReactiveView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation`
`33`	`33`	`{`
`34`	`34`	`protected ReactiveView() : base()`
`35`	`35`	`{`
`@@ -122,7 +122,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)`
`122`	`122`	`RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));`
`123`	`123`	`}`
`124`	`124`
`125`		`- void ICanActivateView.Activate(bool activate) {`
	`125`	`+ void ICanForceManualActivation.Activate(bool activate) {`
`126`	`126`	`RxApp.MainThreadScheduler.Schedule(() => (activate ? activated : deactivated).OnNext(Unit.Default));`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ public interface ICanActivate`
`452`	`452`	`IObservable<Unit> Deactivated { get; }`
`453`	`453`	`}`
`454`	`454`
`455`		`- internal interface ICanActivateView {`
	`455`	`+ internal interface ICanForceManualActivation {`
`456`	`456`	`void Activate(bool activate);`
`457`	`457`	`}`
`458`	`458`