Browse Source

Split typechecks into their own conditions

tags/1.0-rc
Khionu Sybiern 8 years ago
parent
commit
ba406bb646
1 changed files with 8 additions and 4 deletions
  1. +8
    -4
      src/Discord.Net.Commands/Dependencies/DependencyMap.cs

+ 8
- 4
src/Discord.Net.Commands/Dependencies/DependencyMap.cs View File

@@ -38,8 +38,10 @@ namespace Discord.Commands
public void AddFactory<T>(Func<T> factory) where T : class
{
var t = typeof(T);
if (typeof(T) == typeof(IDependencyMap) || typeof(T) == typeof(CommandService))
throw new InvalidOperationException("The dependency map cannot contain services directly added as IDependencyMap or CommandService. Only Implimentations and Derivatives are permitted");
if (typeof(T) == typeof(IDependencyMap))
throw new InvalidOperationException("IDependencyMap is used internally and cannot be added as a dependency");
if (typeof(T) == typeof(CommandService))
throw new InvalidOperationException("CommandService is used internally and cannot be added as a dependency");
if (map.ContainsKey(t))
throw new InvalidOperationException($"The dependency map already contains \"{t.FullName}\"");
map.Add(t, factory);
@@ -50,8 +52,10 @@ namespace Discord.Commands
var t = typeof(T);
if (map.ContainsKey(t))
return false;
if (typeof(T) == typeof(IDependencyMap) || typeof(T) == typeof(CommandService))
throw new InvalidOperationException("The dependency map cannot contain services directly added as IDependencyMap or CommandService. Only Implimentations and Derivatives are permitted");
if (typeof(T) == typeof(IDependencyMap))
throw new InvalidOperationException("IDependencyMap is used internally and cannot be added as a dependency");
if (typeof(T) == typeof(CommandService))
throw new InvalidOperationException("CommandService is used internally and cannot be added as a dependency");
map.Add(t, factory);
return true;
}


Loading…
Cancel
Save