From b69aa8690fdce0713b2ec78f454c0c45b119854d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20S=CC=8Colte=CC=81s?= Date: Sun, 1 Sep 2024 22:10:32 +0200 Subject: [PATCH] Rename to Action --- src/Avalonia.Xaml.Interactions.Custom/AddClassAction.cs | 2 +- .../ChangeAvaloniaPropertyAction.cs | 2 +- src/Avalonia.Xaml.Interactions.Custom/FocusControlAction.cs | 2 +- src/Avalonia.Xaml.Interactions.Custom/PopupAction.cs | 2 +- src/Avalonia.Xaml.Interactions.Custom/RemoveClassAction.cs | 2 +- src/Avalonia.Xaml.Interactions/Core/CallMethodAction.cs | 2 +- src/Avalonia.Xaml.Interactions/Core/ChangePropertyAction.cs | 2 +- src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs | 2 +- src/Avalonia.Xaml.Interactivity/{ActionBase.cs => Action.cs} | 4 ++-- tests/Avalonia.Xaml.Interactivity.UnitTests/StubAction.cs | 2 +- tests/Avalonia.Xaml.Interactivity.UnitTests/TestUitilties.cs | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) rename src/Avalonia.Xaml.Interactivity/{ActionBase.cs => Action.cs} (88%) diff --git a/src/Avalonia.Xaml.Interactions.Custom/AddClassAction.cs b/src/Avalonia.Xaml.Interactions.Custom/AddClassAction.cs index 82b93a52..eced00e4 100644 --- a/src/Avalonia.Xaml.Interactions.Custom/AddClassAction.cs +++ b/src/Avalonia.Xaml.Interactions.Custom/AddClassAction.cs @@ -6,7 +6,7 @@ namespace Avalonia.Xaml.Interactions.Custom; /// /// Adds a specified to the collection when invoked. /// -public class AddClassAction : ActionBase +public class AddClassAction : Avalonia.Xaml.Interactivity.Action { /// /// Identifies the avalonia property. diff --git a/src/Avalonia.Xaml.Interactions.Custom/ChangeAvaloniaPropertyAction.cs b/src/Avalonia.Xaml.Interactions.Custom/ChangeAvaloniaPropertyAction.cs index cc5ab5c5..f861b43b 100644 --- a/src/Avalonia.Xaml.Interactions.Custom/ChangeAvaloniaPropertyAction.cs +++ b/src/Avalonia.Xaml.Interactions.Custom/ChangeAvaloniaPropertyAction.cs @@ -10,7 +10,7 @@ namespace Avalonia.Xaml.Interactions.Custom; /// /// An action that will change a specified Avalonia property to a specified value when invoked. /// -public class ChangeAvaloniaPropertyAction : ActionBase +public class ChangeAvaloniaPropertyAction : Avalonia.Xaml.Interactivity.Action { /// /// Identifies the avalonia property. diff --git a/src/Avalonia.Xaml.Interactions.Custom/FocusControlAction.cs b/src/Avalonia.Xaml.Interactions.Custom/FocusControlAction.cs index c9a65dfe..5a6dae2a 100644 --- a/src/Avalonia.Xaml.Interactions.Custom/FocusControlAction.cs +++ b/src/Avalonia.Xaml.Interactions.Custom/FocusControlAction.cs @@ -7,7 +7,7 @@ namespace Avalonia.Xaml.Interactions.Custom; /// /// Focuses the associated or target control when executed. /// -public class FocusControlAction : ActionBase +public class FocusControlAction : Avalonia.Xaml.Interactivity.Action { /// /// Identifies the avalonia property. diff --git a/src/Avalonia.Xaml.Interactions.Custom/PopupAction.cs b/src/Avalonia.Xaml.Interactions.Custom/PopupAction.cs index 902eea97..52084728 100644 --- a/src/Avalonia.Xaml.Interactions.Custom/PopupAction.cs +++ b/src/Avalonia.Xaml.Interactions.Custom/PopupAction.cs @@ -10,7 +10,7 @@ namespace Avalonia.Xaml.Interactions.Custom; /// An action that displays a for the associated control when executed. /// /// If the associated control is of type than popup inherits control . -public class PopupAction : ActionBase +public class PopupAction : Avalonia.Xaml.Interactivity.Action { private Popup? _popup; diff --git a/src/Avalonia.Xaml.Interactions.Custom/RemoveClassAction.cs b/src/Avalonia.Xaml.Interactions.Custom/RemoveClassAction.cs index a600a904..df099531 100644 --- a/src/Avalonia.Xaml.Interactions.Custom/RemoveClassAction.cs +++ b/src/Avalonia.Xaml.Interactions.Custom/RemoveClassAction.cs @@ -6,7 +6,7 @@ namespace Avalonia.Xaml.Interactions.Custom; /// /// Removes a specified from collection when invoked. /// -public class RemoveClassAction : ActionBase +public class RemoveClassAction : Avalonia.Xaml.Interactivity.Action { /// /// Identifies the avalonia property. diff --git a/src/Avalonia.Xaml.Interactions/Core/CallMethodAction.cs b/src/Avalonia.Xaml.Interactions/Core/CallMethodAction.cs index 701f3ea3..9374ea0b 100644 --- a/src/Avalonia.Xaml.Interactions/Core/CallMethodAction.cs +++ b/src/Avalonia.Xaml.Interactions/Core/CallMethodAction.cs @@ -14,7 +14,7 @@ namespace Avalonia.Xaml.Interactions.Core; /// /// An action that calls a method on a specified object when invoked. /// -public class CallMethodAction : ActionBase +public class CallMethodAction : Avalonia.Xaml.Interactivity.Action { private Type? _targetObjectType; private readonly List _methodDescriptors = new(); diff --git a/src/Avalonia.Xaml.Interactions/Core/ChangePropertyAction.cs b/src/Avalonia.Xaml.Interactions/Core/ChangePropertyAction.cs index 838437db..3a2ea6f6 100644 --- a/src/Avalonia.Xaml.Interactions/Core/ChangePropertyAction.cs +++ b/src/Avalonia.Xaml.Interactions/Core/ChangePropertyAction.cs @@ -11,7 +11,7 @@ namespace Avalonia.Xaml.Interactions.Core; /// /// An action that will change a specified property to a specified value when invoked. /// -public class ChangePropertyAction : ActionBase +public class ChangePropertyAction : Avalonia.Xaml.Interactivity.Action { private static readonly char[] s_trimChars = { '(', ')' }; private static readonly char[] s_separator = { '.' }; diff --git a/src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs b/src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs index dfa0984f..96724103 100644 --- a/src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs +++ b/src/Avalonia.Xaml.Interactions/Core/InvokeCommandAction.cs @@ -7,7 +7,7 @@ namespace Avalonia.Xaml.Interactions.Core; /// /// Executes a specified when invoked. /// -public class InvokeCommandAction : ActionBase +public class InvokeCommandAction : Avalonia.Xaml.Interactivity.Action { /// /// Identifies the avalonia property. diff --git a/src/Avalonia.Xaml.Interactivity/ActionBase.cs b/src/Avalonia.Xaml.Interactivity/Action.cs similarity index 88% rename from src/Avalonia.Xaml.Interactivity/ActionBase.cs rename to src/Avalonia.Xaml.Interactivity/Action.cs index 5ce1b30b..97574c51 100644 --- a/src/Avalonia.Xaml.Interactivity/ActionBase.cs +++ b/src/Avalonia.Xaml.Interactivity/Action.cs @@ -3,13 +3,13 @@ namespace Avalonia.Xaml.Interactivity; /// /// A base class for action that calls a method on a specified object when invoked. /// -public abstract class ActionBase : AvaloniaObject, IAction +public abstract class Action : AvaloniaObject, IAction { /// /// Identifies the avalonia property. /// public static readonly StyledProperty IsEnabledProperty = - AvaloniaProperty.Register(nameof(IsEnabled), defaultValue: true); + AvaloniaProperty.Register(nameof(IsEnabled), defaultValue: true); /// /// Gets or sets a value indicating whether this instance is enabled. diff --git a/tests/Avalonia.Xaml.Interactivity.UnitTests/StubAction.cs b/tests/Avalonia.Xaml.Interactivity.UnitTests/StubAction.cs index d2d14532..edeccc4e 100644 --- a/tests/Avalonia.Xaml.Interactivity.UnitTests/StubAction.cs +++ b/tests/Avalonia.Xaml.Interactivity.UnitTests/StubAction.cs @@ -1,6 +1,6 @@ namespace Avalonia.Xaml.Interactivity.UnitTests; -public class StubAction(object? returnValue) : ActionBase +public class StubAction(object? returnValue) : Avalonia.Xaml.Interactivity.Action { public StubAction() : this(null) { diff --git a/tests/Avalonia.Xaml.Interactivity.UnitTests/TestUitilties.cs b/tests/Avalonia.Xaml.Interactivity.UnitTests/TestUitilties.cs index 283a7ff7..91c0ee77 100644 --- a/tests/Avalonia.Xaml.Interactivity.UnitTests/TestUitilties.cs +++ b/tests/Avalonia.Xaml.Interactivity.UnitTests/TestUitilties.cs @@ -8,12 +8,12 @@ public static class TestUtilities /// /// Handles the difference between InvalidOperationException in managed and native. /// - public static void AssertThrowsInvalidOperationException(Action action) + public static void AssertThrowsInvalidOperationException(System.Action action) { Assert.Throws(action); } - public static void AssertThrowsArgumentException(Action action) + public static void AssertThrowsArgumentException(System.Action action) { Assert.Throws(action); }