diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/AsObservable.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/AsObservable.cs index 329cf2e24f..537d76d964 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/AsObservable.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/AsObservable.cs @@ -13,11 +13,6 @@ public AsObservable(IObservable source) _source = source; } - public IObservable Omega() - { - return this; - } - public IObservable Eval() { return _source; diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Cast.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Cast.cs index c8a283ed4a..8f3b126679 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Cast.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Cast.cs @@ -4,7 +4,7 @@ namespace System.Reactive.Linq.ObservableImpl { - internal sealed class Cast : Producer /* Could optimize further by deriving from Select and providing Omega. We're not doing this (yet) for debuggability. */ + internal sealed class Cast : Producer /* Could optimize further by deriving from Select and providing Combine. We're not doing this (yet) for debuggability. */ { private readonly IObservable _source; diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/IgnoreElements.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/IgnoreElements.cs index 6378de183b..62f9af9a2d 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/IgnoreElements.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/IgnoreElements.cs @@ -13,11 +13,6 @@ public IgnoreElements(IObservable source) _source = source; } - public IObservable Omega() - { - return this; - } - protected override IDisposable Run(IObserver observer, IDisposable cancel, Action setSink) { var sink = new _(observer, cancel); diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Skip.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Skip.cs index 0b3e0683e8..8d47d300fc 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Skip.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Skip.cs @@ -27,7 +27,7 @@ public Skip(IObservable source, TimeSpan duration, IScheduler scheduler _scheduler = scheduler; } - public IObservable Omega(int count) + public IObservable Combine(int count) { // // Sum semantics: @@ -39,7 +39,7 @@ public IObservable Omega(int count) return new Skip(_source, _count + count); } - public IObservable Omega(TimeSpan duration) + public IObservable Combine(TimeSpan duration) { // // Maximum semantics: diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/SkipUntil.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/SkipUntil.cs index bc83eef16c..17b3ef9fae 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/SkipUntil.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/SkipUntil.cs @@ -139,7 +139,7 @@ public SkipUntil(IObservable source, DateTimeOffset startTime, ISchedul _scheduler = scheduler; } - public IObservable Omega(DateTimeOffset startTime) + public IObservable Combine(DateTimeOffset startTime) { // // Maximum semantics: diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Take.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Take.cs index 217137e334..bb0c406110 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Take.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Take.cs @@ -27,7 +27,7 @@ public Take(IObservable source, TimeSpan duration, IScheduler scheduler _scheduler = scheduler; } - public IObservable Omega(int count) + public IObservable Combine(int count) { // // Minimum semantics: @@ -42,7 +42,7 @@ public IObservable Omega(int count) return new Take(_source, count); } - public IObservable Omega(TimeSpan duration) + public IObservable Combine(TimeSpan duration) { // // Minimum semantics: diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/TakeUntil.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/TakeUntil.cs index cc5167e17a..a19ca7acbe 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/TakeUntil.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/TakeUntil.cs @@ -172,7 +172,7 @@ public TakeUntil(IObservable source, DateTimeOffset endTime, IScheduler _scheduler = scheduler; } - public IObservable Omega(DateTimeOffset endTime) + public IObservable Combine(DateTimeOffset endTime) { // // Minimum semantics: diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Where.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Where.cs index 1cbe2d600f..95bd47985a 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Where.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Where.cs @@ -22,7 +22,7 @@ public Where(IObservable source, Func predicate) _predicateI = predicate; } - public IObservable Omega(Func predicate) + public IObservable Combine(Func predicate) { if (_predicate != null) return new Where(_source, x => _predicate(x) && predicate(x)); diff --git a/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Single.cs b/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Single.cs index 06ce42503c..91e0681a4b 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Single.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Single.cs @@ -20,7 +20,7 @@ public virtual IObservable AsObservable(IObservable s { var asObservable = source as AsObservable; if (asObservable != null) - return asObservable.Omega(); + return asObservable; return new AsObservable(source); } @@ -137,7 +137,7 @@ public virtual IObservable IgnoreElements(IObservable { var ignoreElements = source as IgnoreElements; if (ignoreElements != null) - return ignoreElements.Omega(); + return ignoreElements; return new IgnoreElements(source); } diff --git a/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.StandardSequenceOperators.cs b/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.StandardSequenceOperators.cs index c574b75371..6b2f40a78d 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.StandardSequenceOperators.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.StandardSequenceOperators.cs @@ -344,7 +344,7 @@ public virtual IObservable Skip(IObservable source, i { var skip = source as Skip; if (skip != null && skip._scheduler == null) - return skip.Omega(count); + return skip.Combine(count); return new Skip(source, count); } @@ -387,7 +387,7 @@ private static IObservable Take_(IObservable source, { var take = source as Take; if (take != null && take._scheduler == null) - return take.Omega(count); + return take.Combine(count); return new Take(source, count); } @@ -414,7 +414,7 @@ public virtual IObservable Where(IObservable source, { var where = source as Where; if (where != null) - return where.Omega(predicate); + return where.Combine(predicate); return new Where(source, predicate); } diff --git a/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Time.cs b/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Time.cs index ed523ee050..3c380bd272 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Time.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Time.cs @@ -253,7 +253,7 @@ private static IObservable Skip_(IObservable source, { var skip = source as Skip; if (skip != null && skip._scheduler == scheduler) - return skip.Omega(duration); + return skip.Combine(duration); return new Skip(source, duration, scheduler); } @@ -295,7 +295,7 @@ private static IObservable SkipUntil_(IObservable sou { var skipUntil = source as SkipUntil; if (skipUntil != null && skipUntil._scheduler == scheduler) - return skipUntil.Omega(startTime); + return skipUntil.Combine(startTime); return new SkipUntil(source, startTime, scheduler); } @@ -318,7 +318,7 @@ private static IObservable Take_(IObservable source, { var take = source as Take; if (take != null && take._scheduler == scheduler) - return take.Omega(duration); + return take.Combine(duration); return new Take(source, duration, scheduler); } @@ -380,7 +380,7 @@ private static IObservable TakeUntil_(IObservable sou { var takeUntil = source as TakeUntil; if (takeUntil != null && takeUntil._scheduler == scheduler) - return takeUntil.Omega(endTime); + return takeUntil.Combine(endTime); return new TakeUntil(source, endTime, scheduler); }