From 43feb744d8b76194d3253f301862bb8e42063486 Mon Sep 17 00:00:00 2001 From: Kristian Hellang Date: Mon, 20 Jul 2015 22:51:16 +0200 Subject: [PATCH] Changed collection to inherit from Collection --- Octokit/Models/Request/SearchIssuesRequest.cs | 59 +++---------------- 1 file changed, 7 insertions(+), 52 deletions(-) diff --git a/Octokit/Models/Request/SearchIssuesRequest.cs b/Octokit/Models/Request/SearchIssuesRequest.cs index b93b88bd..953eb75c 100644 --- a/Octokit/Models/Request/SearchIssuesRequest.cs +++ b/Octokit/Models/Request/SearchIssuesRequest.cs @@ -2,7 +2,6 @@ using System.Diagnostics; using Octokit.Internal; using System; -using System.Collections; using System.Collections.Generic; using System.Linq; using System.Globalization; @@ -337,72 +336,28 @@ namespace Octokit Issue } - public class RepositoryCollection : IEnumerable + public class RepositoryCollection : Collection { - readonly ICollection _repositories = new List(); - - public IEnumerator GetEnumerator() - { - return _repositories.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - public void Add(string owner, string name) { - Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); - Ensure.ArgumentNotNullOrEmptyString(name, "name"); - - _repositories.Add(GetRepositoryName(owner, name)); - } - - public void Add(string nameWithOwner) - { - Ensure.ArgumentNotNullOrEmptyString(nameWithOwner, "nameWithOwner"); - - _repositories.Add(nameWithOwner); - } - - public void Clear() - { - _repositories.Clear(); + Add(GetRepositoryName(owner, name)); } public bool Contains(string owner, string name) { - Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); - Ensure.ArgumentNotNullOrEmptyString(name, "name"); - - return _repositories.Contains(GetRepositoryName(owner, name)); - } - - public bool Contains(string nameWithOwner) - { - Ensure.ArgumentNotNullOrEmptyString(nameWithOwner, "nameWithOwner"); - - return _repositories.Contains(nameWithOwner); + return Contains(GetRepositoryName(owner, name)); } public bool Remove(string owner, string name) { - Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); - Ensure.ArgumentNotNullOrEmptyString(name, "name"); - - return _repositories.Remove(GetRepositoryName(owner, name)); - } - - public bool Remove(string nameWithOwner) - { - Ensure.ArgumentNotNullOrEmptyString(nameWithOwner, "nameWithOwner"); - - return _repositories.Remove(nameWithOwner); + return Remove(GetRepositoryName(owner, name)); } private static string GetRepositoryName(string owner, string name) { + Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); + Ensure.ArgumentNotNullOrEmptyString(name, "name"); + return string.Format(CultureInfo.InvariantCulture, "{0}/{1}", owner, name); } }