From 778490580f80498de021ad7a2de3d6a5490e2093 Mon Sep 17 00:00:00 2001 From: Markus Stoll Date: Tue, 21 Oct 2014 14:40:04 +0200 Subject: [PATCH] coding style --- SparkleShare/Mac/SparkleController.cs | 22 +++++++++++----------- SparkleShare/Mac/SparkleMacWatcher.cs | 8 ++++---- SparkleShare/SparkleControllerBase.cs | 22 +++++++++++----------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/SparkleShare/Mac/SparkleController.cs b/SparkleShare/Mac/SparkleController.cs index eab7a150..bfecb958 100755 --- a/SparkleShare/Mac/SparkleController.cs +++ b/SparkleShare/Mac/SparkleController.cs @@ -62,16 +62,16 @@ namespace SparkleShare { this.watcher.Changed += OnFilesChanged; } - private void OnFilesChanged(List changedFilesInBasedir) + private void OnFilesChanged(List changed_files_in_basedir) { - Dictionary> changeDict = new Dictionary> (); + Dictionary> change_dict = new Dictionary> (); - foreach (string file in changedFilesInBasedir) { + foreach (string file in changed_files_in_basedir) { string repo_name; - int pathSepIndex = file.IndexOf (Path.DirectorySeparatorChar); + int path_sep_index = file.IndexOf (Path.DirectorySeparatorChar); - if (pathSepIndex >= 0) - repo_name = file.Substring (0, pathSepIndex); + if (path_sep_index >= 0) + repo_name = file.Substring (0, path_sep_index); else repo_name = file; @@ -83,18 +83,18 @@ namespace SparkleShare { List changes; - if (changeDict.ContainsKey (repo)) - changes = changeDict [repo]; + if (change_dict.ContainsKey (repo)) + changes = change_dict [repo]; else { changes = new List (); - changeDict.Add (repo, changes); + change_dict.Add (repo, changes); } changes.Add (Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, file)); } - foreach (SparkleRepoBase repo in changeDict.Keys) { - foreach (string file in changeDict[repo]) { + foreach (SparkleRepoBase repo in change_dict.Keys) { + foreach (string file in change_dict[repo]) { FileActivityTask task = MacActivityTask ( repo, new FileSystemEventArgs(WatcherChangeTypes.Changed, file, "unknown") diff --git a/SparkleShare/Mac/SparkleMacWatcher.cs b/SparkleShare/Mac/SparkleMacWatcher.cs index 2365f6bb..0d6cf797 100755 --- a/SparkleShare/Mac/SparkleMacWatcher.cs +++ b/SparkleShare/Mac/SparkleMacWatcher.cs @@ -151,19 +151,19 @@ namespace SparkleShare { var handler = Changed; if (handler != null) { - List filteredPaths = new List (); + List filtered_paths = new List (); foreach (var path in paths) { if (path.Length > BasePath.Length) { var t = path.Substring (BasePath.Length); t = t.Trim ("/".ToCharArray ()); if (!string.IsNullOrWhiteSpace (t)) - filteredPaths.Add(t); + filtered_paths.Add(t); } } - if(filteredPaths.Count > 0) - handler (filteredPaths); + if(filtered_paths.Count > 0) + handler (filtered_paths); } GC.KeepAlive (this); diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index 338c8cc2..e2e56946 100644 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -30,32 +30,32 @@ namespace SparkleShare { public SparkleRepoBase [] Repositories { get { lock (this.repo_lock) - return this.sortedRepositories.GetRange (0, this.sortedRepositories.Count).ToArray (); + return this.sorted_repositories.GetRange (0, this.sorted_repositories.Count).ToArray (); } } private void AddRepository(SparkleRepoBase repo) { lock (this.repo_lock) { - sortedRepositories.Add (repo); - repositoryDict.Add (repo.Name, repo); - sortedRepositories.Sort ((x, y) => string.Compare (x.Name, y.Name)); + sorted_repositories.Add (repo); + repository_dict.Add (repo.Name, repo); + sorted_repositories.Sort ((x, y) => string.Compare (x.Name, y.Name)); } } private void RemoveRepository(SparkleRepoBase repo) { lock (this.repo_lock) { - sortedRepositories.Remove (repo); - repositoryDict.Remove (repo.Name); + sorted_repositories.Remove (repo); + repository_dict.Remove (repo.Name); } } public SparkleRepoBase GetRepositoryByName(string name) { lock (this.repo_lock) { - if(repositoryDict.ContainsKey(name)) - return repositoryDict [name]; + if(repository_dict.ContainsKey(name)) + return repository_dict [name]; return null; } @@ -181,8 +181,8 @@ namespace SparkleShare { private FileSystemWatcher watcher; private Object repo_lock = new Object (); private Object check_repos_lock = new Object (); - private List sortedRepositories = new List (); - private Dictionary repositoryDict = new Dictionary (); + private List sorted_repositories = new List (); + private Dictionary repository_dict = new Dictionary (); private bool lost_folders_path = false; @@ -498,7 +498,7 @@ namespace SparkleShare { private void RemoveRepository (string folder_path) { - foreach (SparkleRepoBase repo in this.sortedRepositories) { + foreach (SparkleRepoBase repo in this.sorted_repositories) { if (repo.LocalPath.Equals (folder_path)) { RemoveRepository (repo); repo.Dispose ();