Răsfoiți Sursa

Merge pull request #723 from danielcweber/FixConstructorsOfAbstractClasses

Fix the constructor visibility of some abstract classes.
Daniel C. Weber 7 ani în urmă
părinte
comite
7968548e95

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Concurrency/LocalScheduler.TimerQueue.cs

@@ -428,7 +428,7 @@ namespace System.Reactive.Concurrency
             private readonly SingleAssignmentDisposable _disposable;
             private int _hasRun;
 
-            public WorkItem(LocalScheduler scheduler, DateTimeOffset dueTime)
+            protected WorkItem(LocalScheduler scheduler, DateTimeOffset dueTime)
             {
                 Scheduler = scheduler;
                 DueTime = dueTime;

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Concurrency/Scheduler.Recursive.cs

@@ -177,7 +177,7 @@ namespace System.Reactive.Concurrency
 
             protected readonly CompositeDisposable group;
 
-            public InvokeRecBaseState(IScheduler scheduler)
+            protected InvokeRecBaseState(IScheduler scheduler)
             {
                 this.scheduler = scheduler;
                 group = new CompositeDisposable();

+ 2 - 2
Rx.NET/Source/src/System.Reactive/Concurrency/SchedulerWrapper.cs

@@ -11,13 +11,13 @@ namespace System.Reactive.Concurrency
         protected readonly IScheduler _scheduler;
         private readonly ConditionalWeakTable<IScheduler, IScheduler> _cache;
 
-        public SchedulerWrapper(IScheduler scheduler)
+        protected SchedulerWrapper(IScheduler scheduler)
         {
             _scheduler = scheduler;
             _cache = new ConditionalWeakTable<IScheduler, IScheduler>();
         }
 
-        public SchedulerWrapper(IScheduler scheduler, ConditionalWeakTable<IScheduler, IScheduler> cache)
+        protected SchedulerWrapper(IScheduler scheduler, ConditionalWeakTable<IScheduler, IScheduler> cache)
         {
             _scheduler = scheduler;
             _cache = cache;

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Internal/ConcatSink.cs

@@ -8,7 +8,7 @@ namespace System.Reactive
 {
     internal abstract class ConcatSink<TSource> : TailRecursiveSink<TSource>
     {
-        public ConcatSink(IObserver<TSource> observer)
+        protected ConcatSink(IObserver<TSource> observer)
             : base(observer)
         {
         }

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Internal/TailRecursiveSink.cs

@@ -10,7 +10,7 @@ namespace System.Reactive
 {
     internal abstract class TailRecursiveSink<TSource> : IdentitySink<TSource>
     {
-        public TailRecursiveSink(IObserver<TSource> observer)
+        protected TailRecursiveSink(IObserver<TSource> observer)
             : base(observer)
         {
         }

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Linq/Observable/CombineLatest.cs

@@ -236,7 +236,7 @@ namespace System.Reactive.Linq.ObservableImpl
         private readonly bool[] _hasValue;
         private readonly bool[] _isDone;
 
-        public CombineLatestSink(int arity, IObserver<TResult> observer)
+        protected CombineLatestSink(int arity, IObserver<TResult> observer)
             : base(observer)
         {
             _gate = new object();

+ 6 - 6
Rx.NET/Source/src/System.Reactive/Linq/Observable/Delay.cs

@@ -17,7 +17,7 @@ namespace System.Reactive.Linq.ObservableImpl
             protected readonly IObservable<TSource> _source;
             protected readonly IScheduler _scheduler;
 
-            public Base(IObservable<TSource> source, IScheduler scheduler)
+            protected Base(IObservable<TSource> source, IScheduler scheduler)
             {
                 _source = source;
                 _scheduler = scheduler;
@@ -28,7 +28,7 @@ namespace System.Reactive.Linq.ObservableImpl
                 protected IStopwatch _watch;
                 protected IScheduler _scheduler;
 
-                public _(TParent parent, IObserver<TSource> observer)
+                protected _(TParent parent, IObserver<TSource> observer)
                     : base(observer)
                 {
                     _scheduler = parent._scheduler;
@@ -51,7 +51,7 @@ namespace System.Reactive.Linq.ObservableImpl
                 protected readonly object _gate = new object();
                 protected IDisposable _cancelable;
 
-                public S(TParent parent, IObserver<TSource> observer)
+                protected S(TParent parent, IObserver<TSource> observer)
                     : base(parent, observer)
                 {
                 }
@@ -258,7 +258,7 @@ namespace System.Reactive.Linq.ObservableImpl
                 protected IDisposable _cancelable;
                 private readonly SemaphoreSlim _evt = new SemaphoreSlim(0);
 
-                public L(TParent parent, IObserver<TSource> observer)
+                protected L(TParent parent, IObserver<TSource> observer)
                     : base(parent, observer)
                 {
                 }
@@ -582,7 +582,7 @@ namespace System.Reactive.Linq.ObservableImpl
         {
             protected readonly IObservable<TSource> _source;
 
-            public Base(IObservable<TSource> source)
+            protected Base(IObservable<TSource> source)
             {
                 _source = source;
             }
@@ -594,7 +594,7 @@ namespace System.Reactive.Linq.ObservableImpl
 
                 private readonly Func<TSource, IObservable<TDelay>> _delaySelector;
 
-                public _(Func<TSource, IObservable<TDelay>> delaySelector, IObserver<TSource> observer)
+                protected _(Func<TSource, IObservable<TDelay>> delaySelector, IObserver<TSource> observer)
                     : base(observer)
                 {
                     _delaySelector = delaySelector;

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Linq/Observable/DelaySubscription.cs

@@ -11,7 +11,7 @@ namespace System.Reactive.Linq.ObservableImpl
         private readonly IObservable<TSource> _source;
         private readonly IScheduler _scheduler;
 
-        public DelaySubscription(IObservable<TSource> source, IScheduler scheduler)
+        protected DelaySubscription(IObservable<TSource> source, IScheduler scheduler)
         {
             _source = source;
             _scheduler = scheduler;

+ 2 - 2
Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEvent.cs

@@ -195,7 +195,7 @@ namespace System.Reactive.Linq.ObservableImpl
         private readonly IScheduler _scheduler;
         private readonly object _gate;
 
-        public EventProducer(IScheduler scheduler)
+        protected EventProducer(IScheduler scheduler)
         {
             _scheduler = scheduler;
             _gate = new object();
@@ -356,7 +356,7 @@ namespace System.Reactive.Linq.ObservableImpl
         private readonly Action<TDelegate> _addHandler;
         private readonly Action<TDelegate> _removeHandler;
 
-        public ClassicEventProducer(Action<TDelegate> addHandler, Action<TDelegate> removeHandler, IScheduler scheduler)
+        protected ClassicEventProducer(Action<TDelegate> addHandler, Action<TDelegate> removeHandler, IScheduler scheduler)
             : base(scheduler)
         {
             _addHandler = addHandler;

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Linq/Observable/Max.cs

@@ -25,7 +25,7 @@ namespace System.Reactive.Linq.ObservableImpl
         {
             protected readonly IComparer<TSource> _comparer;
 
-            public _(IComparer<TSource> comparer, IObserver<TSource> observer)
+            protected _(IComparer<TSource> comparer, IObserver<TSource> observer)
                 : base(observer)
             {
                 _comparer = comparer;

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Linq/Observable/Min.cs

@@ -25,7 +25,7 @@ namespace System.Reactive.Linq.ObservableImpl
         {
             protected readonly IComparer<TSource> _comparer;
 
-            public _(IComparer<TSource> comparer, IObserver<TSource> observer)
+            protected _(IComparer<TSource> comparer, IObserver<TSource> observer)
                 : base(observer)
             {
                 _comparer = comparer;

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Linq/Observable/PushToPullAdapter.cs

@@ -12,7 +12,7 @@ namespace System.Reactive.Linq.ObservableImpl
     {
         private readonly IObservable<TSource> _source;
 
-        public PushToPullAdapter(IObservable<TSource> source)
+        protected PushToPullAdapter(IObservable<TSource> source)
         {
             _source = source;
         }

+ 2 - 2
Rx.NET/Source/src/System.Reactive/Linq/Observable/Timer.cs

@@ -14,7 +14,7 @@ namespace System.Reactive.Linq.ObservableImpl
         {
             private readonly IScheduler _scheduler;
 
-            public Single(IScheduler scheduler)
+            protected Single(IScheduler scheduler)
             {
                 _scheduler = scheduler;
             }
@@ -79,7 +79,7 @@ namespace System.Reactive.Linq.ObservableImpl
             private readonly TimeSpan _period;
             private readonly IScheduler _scheduler;
 
-            public Periodic(TimeSpan period, IScheduler scheduler)
+            protected Periodic(TimeSpan period, IScheduler scheduler)
             {
                 _period = period;
                 _scheduler = scheduler;

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Linq/Observable/Zip.cs

@@ -390,7 +390,7 @@ namespace System.Reactive.Linq.ObservableImpl
         private readonly ICollection[] _queues;
         private readonly bool[] _isDone;
 
-        public ZipSink(int arity, IObserver<TResult> observer)
+        protected ZipSink(int arity, IObserver<TResult> observer)
             : base(observer)
         {
             _gate = new object();

+ 1 - 1
Rx.NET/Source/src/System.Reactive/Subjects/ReplaySubject.cs

@@ -229,7 +229,7 @@ namespace System.Reactive.Subjects
             private Exception _error;
             private bool _isDisposed;
 
-            public ReplayBase()
+            protected ReplayBase()
             {
                 _observers = ImmutableList<IScheduledObserver<T>>.Empty;