Menu
▾
▴
[Structuremap-commits] SF.net SVN: structuremap:[227] trunk/Source/StructureMap
|
From: <fli...@us...> - 2009-01-22 22:33:26
|
Revision: 227
http://structuremap.svn.sourceforge.net/structuremap/?rev=227&view=rev
Author: flimflan
Date: 2009-01-22 22:33:20 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Applied patch from Weston Binford to suppress noisy documentation warnings.
Cleaned up "real" warnings.
Modified Paths:
--------------
trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/ProfileExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Registry.cs
trunk/Source/StructureMap/Configuration/GraphBuilder.cs
trunk/Source/StructureMap/Container.cs
trunk/Source/StructureMap/Diagnostics/ValidationBuildSession.cs
trunk/Source/StructureMap/Graph/AssemblyScanner.cs
trunk/Source/StructureMap/IContainer.cs
trunk/Source/StructureMap/InitializationExpression.cs
trunk/Source/StructureMap/InstanceBuilder.cs
trunk/Source/StructureMap/Model.cs
trunk/Source/StructureMap/ObjectFactory.cs
trunk/Source/StructureMap/Pipeline/ConditionalInstance.cs
trunk/Source/StructureMap/Pipeline/ConfiguredInstanceBase.cs
trunk/Source/StructureMap/Pipeline/DefaultInstance.cs
trunk/Source/StructureMap/Pipeline/Instance.cs
trunk/Source/StructureMap/Pipeline/SmartInstance.cs
trunk/Source/StructureMap/StructureMap.csproj
trunk/Source/StructureMap.AutoMocking/AutoMocker.cs
trunk/Source/StructureMap.AutoMocking/StructureMap.AutoMocking.csproj
trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs
trunk/Source/StructureMap.Testing/Pipeline/ConditionalInstanceTester.cs
trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -100,8 +100,6 @@
family.AddInstance(instance);
family.DefaultInstanceKey = instance.Name;
});
-
- return this;
}
/// <summary>
@@ -193,7 +191,7 @@
/// <summary>
/// Register a Func to run against any object of this PluginType immediately after it is created,
- /// but before the new object is passed back to the caller. Unlike <see cref="OnCreation">OnCreation()</see>,
+ /// but before the new object is passed back to the caller. Unlike <see cref="OnCreation(Action{PLUGINTYPE})">OnCreation()</see>,
/// EnrichWith() gives the the ability to return a different object. Use this method for runtime AOP
/// scenarios or to return a decorator.
/// </summary>
@@ -215,7 +213,7 @@
/// <summary>
/// Register a Func to run against any object of this PluginType immediately after it is created,
- /// but before the new object is passed back to the caller. Unlike <see cref="OnCreation">OnCreation()</see>,
+ /// but before the new object is passed back to the caller. Unlike <see cref="OnCreation(Action{IContext,PLUGINTYPE})">OnCreation()</see>,
/// EnrichWith() gives the the ability to return a different object. Use this method for runtime AOP
/// scenarios or to return a decorator.
/// </summary>
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceExpression.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceExpression.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -15,13 +15,14 @@
IInstanceExpression<T> Is { get; }
/// <summary>
- /// Shortcut to specify a prebuilt Instance
+ /// Register a previously built Instance. This provides a "catch all"
+ /// method to attach custom Instance objects. Synonym for Instance()
/// </summary>
/// <param name="instance"></param>
void IsThis(Instance instance);
/// <summary>
- /// Shortcut to directly inject an object
+ /// Inject this object directly. Synonym to Object()
/// </summary>
/// <param name="obj"></param>
/// <returns></returns>
@@ -90,20 +91,6 @@
void Instance(Instance instance);
/// <summary>
- /// Register a previously built Instance. This provides a "catch all"
- /// method to attach custom Instance objects. Synonym for Instance()
- /// </summary>
- /// <param name="instance"></param>
- void IsThis(Instance instance);
-
- /// <summary>
- /// Inject this object directly. Synonym to Object()
- /// </summary>
- /// <param name="obj"></param>
- /// <returns></returns>
- LiteralInstance IsThis(T obj);
-
- /// <summary>
/// Inject this object directly. Synonym to IsThis()
/// </summary>
/// <param name="theObject"></param>
@@ -190,7 +177,7 @@
/// <param name="configuration"></param>
/// <returns></returns>
// Conditional object construction
- ConditionalInstance<T> Conditional(Action<ConditionalInstance<T>.ConditionalInstanceExpression<T>> configuration);
+ ConditionalInstance<T> Conditional(Action<ConditionalInstance<T>.ConditionalInstanceExpression> configuration);
}
public class InstanceExpression<T> : IInstanceExpression<T>, ThenItExpression<T>
@@ -226,7 +213,7 @@
_action(instance);
}
- private T returnInstance<T>(T instance) where T : Instance
+ private INSTANCE returnInstance<INSTANCE>(INSTANCE instance) where INSTANCE : Instance
{
Instance(instance);
return instance;
@@ -282,7 +269,7 @@
return returnInstance(new UserControlInstance(url));
}
- public ConditionalInstance<T> Conditional(Action<ConditionalInstance<T>.ConditionalInstanceExpression<T>> configuration)
+ public ConditionalInstance<T> Conditional(Action<ConditionalInstance<T>.ConditionalInstanceExpression> configuration)
{
return returnInstance(new ConditionalInstance<T>(configuration));
}
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/ProfileExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/ProfileExpression.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/ProfileExpression.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -151,7 +151,7 @@
/// <summary>
/// Define the default instance of the PluginType for the containing Profile
/// </summary>
- /// <param name="mementoBuilder"></param>
+ /// <param name="instance"></param>
/// <returns></returns>
public ProfileExpression Use(Instance instance)
{
Modified: trunk/Source/StructureMap/Configuration/DSL/Registry.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Registry.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Configuration/DSL/Registry.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -43,7 +43,7 @@
/// class. Applies globally to all Containers in a single AppDomain.
/// </summary>
/// <typeparam name="T"></typeparam>
- /// <param name="func"></param>
+ /// <param name="expression"></param>
void SelectConstructor<T>(Expression<Func<T>> expression);
}
@@ -352,7 +352,7 @@
/// class. Applies globally to all Containers in a single AppDomain.
/// </summary>
/// <typeparam name="T"></typeparam>
- /// <param name="func"></param>
+ /// <param name="expression"></param>
public void SelectConstructor<T>(Expression<Func<T>> expression)
{
PluginCache.GetPlugin(typeof(T)).UseConstructor(expression);
Modified: trunk/Source/StructureMap/Configuration/GraphBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/GraphBuilder.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Configuration/GraphBuilder.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -1,5 +1,4 @@
using System;
-using System.Diagnostics;
using System.Reflection;
using StructureMap.Configuration.DSL;
using StructureMap.Graph;
@@ -11,8 +10,7 @@
{
private readonly AssemblyScanner _assemblyScanner;
private readonly PluginGraph _pluginGraph;
- private Profile _profile;
- private Container _systemContainer;
+ private readonly Container _systemContainer;
private readonly PluginGraph _systemGraph;
Modified: trunk/Source/StructureMap/Container.cs
===================================================================
--- trunk/Source/StructureMap/Container.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Container.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -506,8 +506,8 @@
/// <param name="templateType"></param>
/// <returns></returns>
/// <example>
- /// IFlattener flattener1 = container.ForGenericType(typeof (IFlattener<>))
- /// .WithParameters(typeof (Address)).GetInstanceAs<IFlattener>();
+ /// IFlattener flattener1 = container.ForGenericType(typeof (IFlattener<>))
+ /// .WithParameters(typeof (Address)).GetInstanceAs<IFlattener>();
/// </example>
public OpenGenericTypeExpression ForGenericType(Type templateType)
{
Modified: trunk/Source/StructureMap/Diagnostics/ValidationBuildSession.cs
===================================================================
--- trunk/Source/StructureMap/Diagnostics/ValidationBuildSession.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Diagnostics/ValidationBuildSession.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -48,7 +48,6 @@
try
{
return base.CreateInstance(pluginType, instance);
- _dependencyStack.Pop();
}
catch (StructureMapException ex)
{
@@ -81,9 +80,7 @@
object builtInstance = CreateInstance(pluginType, instance);
validate(pluginType, instance, builtInstance);
}
-#pragma warning disable EmptyGeneralCatchClause
catch (Exception)
-#pragma warning restore EmptyGeneralCatchClause
{
// All exceptions are being dealt with in another place
}
Modified: trunk/Source/StructureMap/Graph/AssemblyScanner.cs
===================================================================
--- trunk/Source/StructureMap/Graph/AssemblyScanner.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Graph/AssemblyScanner.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -188,10 +188,9 @@
private void scanTypesInAssembly(Assembly assembly, PluginGraph graph)
{
- Type[] exportedTypes;
try
{
- foreach (Type type in assembly.GetExportedTypes())
+ foreach (var type in assembly.GetExportedTypes())
{
if (!isInTheIncludes(type)) continue;
if (isInTheExcludes(type)) continue;
Modified: trunk/Source/StructureMap/IContainer.cs
===================================================================
--- trunk/Source/StructureMap/IContainer.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/IContainer.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -233,8 +233,8 @@
/// <param name="templateType"></param>
/// <returns></returns>
/// <example>
- /// IFlattener flattener1 = container.ForGenericType(typeof (IFlattener<>))
- /// .WithParameters(typeof (Address)).GetInstanceAs<IFlattener>();
+ /// IFlattener flattener1 = container.ForGenericType(typeof (IFlattener<>))
+ /// .WithParameters(typeof (Address)).GetInstanceAs<IFlattener>();
/// </example>
Container.OpenGenericTypeExpression ForGenericType(Type templateType);
Modified: trunk/Source/StructureMap/InitializationExpression.cs
===================================================================
--- trunk/Source/StructureMap/InitializationExpression.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/InitializationExpression.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -85,7 +85,6 @@
/// Scoping, the Default Instance, and interception. This method is specifically
/// meant for registering open generic types
/// </summary>
- /// <typeparam name="PLUGINTYPE"></typeparam>
/// <returns></returns>
GenericFamilyExpression ForRequestedType(Type pluginType);
Modified: trunk/Source/StructureMap/InstanceBuilder.cs
===================================================================
--- trunk/Source/StructureMap/InstanceBuilder.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/InstanceBuilder.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -3,6 +3,7 @@
namespace StructureMap
{
+#pragma warning disable 169
/// <summary>
/// Base class for creating an object instance from an InstanceMemento. SubClasses are
/// emitted for each concrete Plugin with constructor parameters.
@@ -20,4 +21,5 @@
public virtual void BuildUp(IConfiguredInstance instance, BuildSession session, object target) { }
}
+#pragma warning restore 169
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Model.cs
===================================================================
--- trunk/Source/StructureMap/Model.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Model.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -13,7 +13,7 @@
public interface IModel
{
/// <summary>
- /// Access to all the <seealso cref="PluginType">PluginType</seealso> registrations
+ /// Access to all the <seealso cref="PluginTypeConfiguration">Plugin Type</seealso> registrations
/// </summary>
IEnumerable<PluginTypeConfiguration> PluginTypes { get; }
@@ -27,7 +27,7 @@
bool HasDefaultImplementationFor(Type pluginType);
/// <summary>
- /// Can StructureMap fulfill a request to ObjectFactory.GetInstance<T>() from the
+ /// Can StructureMap fulfill a request to ObjectFactory.GetInstance<T>() from the
/// current configuration. This does not include concrete classes that could be auto-configured
/// upon demand
/// </summary>
@@ -45,7 +45,6 @@
/// <summary>
/// Queryable access to all of the <see cref="IInstance">IInstance</see> for a given PluginType
/// </summary>
- /// <param name="pluginType"></param>
/// <returns></returns>
IEnumerable<IInstance> InstancesOf<T>();
Modified: trunk/Source/StructureMap/ObjectFactory.cs
===================================================================
--- trunk/Source/StructureMap/ObjectFactory.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/ObjectFactory.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -88,7 +88,7 @@
/// to introduce mocks or stubs during automated testing scenarios
/// </summary>
/// <param name="pluginType"></param>
- /// <param name="stub"></param>
+ /// <param name="instance"></param>
public static void Inject(Type pluginType, object instance)
{
container.Inject(pluginType, instance);
@@ -117,7 +117,7 @@
/// pluginType. Mostly used for temporarily setting up return values of the Container
/// to introduce mocks or stubs during automated testing scenarios
/// </summary>
- /// <typeparam name="T"></typeparam>
+ /// <typeparam name="PLUGINTYPE"></typeparam>
/// <param name="name"></param>
/// <param name="instance"></param>
public static void Inject<PLUGINTYPE>(string name, PLUGINTYPE instance)
@@ -162,7 +162,7 @@
/// <summary>
/// Creates or finds the default instance of type T
/// </summary>
- /// <typeparam name="T"></typeparam>
+ /// <typeparam name="PLUGINTYPE"></typeparam>
/// <returns></returns>
public static PLUGINTYPE GetInstance<PLUGINTYPE>()
{
@@ -172,18 +172,17 @@
/// <summary>
/// Creates a new instance of the requested type using the supplied Instance. Mostly used internally
/// </summary>
- /// <param name="pluginType"></param>
+ /// <param name="targetType"></param>
/// <param name="instance"></param>
/// <returns></returns>
- public static object GetInstance(Type TargetType, Instance instance)
+ public static object GetInstance(Type targetType, Instance instance)
{
- return container.GetInstance(TargetType, instance);
+ return container.GetInstance(targetType, instance);
}
/// <summary>
/// Creates a new instance of the requested type T using the supplied Instance. Mostly used internally
/// </summary>
- /// <param name="pluginType"></param>
/// <param name="instance"></param>
/// <returns></returns>
public static T GetInstance<T>(Instance instance)
@@ -195,7 +194,7 @@
/// Creates or finds the named instance of the pluginType
/// </summary>
/// <param name="pluginType"></param>
- /// <param name="instanceKey"></param>
+ /// <param name="name"></param>
/// <returns></returns>
public static object GetNamedInstance(Type pluginType, string name)
{
@@ -205,8 +204,8 @@
/// <summary>
/// Creates or finds the named instance of T
/// </summary>
- /// <typeparam name="T"></typeparam>
- /// <param name="instanceKey"></param>
+ /// <typeparam name="PLUGINTYPE"></typeparam>
+ /// <param name="name"></param>
/// <returns></returns>
public static PLUGINTYPE GetNamedInstance<PLUGINTYPE>(string name)
{
@@ -227,7 +226,7 @@
/// <summary>
/// Creates or resolves all registered instances of type T
/// </summary>
- /// <typeparam name="T"></typeparam>
+ /// <typeparam name="PLUGINTYPE"></typeparam>
/// <returns></returns>
public static IList<PLUGINTYPE> GetAllInstances<PLUGINTYPE>()
{
@@ -290,7 +289,6 @@
/// <summary>
/// Sets the default instance for all PluginType's to the designated Profile.
/// </summary>
- /// <param name="profile"></param>
public static string Profile
{
set
@@ -377,7 +375,6 @@
/// </summary>
/// <param name="pluginType"></param>
/// <param name="instanceKey"></param>
- /// <param name="instance"></param>
/// <returns></returns>
public static object TryGetInstance(Type pluginType, string instanceKey)
{
@@ -388,7 +385,6 @@
/// Creates or finds the default instance of the pluginType. Returns null if the pluginType is not known to the container.
/// </summary>
/// <param name="pluginType"></param>
- /// <param name="instance"></param>
/// <returns></returns>
public static object TryGetInstance(Type pluginType)
{
@@ -399,7 +395,6 @@
/// Creates or finds the default instance of type T. Returns the default value of T if it is not known to the container.
/// </summary>
/// <typeparam name="T"></typeparam>
- /// <param name="instance"></param>
/// <returns></returns>
public static T TryGetInstance<T>()
{
@@ -410,7 +405,7 @@
/// Creates or finds the named instance of type T. Returns the default value of T if the named instance is not known to the container.
/// </summary>
/// <typeparam name="T"></typeparam>
- /// <param name="instance"></param>
+ /// <param name="instanceKey"></param>
/// <returns></returns>
public static T TryGetInstance<T>(string instanceKey)
{
@@ -435,8 +430,8 @@
/// <param name="templateType"></param>
/// <returns></returns>
/// <example>
- /// IFlattener flattener1 = container.ForGenericType(typeof (IFlattener<>))
- /// .WithParameters(typeof (Address)).GetInstanceAs<IFlattener>();
+ /// IFlattener flattener1 = container.ForGenericType(typeof (IFlattener<>))
+ /// .WithParameters(typeof (Address)).GetInstanceAs<IFlattener>();
/// </example>
public static Container.OpenGenericTypeExpression ForGenericType(Type templateType)
{
Modified: trunk/Source/StructureMap/Pipeline/ConditionalInstance.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/ConditionalInstance.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Pipeline/ConditionalInstance.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -17,9 +17,9 @@
public Instance _default = new DefaultInstance();
- public ConditionalInstance(Action<ConditionalInstanceExpression<T>> action)
+ public ConditionalInstance(Action<ConditionalInstanceExpression> action)
{
- action(new ConditionalInstanceExpression<T>(this));
+ action(new ConditionalInstanceExpression(this));
}
protected override string getDescription()
@@ -40,7 +40,7 @@
return instance.Build(pluginType, session);
}
- public class ConditionalInstanceExpression<T>
+ public class ConditionalInstanceExpression
{
private readonly ConditionalInstance<T> _parent;
Modified: trunk/Source/StructureMap/Pipeline/ConfiguredInstanceBase.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/ConfiguredInstanceBase.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Pipeline/ConfiguredInstanceBase.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -214,14 +214,14 @@
return _pluggedType;
}
- protected string findPropertyName<T>()
+ protected string findPropertyName<PLUGINTYPE>()
{
var plugin = new Plugin(_pluggedType);
string propertyName = plugin.FindArgumentNameForType<T>();
if (string.IsNullOrEmpty(propertyName))
{
- throw new StructureMapException(305, typeof (T));
+ throw new StructureMapException(305, typeof(PLUGINTYPE));
}
return propertyName;
Modified: trunk/Source/StructureMap/Pipeline/DefaultInstance.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/DefaultInstance.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Pipeline/DefaultInstance.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -4,11 +4,6 @@
{
public class DefaultInstance : Instance
{
- public DefaultInstance()
- {
- int x = 1;
- }
-
protected override bool doesRecordOnTheStack
{
get { return false; }
Modified: trunk/Source/StructureMap/Pipeline/Instance.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/Instance.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Pipeline/Instance.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -133,7 +133,7 @@
{
return build(pluginType, session);
}
- catch (StructureMapException ex)
+ catch (StructureMapException)
{
throw;
}
Modified: trunk/Source/StructureMap/Pipeline/SmartInstance.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/SmartInstance.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/Pipeline/SmartInstance.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -34,7 +34,6 @@
/// Register an Action to perform on the object created by this Instance
/// before it is returned to the caller
/// </summary>
- /// <typeparam name="T"></typeparam>
/// <param name="handler"></param>
/// <returns></returns>
public SmartInstance<T> OnCreation(Action<T> handler)
@@ -49,7 +48,6 @@
/// Register an Action to perform on the object created by this Instance
/// before it is returned to the caller
/// </summary>
- /// <typeparam name="T"></typeparam>
/// <param name="handler"></param>
/// <returns></returns>
public SmartInstance<T> OnCreation(Action<IContext, T> handler)
@@ -192,7 +190,7 @@
/// </summary>
/// <typeparam name="CTORTYPE"></typeparam>
/// <returns></returns>
- public DependencyExpression<T, CTORTYPE> CtorDependency<CTORTYPE>()
+ public DependencyExpression<CTORTYPE> CtorDependency<CTORTYPE>()
{
string constructorArg = getArgumentNameForType<CTORTYPE>();
return CtorDependency<CTORTYPE>(constructorArg);
@@ -211,9 +209,9 @@
/// <typeparam name="CTORTYPE"></typeparam>
/// <param name="constructorArg"></param>
/// <returns></returns>
- public DependencyExpression<T, CTORTYPE> CtorDependency<CTORTYPE>(string constructorArg)
+ public DependencyExpression<CTORTYPE> CtorDependency<CTORTYPE>(string constructorArg)
{
- return new DependencyExpression<T, CTORTYPE>(this, constructorArg);
+ return new DependencyExpression<CTORTYPE>(this, constructorArg);
}
/// <summary>
@@ -222,11 +220,11 @@
/// <typeparam name="SETTERTYPE"></typeparam>
/// <param name="expression"></param>
/// <returns></returns>
- public DependencyExpression<T, SETTERTYPE> SetterDependency<SETTERTYPE>(
+ public DependencyExpression<SETTERTYPE> SetterDependency<SETTERTYPE>(
Expression<Func<T, SETTERTYPE>> expression)
{
string propertyName = ReflectionHelper.GetProperty(expression).Name;
- return new DependencyExpression<T, SETTERTYPE>(this, propertyName);
+ return new DependencyExpression<SETTERTYPE>(this, propertyName);
}
/// <summary>
@@ -235,7 +233,7 @@
/// </summary>
/// <typeparam name="SETTERTYPE"></typeparam>
/// <returns></returns>
- public DependencyExpression<T, SETTERTYPE> SetterDependency<SETTERTYPE>()
+ public DependencyExpression<SETTERTYPE> SetterDependency<SETTERTYPE>()
{
return CtorDependency<SETTERTYPE>();
}
@@ -246,7 +244,7 @@
/// </summary>
/// <typeparam name="CHILD"></typeparam>
/// <returns></returns>
- public ArrayDefinitionExpression<T, CHILD> TheArrayOf<CHILD>()
+ public ArrayDefinitionExpression<CHILD> TheArrayOf<CHILD>()
{
if (typeof (CHILD).IsArray)
{
@@ -266,9 +264,9 @@
/// <typeparam name="CHILD"></typeparam>
/// <param name="ctorOrPropertyName"></param>
/// <returns></returns>
- public ArrayDefinitionExpression<T, CHILD> TheArrayOf<CHILD>(string ctorOrPropertyName)
+ public ArrayDefinitionExpression<CHILD> TheArrayOf<CHILD>(string ctorOrPropertyName)
{
- return new ArrayDefinitionExpression<T, CHILD>(this, ctorOrPropertyName);
+ return new ArrayDefinitionExpression<CHILD>(this, ctorOrPropertyName);
}
#region Nested type: ArrayDefinitionExpression
@@ -276,9 +274,8 @@
/// <summary>
/// Expression Builder to help define multiple Instances for an Array dependency
/// </summary>
- /// <typeparam name="T"></typeparam>
/// <typeparam name="ARRAY"></typeparam>
- public class ArrayDefinitionExpression<T, ARRAY>
+ public class ArrayDefinitionExpression<ARRAY>
{
private readonly SmartInstance<T> _instance;
private readonly string _propertyName;
@@ -298,7 +295,7 @@
{
var list = new List<Instance>();
- var child = new InstanceExpression<ARRAY>(i => list.Add(i));
+ var child = new InstanceExpression<ARRAY>(list.Add);
action(child);
_instance.setChildArray(_propertyName, list.ToArray());
@@ -326,9 +323,8 @@
/// <summary>
/// Expression Builder that helps to define child dependencies inline
/// </summary>
- /// <typeparam name="T"></typeparam>
/// <typeparam name="CHILD"></typeparam>
- public class DependencyExpression<T, CHILD>
+ public class DependencyExpression<CHILD>
{
private readonly SmartInstance<T> _instance;
private readonly string _propertyName;
Modified: trunk/Source/StructureMap/StructureMap.csproj
===================================================================
--- trunk/Source/StructureMap/StructureMap.csproj 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap/StructureMap.csproj 2009-01-22 22:33:20 UTC (rev 227)
@@ -56,13 +56,12 @@
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn>618,1591</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>0</WarningLevel>
+ <WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
@@ -78,12 +77,11 @@
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn>618,1591</NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
@@ -100,8 +98,7 @@
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn>618, 1591</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
Modified: trunk/Source/StructureMap.AutoMocking/AutoMocker.cs
===================================================================
--- trunk/Source/StructureMap.AutoMocking/AutoMocker.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap.AutoMocking/AutoMocker.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -10,8 +10,7 @@
public interface IAutoMocker<TARGETCLASS> where TARGETCLASS : class
{
/// <summary>
- ///Gets an instance of the ClassUnderTest with mock objects (or stubs) pushed in
-// for all of its dependencies
+ ///Gets an instance of the ClassUnderTest with mock objects (or stubs) pushed in for all of its dependencies
/// </summary>
TARGETCLASS ClassUnderTest { get; }
@@ -101,8 +100,7 @@
protected ServiceLocator _serviceLocator;
/// <summary>
- ///Gets an instance of the ClassUnderTest with mock objects (or stubs) pushed in
- // for all of its dependencies
+ ///Gets an instance of the ClassUnderTest with mock objects (or stubs) pushed in for all of its dependencies
/// </summary>
public TARGETCLASS ClassUnderTest
{
Modified: trunk/Source/StructureMap.AutoMocking/StructureMap.AutoMocking.csproj
===================================================================
--- trunk/Source/StructureMap.AutoMocking/StructureMap.AutoMocking.csproj 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap.AutoMocking/StructureMap.AutoMocking.csproj 2009-01-22 22:33:20 UTC (rev 227)
@@ -42,6 +42,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\StructureMap.AutoMocking.XML</DocumentationFile>
+ <NoWarn>1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -51,6 +52,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\StructureMap.AutoMocking.XML</DocumentationFile>
+ <NoWarn>1591</NoWarn>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -95,10 +95,5 @@
autoMocker.Get<IMockedService>().AssertWasCalled(s => s.Go());
}
- public interface IAnotherService
- {
-
- }
-
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/Pipeline/ConditionalInstanceTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Pipeline/ConditionalInstanceTester.cs 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap.Testing/Pipeline/ConditionalInstanceTester.cs 2009-01-22 22:33:20 UTC (rev 227)
@@ -14,7 +14,6 @@
private Rule Blue = new ColorRule("blue");
private Rule Default = new ColorRule("black");
- private Rule _rule;
private BuildSession _session;
private void TheRequestedNameIs(string name)
@@ -40,7 +39,6 @@
_session = new BuildSession();
- _rule = null;
}
[Test]
@@ -90,7 +88,7 @@
var container = new Container(x =>
{
x.ForRequestedType<Rule>().TheDefault.IsThis(DEFAULT);
- x.InstanceOf<Rule>().Is.Conditional(o =>
+ x.InstanceOf<Rule>().Is.Conditional(o =>
{
o.If(c => false).ThenIt.Is.OfConcreteType<ARule>();
}).WithName("conditional");
Modified: trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj
===================================================================
--- trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj 2009-01-21 00:53:11 UTC (rev 226)
+++ trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj 2009-01-22 22:33:20 UTC (rev 227)
@@ -57,8 +57,7 @@
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn>618</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
@@ -80,8 +79,7 @@
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn>618</NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
