From f07dd48d0d6e1715f4bd64b60aff796a19f4bb82 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Tue, 3 May 2011 18:30:39 +0100 Subject: [PATCH] fetcher: remove the Cloning prefix from the events to make more sense grammatically --- SparkleLib/SparkleFetcher.cs | 24 ++++++++++++------------ SparkleShare/SparkleController.cs | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SparkleLib/SparkleFetcher.cs b/SparkleLib/SparkleFetcher.cs index e4f496fd..9a047fb7 100644 --- a/SparkleLib/SparkleFetcher.cs +++ b/SparkleLib/SparkleFetcher.cs @@ -26,13 +26,13 @@ namespace SparkleLib { public class SparkleFetcher { // TODO: remove 'cloning' prefix - public delegate void CloningStartedEventHandler (object o, SparkleEventArgs args); - public delegate void CloningFinishedEventHandler (object o, SparkleEventArgs args); - public delegate void CloningFailedEventHandler (object o, SparkleEventArgs args); + public delegate void StartedEventHandler (object o, SparkleEventArgs args); + public delegate void FinishedEventHandler (object o, SparkleEventArgs args); + public delegate void FailedEventHandler (object o, SparkleEventArgs args); - public event CloningStartedEventHandler CloningStarted; - public event CloningFinishedEventHandler CloningFinished; - public event CloningFailedEventHandler CloningFailed; + public event StartedEventHandler Started; + public event FinishedEventHandler Finished; + public event FailedEventHandler Failed; private string TargetFolder; private string RemoteOriginUrl; @@ -54,8 +54,8 @@ namespace SparkleLib { Directory.Delete (TargetFolder, true); - if (CloningStarted != null) - CloningStarted (this, new SparkleEventArgs ("CloningStarted")); + if (Started != null) + Started (this, new SparkleEventArgs ("Started")); SparkleGit git = new SparkleGit (SparklePaths.SparkleTmpPath, "clone \"" + RemoteOriginUrl + "\" " + "\"" + TargetFolder + "\""); @@ -66,16 +66,16 @@ namespace SparkleLib { if (git.ExitCode != 0) { SparkleHelpers.DebugInfo ("Git", "[" + TargetFolder + "] Cloning failed"); - if (CloningFailed != null) - CloningFailed (this, new SparkleEventArgs ("CloningFailed")); + if (Failed != null) + Failed (this, new SparkleEventArgs ("CloningFailed")); } else { InstallConfiguration (); InstallExcludeRules (); SparkleHelpers.DebugInfo ("Git", "[" + TargetFolder + "] Repository cloned"); - if (CloningFinished != null) - CloningFinished (this, new SparkleEventArgs ("CloningFinished")); + if (Finished != null) + Finished (this, new SparkleEventArgs ("Finished")); } }; diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index cd2fe705..cfdd2838 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -985,7 +985,7 @@ namespace SparkleShare { if (i > 1) target_folder_name += " (" + i + ")"; - fetcher.CloningFinished += delegate { + fetcher.Finished += delegate { EnableHostKeyCheckingForHost (host); // Needed to do the moving @@ -1003,13 +1003,13 @@ namespace SparkleShare { if (FolderFetched != null) FolderFetched (); - + if (FolderListChanged != null) FolderListChanged (); }; - fetcher.CloningFailed += delegate { + fetcher.Failed += delegate { EnableHostKeyCheckingForHost (host); if (Directory.Exists (tmp_folder)) { @@ -1023,12 +1023,12 @@ namespace SparkleShare { if (FolderFetchError != null) FolderFetchError (); }; - + fetcher.Start (); } - + // Creates an MD5 hash of input public static string GetMD5 (string s) {