[Structuremap-commits] SF.net SVN: structuremap:[152] trunk/Source/StructureMap

[<jer...@us...>]

Revision: 152
          http://structuremap.svn.sourceforge.net/structuremap/?rev=152&view=rev
Author:   jeremydmiller
Date:     2008-09-17 13:48:01 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
cleaning up warnings

Modified Paths:
--------------
    trunk/Source/StructureMap/Graph/PluginFamily.cs
    trunk/Source/StructureMap/StructureMapConfiguration.cs
    trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs
    trunk/Source/StructureMap.Testing/Pipeline/OptionalSetterInjectionTester.cs

Modified: trunk/Source/StructureMap/Graph/PluginFamily.cs
===================================================================
--- trunk/Source/StructureMap/Graph/PluginFamily.cs	2008-09-16 18:51:53 UTC (rev 151)
+++ trunk/Source/StructureMap/Graph/PluginFamily.cs	2008-09-17 13:48:01 UTC (rev 152)
@@ -279,7 +279,6 @@
 
         #endregion
 
-        [Obsolete("is this really important?")]
         public Plugin FindPlugin(Type pluggedType)
         {
             return _pluggedTypes.Find(p => p.PluggedType == pluggedType);

Modified: trunk/Source/StructureMap/StructureMapConfiguration.cs
===================================================================
--- trunk/Source/StructureMap/StructureMapConfiguration.cs	2008-09-16 18:51:53 UTC (rev 151)
+++ trunk/Source/StructureMap/StructureMapConfiguration.cs	2008-09-17 13:48:01 UTC (rev 152)
@@ -12,7 +12,7 @@
 
 namespace StructureMap
 {
-    [Obsolete("Please put configuration into Registry classes and use the ObjectFactory.Initialize() method for configuring the container")]
+    [Obsolete("Please use the ObjectFactory.Initialize() method for configuring the container and put configuration into Registry classes")]
     public static class StructureMapConfiguration
     {
         private const string CONFIG_FILE_NAME = "StructureMap.config";
@@ -144,6 +144,8 @@
         /// <returns></returns>
         internal static PluginGraph GetPluginGraph()
         {
+            _sealed = true;
+
             ConfigurationParser[] parsers = _parserBuilder.GetParsers();
             
             PluginGraphBuilder pluginGraphBuilder = new PluginGraphBuilder(parsers, _registries.ToArray(), _log);

Modified: trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs	2008-09-16 18:51:53 UTC (rev 151)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs	2008-09-17 13:48:01 UTC (rev 152)
@@ -94,8 +94,7 @@
                 .For<IWidget>().UseNamedInstance(theDefaultName)
                 .For<Rule>().UseNamedInstance("DefaultRule");
 
-            LiteralInstance masterInstance = new LiteralInstance(new AWidget()).WithName(theDefaultName);
-            registry.AddInstanceOf<IWidget>(masterInstance);
+            var masterInstance = registry.InstanceOf<IWidget>().Is.Object(new AWidget()).WithName(theDefaultName);
 
             ProfileManager manager = registry.Build().ProfileManager;
             Assert.AreSame(masterInstance, manager.GetDefault(typeof (IWidget), theProfileName));

Modified: trunk/Source/StructureMap.Testing/Pipeline/OptionalSetterInjectionTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Pipeline/OptionalSetterInjectionTester.cs	2008-09-16 18:51:53 UTC (rev 151)
+++ trunk/Source/StructureMap.Testing/Pipeline/OptionalSetterInjectionTester.cs	2008-09-17 13:48:01 UTC (rev 152)
@@ -46,7 +46,7 @@
                     r.ForRequestedType<OptionalSetterTarget>().TheDefaultIs(
                         (Instance<OptionalSetterTarget>()).WithProperty("Name").EqualTo("Jeremy"));
 
-                    r.AddInstanceOf<OptionalSetterTarget>(Instance<OptionalSetterTarget>().WithName("NoName"));
+                    r.InstanceOf<OptionalSetterTarget>().Is.OfConcreteType<OptionalSetterTarget>().WithName("NoName");
                 });
 
             try


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.