[longomatch] Refactor some handlers name for clarity.



commit 7127b8b4d2c7889132045837c817550160bcca2b
Author: Julien Moutte <julien fluendo com>
Date:   Fri Apr 10 16:28:23 2015 +0200

    Refactor some handlers name for clarity.

 LongoMatch.Core/Common/EventsBroker.cs |   25 +++++++++----------------
 LongoMatch.Core/Handlers/Handlers.cs   |    4 +---
 LongoMatch.GUI/Gui/Menu/PlaysMenu.cs   |    2 +-
 LongoMatch.Services/EventsManager.cs   |    4 ++--
 4 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/LongoMatch.Core/Common/EventsBroker.cs b/LongoMatch.Core/Common/EventsBroker.cs
index fa2d023..f84d946 100644
--- a/LongoMatch.Core/Common/EventsBroker.cs
+++ b/LongoMatch.Core/Common/EventsBroker.cs
@@ -29,8 +29,8 @@ namespace LongoMatch.Core.Common
        public class EventsBroker
        {
        
-               public event NewEventHandler NewTagEvent;
-               public event NewTimelineEventHandler NewTimelineEventEvent;
+               public event NewEventHandler NewEventEvent;
+               public event NewTimelineEventHandler NewDashboardEventEvent;
                public event EventCreatedHandler EventCreatedEvent;
                public event DeleteEventsHandler EventsDeletedEvent;
                public event LoadEventHandler LoadEventEvent;
@@ -40,7 +40,6 @@ namespace LongoMatch.Core.Common
                public event MoveEventHandler MoveToEventTypeEvent;
                public event TimeNodeChangedHandler TimeNodeChanged;
                public event SnapshotSeriesHandler SnapshotSeries;
-               public event TagEventHandler TagEventEvent;
                public event DuplicateEventsHandler DuplicateEventsEvent;
                public event TeamsTagsChangedHandler TeamTagsChanged;
                public event PlayersSubstitutionHandler PlayerSubstitutionEvent;
@@ -95,18 +94,18 @@ namespace LongoMatch.Core.Common
                public event SeekEventHandler SeekEvent;
                public event TogglePlayEventHandler TogglePlayEvent;
 
-               public void EmitNewTag (EventType eventType, List<Player> players = null, TeamType team = 
TeamType.NONE,
-                                       List<Tag> tags = null, Time start = null, Time stop = null,
-                                       Time eventTime = null, Score score = null, PenaltyCard card = null)
+               public void EmitNewEvent (EventType eventType, List<Player> players = null, TeamType team = 
TeamType.NONE,
+                                         List<Tag> tags = null, Time start = null, Time stop = null,
+                                         Time eventTime = null, Score score = null, PenaltyCard card = null)
                {
-                       if (NewTagEvent != null)
-                               NewTagEvent (eventType, players, team, tags, start, stop, eventTime, score, 
card);
+                       if (NewEventEvent != null)
+                               NewEventEvent (eventType, players, team, tags, start, stop, eventTime, score, 
card);
                }
 
                public void EmitNewDashboardEvent (TimelineEvent evt)
                {
-                       if (NewTimelineEventEvent != null)
-                               NewTimelineEventEvent (evt);
+                       if (NewDashboardEventEvent != null)
+                               NewDashboardEventEvent (evt);
                }
 
                public void EmitEventsDeleted (List<TimelineEvent> events)
@@ -177,12 +176,6 @@ namespace LongoMatch.Core.Common
                                MoveToEventTypeEvent (evnt, eventType);
                }
 
-               public void EmitTagEvent (TimelineEvent evt)
-               {
-                       if (TagEventEvent != null)
-                               TagEventEvent (evt);
-               }
-
                public void EmitDuplicateEvent (List<TimelineEvent> events)
                {
                        if (DuplicateEventsEvent != null)
diff --git a/LongoMatch.Core/Handlers/Handlers.cs b/LongoMatch.Core/Handlers/Handlers.cs
index 30dc2df..6628111 100644
--- a/LongoMatch.Core/Handlers/Handlers.cs
+++ b/LongoMatch.Core/Handlers/Handlers.cs
@@ -35,7 +35,7 @@ namespace LongoMatch.Core.Handlers
        public delegate void EventLoadedHandler (TimelineEvent evt);
        /* An event has been created */
        public delegate void EventCreatedHandler (TimelineEvent evt);
-       /* A new play needs to be create for a specific category at the current play time */
+       /* A new play needs to be created for a specific category at the current play time */
        public delegate void NewEventHandler (EventType eventType,List<Player> players,TeamType team,
                                              List<Tag> tags,Time start,Time stop,Time EventTime,
                                              Score score,PenaltyCard card);
@@ -48,8 +48,6 @@ namespace LongoMatch.Core.Handlers
        public delegate void EditEventTypeHandler (EventType cat);
        /* A list of plays needs to be deleted */
        public delegate void DeleteEventsHandler (List<TimelineEvent> events);
-       /* Tag a play */
-       public delegate void TagEventHandler (TimelineEvent evt);
        /* Change the Play's category */
        public delegate void MoveEventHandler (TimelineEvent play,EventType eventType);
        /* An event was edited */
diff --git a/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs b/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
index 395c5b4..e269ddd 100644
--- a/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
+++ b/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
@@ -227,7 +227,7 @@ namespace LongoMatch.Gui.Menus
 
                void HandleNewPlayActivated (object sender, EventArgs e)
                {
-                       Config.EventsBroker.EmitNewTag (eventType,
+                       Config.EventsBroker.EmitNewEvent (eventType,
                                eventTime: time,
                                start: time - new Time { TotalSeconds = 10 },
                                stop: time + new Time { TotalSeconds = 10 });
diff --git a/LongoMatch.Services/EventsManager.cs b/LongoMatch.Services/EventsManager.cs
index 0de5586..f01040b 100644
--- a/LongoMatch.Services/EventsManager.cs
+++ b/LongoMatch.Services/EventsManager.cs
@@ -87,8 +87,8 @@ namespace LongoMatch.Services
 
                private void ConnectSignals ()
                {
-                       Config.EventsBroker.NewTagEvent += OnNewTag;
-                       Config.EventsBroker.NewTimelineEventEvent += HandleNewPlay;
+                       Config.EventsBroker.NewEventEvent += OnNewTag;
+                       Config.EventsBroker.NewDashboardEventEvent += HandleNewPlay;
                        Config.EventsBroker.EventsDeletedEvent += OnPlaysDeleted;
                        Config.EventsBroker.MoveToEventTypeEvent += OnPlayCategoryChanged;
                        Config.EventsBroker.DuplicateEventsEvent += OnDuplicatePlays;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]