From 17cf601c088e53d3aba2633bfc53a10c54b8153f Mon Sep 17 00:00:00 2001 From: SungHyun Min Date: Wed, 15 Mar 2017 10:47:01 +0900 Subject: [PATCH] Change the name of event argument class - MultiButtonEntryArgs -> MultiButtonEntryItemEventArgs - fix typo in TC Change-Id: I6eb74ed601a4d0ba025769527dd12f44be4ada61 Signed-off-by: SungHyun Min --- src/ElmSharp/ElmSharp/MultiButtonEntry.cs | 40 +++++++++++++------------- test/ElmSharp.Test/TC/MultibuttonEntryTest1.cs | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/ElmSharp/ElmSharp/MultiButtonEntry.cs b/src/ElmSharp/ElmSharp/MultiButtonEntry.cs index dc377b8..166d865 100644 --- a/src/ElmSharp/ElmSharp/MultiButtonEntry.cs +++ b/src/ElmSharp/ElmSharp/MultiButtonEntry.cs @@ -30,10 +30,10 @@ namespace ElmSharp SmartEvent _expanded; SmartEvent _contracted; SmartEvent _expandedStateChanged; - SmartEvent _itemSelected; - SmartEvent _itemClicked; - SmartEvent _itemLongPressed; - SmartEvent _itemAdded; + SmartEvent _itemSelected; + SmartEvent _itemClicked; + SmartEvent _itemLongPressed; + SmartEvent _itemAdded; public MultiButtonEntry(EvasObject parent) : base(parent) { @@ -42,10 +42,10 @@ namespace ElmSharp _contracted = new SmartEvent(this, "contracted"); _expandedStateChanged = new SmartEvent(this, "expand,state,changed"); - _itemSelected = new SmartEvent(this, "item,selected", MultiButtonEntryArgs.CreateFromSmartEvent); - _itemClicked = new SmartEvent(this, "item,clicked", MultiButtonEntryArgs.CreateFromSmartEvent); - _itemLongPressed = new SmartEvent(this, "item,longpressed", MultiButtonEntryArgs.CreateFromSmartEvent); - _itemAdded = new SmartEvent(this, "item,added", MultiButtonEntryArgs.CreateAndAddFromSmartEvent); + _itemSelected = new SmartEvent(this, "item,selected", MultiButtonEntryItemEventArgs.CreateFromSmartEvent); + _itemClicked = new SmartEvent(this, "item,clicked", MultiButtonEntryItemEventArgs.CreateFromSmartEvent); + _itemLongPressed = new SmartEvent(this, "item,longpressed", MultiButtonEntryItemEventArgs.CreateFromSmartEvent); + _itemAdded = new SmartEvent(this, "item,added", MultiButtonEntryItemEventArgs.CreateAndAddFromSmartEvent); _filtercallback = new Interop.Elementary.MultiButtonEntryItemFilterCallback(FilterCallbackHandler); @@ -68,15 +68,15 @@ namespace ElmSharp public event EventHandler ExpandedStateChanged; - public event EventHandler ItemSelected; + public event EventHandler ItemSelected; - public event EventHandler ItemClicked; + public event EventHandler ItemClicked; - public event EventHandler ItemLongPressed; + public event EventHandler ItemLongPressed; - public event EventHandler ItemAdded; + public event EventHandler ItemAdded; - public event EventHandler ItemDeleted; + public event EventHandler ItemDeleted; public MultiButtonEntryItem SelectedItem { @@ -203,10 +203,10 @@ namespace ElmSharp // "item,deleted" event will be called after removing the item from ItemObject has been done. // ItemObject will no longer have the item instance that is deleted after this. // So, ItemDelete event with the removed item should be triggered here. - ItemDeleted?.Invoke(this, new MultiButtonEntryArgs() { Item = removed }); + ItemDeleted?.Invoke(this, new MultiButtonEntryItemEventArgs() { Item = removed }); } - void OnItemAdded(object sender, MultiButtonEntryArgs e) + void OnItemAdded(object sender, MultiButtonEntryItemEventArgs e) { _children.Add(e.Item); e.Item.Deleted += Item_Deleted; @@ -224,24 +224,24 @@ namespace ElmSharp } } - public class MultiButtonEntryArgs : EventArgs + public class MultiButtonEntryItemEventArgs : EventArgs { public MultiButtonEntryItem Item { get; set; } - internal static MultiButtonEntryArgs CreateFromSmartEvent(IntPtr data, IntPtr obj, IntPtr info) + internal static MultiButtonEntryItemEventArgs CreateFromSmartEvent(IntPtr data, IntPtr obj, IntPtr info) { MultiButtonEntryItem item = ItemObject.GetItemByHandle(info) as MultiButtonEntryItem; - return new MultiButtonEntryArgs() { Item = item }; + return new MultiButtonEntryItemEventArgs() { Item = item }; } - internal static MultiButtonEntryArgs CreateAndAddFromSmartEvent(IntPtr data, IntPtr obj, IntPtr info) + internal static MultiButtonEntryItemEventArgs CreateAndAddFromSmartEvent(IntPtr data, IntPtr obj, IntPtr info) { // Item can be added throught calling Append method and user input. // And since "item.added" event will be called before xx_append() method returns, // ItemObject does NOT have an item that contains handle matched to "info" at this time. // So, item should be created and added internally here. MultiButtonEntryItem item = new MultiButtonEntryItem(info); - return new MultiButtonEntryArgs() { Item = item }; + return new MultiButtonEntryItemEventArgs() { Item = item }; } } } \ No newline at end of file diff --git a/test/ElmSharp.Test/TC/MultibuttonEntryTest1.cs b/test/ElmSharp.Test/TC/MultibuttonEntryTest1.cs index b27f0d2..2ed7932 100644 --- a/test/ElmSharp.Test/TC/MultibuttonEntryTest1.cs +++ b/test/ElmSharp.Test/TC/MultibuttonEntryTest1.cs @@ -52,7 +52,7 @@ namespace ElmSharp.Test if (e.Item.Next != null) Console.WriteLine("next item: " + e.Item.Next); if (e.Item.Prev != null) - Console.WriteLine("next item: " + e.Item.Prev); + Console.WriteLine("previous item: " + e.Item.Prev); }; mbe.ItemClicked += (s, e) => -- 2.7.4