Skip to content

Commit d139447

Browse files
committed
Refactor and reformat Parameter class and MakeAwareOf method
Refactored MakeAwareOf method to rename parameter from `owner` to `actionMessageOwner` for clarity. Updated internal implementation accordingly. Reformatted Parameter class in Caliburn.Micro.Xamarin.Forms namespace for consistency, including placing opening braces `{` on new lines and aligning `null` value in ValueProperty registration.
1 parent ad63b83 commit d139447

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

src/Caliburn.Micro.Platform/Platforms/Maui/Parameter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ void IAttachedObject.Detach()
8686
/// <summary>
8787
/// Makes the parameter aware of the <see cref="ActionMessage"/> that it's attached to.
8888
/// </summary>
89-
/// <param name="owner">The action message.</param>
90-
internal void MakeAwareOf(ActionMessage owner)
89+
/// <param name="actionMessageOwner">The action message.</param>
90+
internal void MakeAwareOf(ActionMessage actionMessageOwner)
9191
{
92-
Owner = owner;
92+
Owner = actionMessageOwner;
9393
}
9494

9595
internal static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)

src/Caliburn.Micro.Platform/Platforms/Xamarin.Forms/Parameter.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ namespace Caliburn.Micro
66
{
77
using System;
88
#if XFORMS
9-
using global::Xamarin.Forms;
109
using DependencyObject = global::Xamarin.Forms.BindableObject;
1110
using DependencyProperty = global::Xamarin.Forms.BindableProperty;
12-
using FrameworkElement = global::Xamarin.Forms.VisualElement;
1311
#else
1412
using Windows.UI.Xaml;
1513
#endif
@@ -18,7 +16,8 @@ namespace Caliburn.Micro
1816
/// Represents a parameter of an <see cref="ActionMessage"/>.
1917
/// </summary>
2018
#if WINDOWS_UWP || XFORMS
21-
public class Parameter : DependencyObject, IAttachedObject {
19+
public class Parameter : DependencyObject, IAttachedObject
20+
{
2221
DependencyObject associatedObject;
2322
#else
2423
public class Parameter : FrameworkElement, IAttachedObject
@@ -35,7 +34,7 @@ public class Parameter : FrameworkElement, IAttachedObject
3534
"Value",
3635
typeof(object),
3736
typeof(Parameter),
38-
null,
37+
null,
3938
OnValueChanged
4039
);
4140

@@ -50,7 +49,8 @@ public object Value
5049
}
5150

5251
#if WINDOWS_UWP || XFORMS
53-
DependencyObject IAttachedObject.AssociatedObject {
52+
DependencyObject IAttachedObject.AssociatedObject
53+
{
5454
#else
5555
FrameworkElement IAttachedObject.AssociatedObject
5656
{
@@ -69,7 +69,8 @@ protected ActionMessage Owner
6969
}
7070

7171
#if WINDOWS_UWP || XFORMS
72-
void IAttachedObject.Attach(DependencyObject dependencyObject) {
72+
void IAttachedObject.Attach(DependencyObject dependencyObject)
73+
{
7374
#else
7475
void IAttachedObject.Attach(FrameworkElement dependencyObject)
7576
{
@@ -85,10 +86,10 @@ void IAttachedObject.Detach()
8586
/// <summary>
8687
/// Makes the parameter aware of the <see cref="ActionMessage"/> that it's attached to.
8788
/// </summary>
88-
/// <param name="owner">The action message.</param>
89-
internal void MakeAwareOf(ActionMessage owner)
89+
/// <param name="actionMessageOwner">The action message.</param>
90+
internal void MakeAwareOf(ActionMessage actionMessageOwner)
9091
{
91-
Owner = owner;
92+
Owner = actionMessageOwner;
9293
}
9394

9495
static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)

0 commit comments

Comments
 (0)