From c82f2a6124803805c3add137a47b3755ae82d8cd Mon Sep 17 00:00:00 2001 From: Lehonti Ramos Date: Tue, 26 Sep 2023 23:14:50 +0200 Subject: [PATCH] `sealed` some `internal` classes in `Controls.Core` that are not inherited from (1) --- src/Controls/src/Core/AnimatableKey.cs | 4 ++-- src/Controls/src/Core/BindableObject.cs | 8 ++++---- src/Controls/src/Core/BindingExpression.cs | 8 ++++---- src/Controls/src/Core/CastingEnumerator.cs | 2 +- .../src/Core/Compatibility/Android/ResourcesProvider.cs | 2 +- .../Handlers/ListView/Android/ConditionalFocusLayout.cs | 2 +- .../Handlers/ListView/Android/GroupedListViewAdapter.cs | 4 ++-- .../Handlers/ListView/Android/ListViewRenderer.cs | 2 +- .../Handlers/ListView/Android/TextCellRenderer.cs | 2 +- .../Compatibility/Handlers/iOS/KeyboardInsetTracker.cs | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Controls/src/Core/AnimatableKey.cs b/src/Controls/src/Core/AnimatableKey.cs index a34e1f46708a..e858377b8ee3 100644 --- a/src/Controls/src/Core/AnimatableKey.cs +++ b/src/Controls/src/Core/AnimatableKey.cs @@ -4,7 +4,7 @@ namespace Microsoft.Maui.Controls { - internal class AnimatableKey + internal sealed class AnimatableKey { public AnimatableKey(IAnimatable animatable, string handle) { @@ -87,7 +87,7 @@ public override int GetHashCode() } } - protected bool Equals(AnimatableKey other) + private bool Equals(AnimatableKey other) { if (!string.Equals(Handle, other.Handle, StringComparison.Ordinal)) { diff --git a/src/Controls/src/Core/BindableObject.cs b/src/Controls/src/Core/BindableObject.cs index 3edd1155391d..95b24b19f65c 100644 --- a/src/Controls/src/Core/BindableObject.cs +++ b/src/Controls/src/Core/BindableObject.cs @@ -163,7 +163,7 @@ public object GetValue(BindableProperty property) internal LocalValueEnumerator GetLocalValueEnumerator() => new LocalValueEnumerator(this); - internal class LocalValueEnumerator : IEnumerator + internal sealed class LocalValueEnumerator : IEnumerator { Dictionary.Enumerator _propertiesEnumerator; internal LocalValueEnumerator(BindableObject bindableObject) => _propertiesEnumerator = bindableObject._properties.GetEnumerator(); @@ -190,7 +190,7 @@ void IEnumerator.Reset() } } - internal class LocalValueEntry + internal sealed class LocalValueEntry { internal LocalValueEntry(BindableProperty property, object value, BindableContextAttributes attributes) { @@ -779,7 +779,7 @@ internal enum BindableContextAttributes IsDefaultValueCreated = 1 << 5, } - internal class BindablePropertyContext + internal sealed class BindablePropertyContext { public BindableContextAttributes Attributes; @@ -801,7 +801,7 @@ internal enum SetValuePrivateFlags Default = None } - internal class SetValueArgs + internal sealed class SetValueArgs { public readonly SetValueFlags Attributes; public readonly BindablePropertyContext Context; diff --git a/src/Controls/src/Core/BindingExpression.cs b/src/Controls/src/Core/BindingExpression.cs index f03160a2aa57..bb82a68c15f9 100644 --- a/src/Controls/src/Core/BindingExpression.cs +++ b/src/Controls/src/Core/BindingExpression.cs @@ -12,7 +12,7 @@ namespace Microsoft.Maui.Controls { - internal class BindingExpression + internal sealed class BindingExpression { internal const string PropertyNotFoundErrorMessage = "'{0}' property not found on '{1}', target property: '{2}.{3}'"; internal const string CannotConvertTypeErrorMessage = "'{0}' cannot be converted to type '{1}'"; @@ -591,7 +591,7 @@ void OnElementParentSet(object sender, EventArgs e) } } - class BindingPair + private sealed class BindingPair { public BindingPair(BindingExpressionPart part, object source, bool isLast) { @@ -607,7 +607,7 @@ public BindingPair(BindingExpressionPart part, object source, bool isLast) public object Source { get; private set; } } - internal class WeakPropertyChangedProxy : WeakEventProxy + internal sealed class WeakPropertyChangedProxy : WeakEventProxy { public WeakPropertyChangedProxy() { } @@ -651,7 +651,7 @@ void OnBCChanged(object sender, EventArgs e) } } - class BindingExpressionPart + private sealed class BindingExpressionPart { readonly BindingExpression _expression; readonly PropertyChangedEventHandler _changeHandler; diff --git a/src/Controls/src/Core/CastingEnumerator.cs b/src/Controls/src/Core/CastingEnumerator.cs index 61be0f0a7636..6185895b6342 100644 --- a/src/Controls/src/Core/CastingEnumerator.cs +++ b/src/Controls/src/Core/CastingEnumerator.cs @@ -4,7 +4,7 @@ namespace Microsoft.Maui.Controls { - internal class CastingEnumerator : IEnumerator where T : class where TFrom : class + internal sealed class CastingEnumerator : IEnumerator where T : class where TFrom : class { readonly IEnumerator _enumerator; diff --git a/src/Controls/src/Core/Compatibility/Android/ResourcesProvider.cs b/src/Controls/src/Core/Compatibility/Android/ResourcesProvider.cs index 48df21080007..a7d0633f5aa4 100644 --- a/src/Controls/src/Core/Compatibility/Android/ResourcesProvider.cs +++ b/src/Controls/src/Core/Compatibility/Android/ResourcesProvider.cs @@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.Android { [Obsolete] - internal class ResourcesProvider : ISystemResourcesProvider + internal sealed class ResourcesProvider : ISystemResourcesProvider { ResourceDictionary _dictionary; static global::Android.Content.Context _applicationContext; diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ConditionalFocusLayout.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ConditionalFocusLayout.cs index 2a352e8264ff..db1fd9604d55 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ConditionalFocusLayout.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ConditionalFocusLayout.cs @@ -5,7 +5,7 @@ namespace Microsoft.Maui.Controls.Handlers.Compatibility { - internal class ConditionalFocusLayout : LinearLayout, global::Android.Views.View.IOnTouchListener + internal sealed class ConditionalFocusLayout : LinearLayout, global::Android.Views.View.IOnTouchListener { public ConditionalFocusLayout(System.IntPtr p, global::Android.Runtime.JniHandleOwnership o) : base(p, o) { diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/GroupedListViewAdapter.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/GroupedListViewAdapter.cs index 749068c5f8ec..bd26230190ab 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/GroupedListViewAdapter.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/GroupedListViewAdapter.cs @@ -9,9 +9,9 @@ namespace Microsoft.Maui.Controls.Handlers.Compatibility { - internal class GroupedListViewAdapter : ListViewAdapter, ISectionIndexer + internal sealed class GroupedListViewAdapter : ListViewAdapter, ISectionIndexer { - class SectionData + private sealed class SectionData { public int Index { get; set; } public int Length { get; set; } diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs index 9dddc9b2a0db..9269bd273c45 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs @@ -552,7 +552,7 @@ void UpdateVerticalScrollBarVisibility() Control.VerticalScrollBarEnabled = newVerticalScrollVisibility == ScrollBarVisibility.Always; } - internal class Container : ViewGroup + internal sealed class Container : ViewGroup { IPlatformViewHandler _child; diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/TextCellRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/TextCellRenderer.cs index f1e904ab581c..07620c685a31 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/TextCellRenderer.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/TextCellRenderer.cs @@ -90,7 +90,7 @@ void UpdateMainText() } // ensure we don't get other people's BaseCellView's - internal class TextCellView : BaseCellView + internal sealed class TextCellView : BaseCellView { public TextCellView(Context context, Cell cell) : base(context, cell) { diff --git a/src/Controls/src/Core/Compatibility/Handlers/iOS/KeyboardInsetTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/iOS/KeyboardInsetTracker.cs index a67421f7c48f..6d50fb683985 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/iOS/KeyboardInsetTracker.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/iOS/KeyboardInsetTracker.cs @@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls.Handlers.Compatibility { [Obsolete("Scrolling is now handled by KeyboardAutoManagerScroll.")] - internal class KeyboardInsetTracker : IDisposable + internal sealed class KeyboardInsetTracker : IDisposable { readonly Func _fetchWindow; readonly Action _setContentOffset;