Menu
▾
▴
[Structuremap-commits] SF.net SVN: structuremap: [57] trunk/Source/StructureMap
|
From: <jer...@us...> - 2008-01-15 15:56:18
|
Revision: 57
http://structuremap.svn.sourceforge.net/structuremap/?rev=57&view=rev
Author: jeremydmiller
Date: 2008-01-15 07:56:14 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
reformatting the code
Modified Paths:
--------------
trunk/Source/StructureMap/AssemblyInfo.cs
trunk/Source/StructureMap/Attributes/PluginFamilyAttribute.cs
trunk/Source/StructureMap/Caching/CacheItem.cs
trunk/Source/StructureMap/Caching/CacheManager.cs
trunk/Source/StructureMap/Caching/CloneStorageStrategy.cs
trunk/Source/StructureMap/Caching/Expirations/AbsoluteTimeExpirationPolicy.cs
trunk/Source/StructureMap/Caching/Expirations/SlidingTimeExpirationPolicy.cs
trunk/Source/StructureMap/Caching/FileModificationWatcher.cs
trunk/Source/StructureMap/Caching/LazyCache.cs
trunk/Source/StructureMap/Caching/SerializationStorageStrategy.cs
trunk/Source/StructureMap/Caching/SharedStorageStrategy.cs
trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs
trunk/Source/StructureMap/Configuration/ConfigurationParser.cs
trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs
trunk/Source/StructureMap/Configuration/DSL/ExpressionValidator.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/ChildArrayExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/ChildInstanceExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceDefaultExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/MementoBuilder.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/ProfileExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/ScanAssembliesExpression.cs
trunk/Source/StructureMap/Configuration/DSL/ReferenceMementoBuilder.cs
trunk/Source/StructureMap/Configuration/DiagnosticGraphBuilder.cs
trunk/Source/StructureMap/Configuration/GraphObject.cs
trunk/Source/StructureMap/Configuration/IGraphBuilder.cs
trunk/Source/StructureMap/Configuration/InstanceValidator.cs
trunk/Source/StructureMap/Configuration/Mementos/LiteralMemento.cs
trunk/Source/StructureMap/Configuration/Mementos/MemoryInstanceMemento.cs
trunk/Source/StructureMap/Configuration/Mementos/PrototypeMemento.cs
trunk/Source/StructureMap/Configuration/Mementos/UserControlMemento.cs
trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs
trunk/Source/StructureMap/Configuration/PluginGraphReport.cs
trunk/Source/StructureMap/Configuration/Problem.cs
trunk/Source/StructureMap/Configuration/ProblemFinder.cs
trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs
trunk/Source/StructureMap/Configuration/StructureMapConfigurationSection.cs
trunk/Source/StructureMap/Configuration/Tokens/AssemblyToken.cs
trunk/Source/StructureMap/Configuration/Tokens/Deployable.cs
trunk/Source/StructureMap/Configuration/Tokens/FamilyToken.cs
trunk/Source/StructureMap/Configuration/Tokens/InstanceToken.cs
trunk/Source/StructureMap/Configuration/Tokens/InterceptorInstanceToken.cs
trunk/Source/StructureMap/Configuration/Tokens/MementoSourceInstanceToken.cs
trunk/Source/StructureMap/Configuration/Tokens/PluginToken.cs
trunk/Source/StructureMap/Configuration/Tokens/Properties/ChildArrayProperty.cs
trunk/Source/StructureMap/Configuration/Tokens/Properties/ChildProperty.cs
trunk/Source/StructureMap/Configuration/Tokens/Properties/DefaultChildPropertyMode.cs
trunk/Source/StructureMap/Configuration/Tokens/Properties/InlineInstanceChildPropertyMode.cs
trunk/Source/StructureMap/Configuration/Tokens/Properties/NulloChildPropertyMode.cs
trunk/Source/StructureMap/Configuration/Tokens/Properties/Property.cs
trunk/Source/StructureMap/Configuration/Tokens/Properties/ReferencedChildPropertyMode.cs
trunk/Source/StructureMap/Configuration/Tokens/Properties/TemplateProperty.cs
trunk/Source/StructureMap/Configuration/Tokens/PropertyDefinition.cs
trunk/Source/StructureMap/Configuration/Tokens/TemplateToken.cs
trunk/Source/StructureMap/Configuration/XmlConstants.cs
trunk/Source/StructureMap/ConstructorMemento.cs
trunk/Source/StructureMap/Delegates.cs
trunk/Source/StructureMap/DeploymentTasks/DeploymentConfiguration.cs
trunk/Source/StructureMap/DeploymentTasks/DeploymentExecutor.cs
trunk/Source/StructureMap/DeploymentTasks/PluginGraphFilter.cs
trunk/Source/StructureMap/Emitting/ClassBuilder.cs
trunk/Source/StructureMap/Emitting/DynamicAssembly.cs
trunk/Source/StructureMap/Emitting/Method.cs
trunk/Source/StructureMap/Exceptions/StructureMapException.cs
trunk/Source/StructureMap/Graph/AssemblyGraph.cs
trunk/Source/StructureMap/Graph/AssemblyGraphCollection.cs
trunk/Source/StructureMap/Graph/Deployable.cs
trunk/Source/StructureMap/Graph/GenericsPluginGraph.cs
trunk/Source/StructureMap/Graph/InstanceDefault.cs
trunk/Source/StructureMap/Graph/InstanceDefaultManager.cs
trunk/Source/StructureMap/Graph/InterceptionChain.cs
trunk/Source/StructureMap/Graph/MachineOverride.cs
trunk/Source/StructureMap/Graph/Plugin.cs
trunk/Source/StructureMap/Graph/PluginCollection.cs
trunk/Source/StructureMap/Graph/PluginFamily.cs
trunk/Source/StructureMap/Graph/PluginFamilyCollection.cs
trunk/Source/StructureMap/Graph/PluginGraph.cs
trunk/Source/StructureMap/Graph/PluginGraphObjectCollection.cs
trunk/Source/StructureMap/Graph/Profile.cs
trunk/Source/StructureMap/Graph/RemoteGraph.cs
trunk/Source/StructureMap/Graph/SetterPropertyCollection.cs
trunk/Source/StructureMap/Graph/TypePath.cs
trunk/Source/StructureMap/IInstanceFactory.cs
trunk/Source/StructureMap/IInstanceManager.cs
trunk/Source/StructureMap/IPluginGraphSource.cs
trunk/Source/StructureMap/InstanceBuilder.cs
trunk/Source/StructureMap/InstanceFactory.cs
trunk/Source/StructureMap/InstanceManager.cs
trunk/Source/StructureMap/InstanceMemento.cs
trunk/Source/StructureMap/Interceptors/CompoundInterceptor.cs
trunk/Source/StructureMap/Interceptors/EnrichmentInterceptor.cs
trunk/Source/StructureMap/Interceptors/HttpContextItemInterceptor.cs
trunk/Source/StructureMap/Interceptors/InstanceFactoryInterceptor.cs
trunk/Source/StructureMap/Interceptors/InterceptorChainBuilder.cs
trunk/Source/StructureMap/Interceptors/Interceptors.cs
trunk/Source/StructureMap/Interceptors/NulloInterceptor.cs
trunk/Source/StructureMap/Interceptors/StartupInterceptor.cs
trunk/Source/StructureMap/MementoSource.cs
trunk/Source/StructureMap/ObjectFactory.cs
trunk/Source/StructureMap/ObjectFactoryCacheCallback.cs
trunk/Source/StructureMap/PluginGraphBuilder.cs
trunk/Source/StructureMap/Source/BasicXmlMementoSource.cs
trunk/Source/StructureMap/Source/DirectoryXmlMementoSource.cs
trunk/Source/StructureMap/Source/EmbeddedFolderXmlMementoSource.cs
trunk/Source/StructureMap/Source/MemoryMementoSource.cs
trunk/Source/StructureMap/Source/SingleEmbeddedXmlMementoSource.cs
trunk/Source/StructureMap/Source/TemplatedMementoSource.cs
trunk/Source/StructureMap/Source/XmlAttributeInstanceMemento.cs
trunk/Source/StructureMap/Source/XmlFileMementoSource.cs
trunk/Source/StructureMap/Source/XmlMementoCreator.cs
trunk/Source/StructureMap/Source/XmlMementoSource.cs
trunk/Source/StructureMap/Source/XmlNodeInstanceMemento.cs
trunk/Source/StructureMap/Source/XmlTemplater.cs
trunk/Source/StructureMap/StructureMapConfiguration.cs
trunk/Source/StructureMap/Verification/PluginGraphConsoleWriter.cs
trunk/Source/StructureMap/Verification/StartUp.cs
trunk/Source/StructureMap.AutoMocking/AutoMockedInstanceManager.cs
trunk/Source/StructureMap.AutoMocking/IntegrationSpecification.cs
trunk/Source/StructureMap.AutoMocking/Properties/AssemblyInfo.cs
trunk/Source/StructureMap.AutoMocking/RhinoAutoMocker.cs
trunk/Source/StructureMap.AutoMocking/RhinoMocksServiceLocator.cs
trunk/Source/StructureMap.Client/AssemblyInfo.cs
trunk/Source/StructureMap.Client/Controllers/HTMLSourceFactory.cs
trunk/Source/StructureMap.Client/Controllers/ReportSource.cs
trunk/Source/StructureMap.Client/Controllers/TreeBuilder.cs
trunk/Source/StructureMap.Client/Shell/ApplicationShell.cs
trunk/Source/StructureMap.Client/Shell/SearchPart.cs
trunk/Source/StructureMap.Client/TreeNodes/GraphObjectNode.cs
trunk/Source/StructureMap.Client/Views/BasicView.cs
trunk/Source/StructureMap.Client/Views/CellMaker.cs
trunk/Source/StructureMap.Client/Views/ChildHeader.cs
trunk/Source/StructureMap.Client/Views/Column.cs
trunk/Source/StructureMap.Client/Views/GridView.cs
trunk/Source/StructureMap.Client/Views/HTMLBuilder.cs
trunk/Source/StructureMap.Client/Views/IColumn.cs
trunk/Source/StructureMap.Client/Views/IndexColumn.cs
trunk/Source/StructureMap.Client/Views/InstanceHierarchyView.cs
trunk/Source/StructureMap.Client/Views/ProblemColumn.cs
trunk/Source/StructureMap.Client/Views/ProblemView.cs
trunk/Source/StructureMap.Client/Views/RecordView.cs
trunk/Source/StructureMap.Client/Views/SummaryView.cs
trunk/Source/StructureMap.Client/Views/TableMaker.cs
trunk/Source/StructureMap.Client/Views/ViewConstants.cs
trunk/Source/StructureMap.DataAccess/AssemblyInfo.cs
trunk/Source/StructureMap.DataAccess/CommandCollection.cs
trunk/Source/StructureMap.DataAccess/CommandFactory.cs
trunk/Source/StructureMap.DataAccess/CommandFailureException.cs
trunk/Source/StructureMap.DataAccess/Commands/CommandBase.cs
trunk/Source/StructureMap.DataAccess/Commands/QueryFilter.cs
trunk/Source/StructureMap.DataAccess/Commands/StoredProcedureCommand.cs
trunk/Source/StructureMap.DataAccess/Commands/TemplatedCommand.cs
trunk/Source/StructureMap.DataAccess/Commands/TemplatedQuery.cs
trunk/Source/StructureMap.DataAccess/DataSession.cs
trunk/Source/StructureMap.DataAccess/DataSetMapping/ReaderToColumnMap.cs
trunk/Source/StructureMap.DataAccess/DataSetMapping/YesNoReaderToColumnMap.cs
trunk/Source/StructureMap.DataAccess/DefaultConnectionStringProvider.cs
trunk/Source/StructureMap.DataAccess/ExecutionStates/AutoCommitExecutionState.cs
trunk/Source/StructureMap.DataAccess/ExecutionStates/TransactionalExecutionState.cs
trunk/Source/StructureMap.DataAccess/ICommand.cs
trunk/Source/StructureMap.DataAccess/IDataSession.cs
trunk/Source/StructureMap.DataAccess/IParameter.cs
trunk/Source/StructureMap.DataAccess/IReaderSource.cs
trunk/Source/StructureMap.DataAccess/JSON/Field.cs
trunk/Source/StructureMap.DataAccess/JSON/JSONProperty.cs
trunk/Source/StructureMap.DataAccess/MSSQL/MSSQLDatabaseEngine.cs
trunk/Source/StructureMap.DataAccess/ParameterCollection.cs
trunk/Source/StructureMap.DataAccess/Parameterization/BasicParameterTemplate.cs
trunk/Source/StructureMap.DataAccess/Parameterization/IParameterTemplate.cs
trunk/Source/StructureMap.DataAccess/Parameterization/ParameterizedCommandBuilder.cs
trunk/Source/StructureMap.DataAccess/Parameterization/StringParameterTemplate.cs
trunk/Source/StructureMap.DataAccess/Parameters/Parameter.cs
trunk/Source/StructureMap.DataAccess/Parameters/TemplateParameter.cs
trunk/Source/StructureMap.DataAccess/ReaderSourceCollection.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/CommandExpectation.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/MockCommand.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/MockDataSession.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/MockReaderSource.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/ParameterList.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/ParameterValidationFailureException.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/ReaderExpectation.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/StubbedCommandCollection.cs
trunk/Source/StructureMap.DataAccess/Tools/Mocks/StubbedReaderSourceCollection.cs
trunk/Source/StructureMap.DataAccess/Tools/TableDataReader.cs
trunk/Source/StructureMap.DeploymentTasks/AddAssembly.cs
trunk/Source/StructureMap.DeploymentTasks/AssemblyInfo.cs
trunk/Source/StructureMap.DeploymentTasks/Deployment.cs
trunk/Source/StructureMap.DeploymentTasks/DumbConfigMergeTask.cs
trunk/Source/StructureMap.DeploymentTasks/ImportFamilyTask.cs
trunk/Source/StructureMap.DeploymentTasks/RemoveAssemblyTask.cs
trunk/Source/StructureMap.DeploymentTasks/SetOverrideTask.cs
trunk/Source/StructureMap.DeploymentTasks/SubstitutionTask.cs
trunk/Source/StructureMap.DeploymentTasks/Verification.cs
trunk/Source/StructureMap.DeploymentTasks/Versioning/CheckVersionTask.cs
trunk/Source/StructureMap.DeploymentTasks/Versioning/DeployedDirectory.cs
trunk/Source/StructureMap.DeploymentTasks/Versioning/DeployedFile.cs
trunk/Source/StructureMap.DeploymentTasks/Versioning/DotNetAssembly.cs
trunk/Source/StructureMap.Diagnostics/AssemblyInfo.cs
trunk/Source/StructureMap.Testing/AlternativeConfigurationTester.cs
trunk/Source/StructureMap.Testing/AssemblyInfo.cs
trunk/Source/StructureMap.Testing/Attributes/PluginFamilyAttributeTester.cs
trunk/Source/StructureMap.Testing/AutoMocking/RhinoAutoMockerTester.cs
trunk/Source/StructureMap.Testing/Caching/ExpirationTester.cs
trunk/Source/StructureMap.Testing/Caching/FileModificationWatcherTester.cs
trunk/Source/StructureMap.Testing/Caching/MockManagedCache.cs
trunk/Source/StructureMap.Testing/Caching/StorageAndCacheItemTester.cs
trunk/Source/StructureMap.Testing/Client/Controllers/ApplicationControllerTester.cs
trunk/Source/StructureMap.Testing/Client/Controllers/TreeBuilderTester.cs
trunk/Source/StructureMap.Testing/Client/Controllers/TreeNodeExpectation.cs
trunk/Source/StructureMap.Testing/Client/GraphObjectNodeTester.cs
trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserCollectionTester.cs
trunk/Source/StructureMap.Testing/Configuration/ConfigurationParserTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/AddTypesTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ChildInstanceExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ConstructorExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/CreateProfileTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/DeepInstanceTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/InjectArrayTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/InstanceExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptAllInstancesOfPluginTypeTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/InterceptorTesting.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/LiteralExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ProfileExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ReferenceMementoBuilderTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryIntegratedTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/ScanAssembliesTester.cs
trunk/Source/StructureMap.Testing/Configuration/DSL/UserControlExpressionTester.cs
trunk/Source/StructureMap.Testing/Configuration/DefaultInstanceNodeTester.cs
trunk/Source/StructureMap.Testing/Configuration/DiagnosticGraphBuilderTester.cs
trunk/Source/StructureMap.Testing/Configuration/FamilyParserTester.cs
trunk/Source/StructureMap.Testing/Configuration/IncludeTesting.cs
trunk/Source/StructureMap.Testing/Configuration/InlineInstanceDefinitionInProfileAndMachineNodesTester.cs
trunk/Source/StructureMap.Testing/Configuration/InstanceValidatorTester.cs
trunk/Source/StructureMap.Testing/Configuration/MockGraphObject.cs
trunk/Source/StructureMap.Testing/Configuration/NormalGraphBuilderTester.cs
trunk/Source/StructureMap.Testing/Configuration/PluginGraphReportTester.cs
trunk/Source/StructureMap.Testing/Configuration/ShortcuttedInstanceNodeTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/FamilyTokenTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/GraphObjectTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/InstanceTokenTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/MockInterceptor.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/MockMementoSource.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/PluginTokenTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/Properties/ChildArrayPropertyTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/Properties/ChildPropertyTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/Properties/EnumerationPropertyTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/Properties/PrimitivePropertyTester.cs
trunk/Source/StructureMap.Testing/Configuration/Tokens/PropertyDefinitionTester.cs
trunk/Source/StructureMap.Testing/ConstructorMementoTester.cs
trunk/Source/StructureMap.Testing/Container/ArrayConstructorTester.cs
trunk/Source/StructureMap.Testing/Container/DynamicInjectionTester.cs
trunk/Source/StructureMap.Testing/Container/EmittingTester.cs
trunk/Source/StructureMap.Testing/Container/ExceptionHandling/ExceptionTestRunner.cs
trunk/Source/StructureMap.Testing/Container/ExceptionHandling/StructureMapExceptionTester.cs
trunk/Source/StructureMap.Testing/Container/FillDependenciesTester.cs
trunk/Source/StructureMap.Testing/Container/FullStackFacadeTester.cs
trunk/Source/StructureMap.Testing/Container/ImplicitDefaultTest.cs
trunk/Source/StructureMap.Testing/Container/InstanceFactoryTester.cs
trunk/Source/StructureMap.Testing/Container/InstanceManagerTester.cs
trunk/Source/StructureMap.Testing/Container/IntegratedTester.cs
trunk/Source/StructureMap.Testing/Container/Interceptors/InteceptorChainBuilderTester.cs
trunk/Source/StructureMap.Testing/Container/Interceptors/InterceptorLibraryTester.cs
trunk/Source/StructureMap.Testing/Container/Interceptors/MockTypeInterceptor.cs
trunk/Source/StructureMap.Testing/Container/Interceptors/SingletonInterceptorTester.cs
trunk/Source/StructureMap.Testing/Container/Interceptors/ThreadLocalStorageInterceptorTester.cs
trunk/Source/StructureMap.Testing/Container/Interceptors/TypeInterceptionTester.cs
trunk/Source/StructureMap.Testing/Container/MockingTester.cs
trunk/Source/StructureMap.Testing/Container/PluginGraphBuilderTester.cs
trunk/Source/StructureMap.Testing/Container/SetterInjectionEmittingTester.cs
trunk/Source/StructureMap.Testing/Container/Source/DirectoryXmlMementoSourceTester.cs
trunk/Source/StructureMap.Testing/Container/Source/EmbeddedFolderXmlMementoSourceTester.cs
trunk/Source/StructureMap.Testing/Container/Source/SingleEmbeddedXmlMementoSourceTester.cs
trunk/Source/StructureMap.Testing/Container/Source/TemplatingTester.cs
trunk/Source/StructureMap.Testing/Container/Source/XmlAttributeInstanceMementoTester.cs
trunk/Source/StructureMap.Testing/Container/Source/XmlInstanceMementoTester.cs
trunk/Source/StructureMap.Testing/Container/Source/XmlMementoSourceTester.cs
trunk/Source/StructureMap.Testing/Container/Source/XmlTemplaterTester.cs
trunk/Source/StructureMap.Testing/Container/TypeFindingTester.cs
trunk/Source/StructureMap.Testing/DataAccess/CommandFactoryTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Commands/ParameterizedQueryFilterTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Commands/StoredProcedureCommandTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Commands/TemplatedQueryFilterTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Commands/TemplatedQueryTester.cs
trunk/Source/StructureMap.Testing/DataAccess/DataSessionTester.cs
trunk/Source/StructureMap.Testing/DataAccess/DataSetMapping/ReaderToColumnMapTester.cs
trunk/Source/StructureMap.Testing/DataAccess/DataSetMapping/ReaderToTableMapperTester.cs
trunk/Source/StructureMap.Testing/DataAccess/DataSetMapping/YesNoReaderToColumnMapTester.cs
trunk/Source/StructureMap.Testing/DataAccess/ExecutionStates/AutoCommitExecutionStateTester.cs
trunk/Source/StructureMap.Testing/DataAccess/ExecutionStates/TransactionalExecutionStateTester.cs
trunk/Source/StructureMap.Testing/DataAccess/JSON/FieldTester.cs
trunk/Source/StructureMap.Testing/DataAccess/JSON/PropertyTester.cs
trunk/Source/StructureMap.Testing/DataAccess/MSSQL/MSSQLDatabaseEngineTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Parameterization/ParameterTemplateTester.cs
trunk/Source/StructureMap.Testing/DataAccess/StubbedCommand.cs
trunk/Source/StructureMap.Testing/DataAccess/StubbedReaderSource.cs
trunk/Source/StructureMap.Testing/DataAccess/TemplatedCommandTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Tools/Mocks/CommandExpectationTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Tools/Mocks/MockCommandTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Tools/Mocks/MockReaderSourceTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Tools/Mocks/ParameterListTester.cs
trunk/Source/StructureMap.Testing/DataAccess/Tools/TableDataReaderTester.cs
trunk/Source/StructureMap.Testing/GenericsAcceptanceTester.cs
trunk/Source/StructureMap.Testing/GenericsIntegrationTester.cs
trunk/Source/StructureMap.Testing/Graph/AssemblyGraphTester.cs
trunk/Source/StructureMap.Testing/Graph/GenericsPluginGraphTester.cs
trunk/Source/StructureMap.Testing/Graph/InstanceTarget.cs
trunk/Source/StructureMap.Testing/Graph/InterceptionChainTester.cs
trunk/Source/StructureMap.Testing/Graph/OverrideGraphTester.cs
trunk/Source/StructureMap.Testing/Graph/OverrideTester.cs
trunk/Source/StructureMap.Testing/Graph/PluginFamilyTester.cs
trunk/Source/StructureMap.Testing/Graph/PluginGraphTester.cs
trunk/Source/StructureMap.Testing/Graph/PluginTester.cs
trunk/Source/StructureMap.Testing/Graph/SetterInjectionTester.cs
trunk/Source/StructureMap.Testing/Graph/TypePathTester.cs
trunk/Source/StructureMap.Testing/ImplicitPluginFromPluggedTypeAttributeTester.cs
trunk/Source/StructureMap.Testing/InstanceMementoTester.cs
trunk/Source/StructureMap.Testing/ObjectFactoryTester.cs
trunk/Source/StructureMap.Testing/ObjectMother.cs
trunk/Source/StructureMap.Testing/StructureMapConfigCreator.cs
trunk/Source/StructureMap.Testing/StructureMapConfigurationTester.cs
trunk/Source/StructureMap.Testing.DeploymentTasks/DeploymentExecutorTester.cs
trunk/Source/StructureMap.Testing.DeploymentTasks/DeploymentTaskAcceptanceTests.cs
trunk/Source/StructureMap.Testing.DeploymentTasks/DeploymentTester.cs
trunk/Source/StructureMap.Testing.DeploymentTasks/SetOverrideTaskTester.cs
trunk/Source/StructureMap.Testing.DeploymentTasks/SubstitutionTaskTester.cs
trunk/Source/StructureMap.Testing.DeploymentTasks/Versioning/DeployedFileTester.cs
trunk/Source/StructureMap.Testing.DeploymentTasks/Versioning/DotNetAssemblyTester.cs
trunk/Source/StructureMap.Testing.GenericWidgets/Properties/AssemblyInfo.cs
trunk/Source/StructureMap.Testing.GenericWidgets/Widgets.cs
trunk/Source/StructureMap.Testing.Widget/AssemblyInfo.cs
trunk/Source/StructureMap.Testing.Widget/Columns.cs
trunk/Source/StructureMap.Testing.Widget/Hierarchy.cs
trunk/Source/StructureMap.Testing.Widget/IWidget.cs
trunk/Source/StructureMap.Testing.Widget/Rule.cs
trunk/Source/StructureMap.Testing.Widget2/AssemblyInfo.cs
trunk/Source/StructureMap.Testing.Widget2/EnumerationCheck.cs
trunk/Source/StructureMap.Testing.Widget3/AssemblyInfo.cs
trunk/Source/StructureMap.Testing.Widget3/Gateways.cs
trunk/Source/StructureMap.Testing.Widget4/AssemblyInfo.cs
trunk/Source/StructureMap.Testing.Widget4/Strategy.cs
trunk/Source/StructureMap.Testing.Widget5/AssemblyInfo.cs
trunk/Source/StructureMap.Testing.Widget5/BasicGridColumn.cs
trunk/Source/StructureMap.Testing.Widget5/CannotBeAutoFilledGridColumn.cs
trunk/Source/StructureMap.Testing.Widget5/LinkGridColumn.cs
trunk/Source/StructureMap.Testing.Widget5/OtherGridColumn.cs
trunk/Source/StructureMapExplorer/AssemblyInfo.cs
Modified: trunk/Source/StructureMap/AssemblyInfo.cs
===================================================================
--- trunk/Source/StructureMap/AssemblyInfo.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/AssemblyInfo.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -1,8 +1,10 @@
using System.Reflection;
+
//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
+
[assembly : AssemblyTitle("StructureMap")]
[assembly : AssemblyDescription("Main Library")]
\ No newline at end of file
Modified: trunk/Source/StructureMap/Attributes/PluginFamilyAttribute.cs
===================================================================
--- trunk/Source/StructureMap/Attributes/PluginFamilyAttribute.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Attributes/PluginFamilyAttribute.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -12,8 +12,8 @@
public class PluginFamilyAttribute : Attribute
{
private string _default = string.Empty;
+ private InstanceScope _scope = InstanceScope.PerRequest;
private Type _source = null;
- private InstanceScope _scope = InstanceScope.PerRequest;
public PluginFamilyAttribute()
{
Modified: trunk/Source/StructureMap/Caching/CacheItem.cs
===================================================================
--- trunk/Source/StructureMap/Caching/CacheItem.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/CacheItem.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -5,12 +5,12 @@
{
public abstract class CacheItem : ICacheItem
{
+ private int _accesses;
+ private DateTime _created;
+ private bool _isEmpty = false;
private object _key;
private DateTime _lastAccessed;
- private DateTime _created;
- private int _accesses;
private ReaderWriterLock rwl;
- private bool _isEmpty = false;
public CacheItem(object Key)
{
@@ -20,6 +20,13 @@
reset();
}
+ public bool IsEmpty
+ {
+ get { return _isEmpty; }
+ }
+
+ #region ICacheItem Members
+
public object Key
{
get { return _key; }
@@ -40,23 +47,6 @@
get { return _accesses; }
}
-
- private void reset()
- {
- _accesses = 0;
- _lastAccessed = _created = DateTime.Now;
- }
-
- private void markAccess()
- {
- lock (this)
- {
- _accesses++;
- _lastAccessed = DateTime.Now;
- }
- }
-
-
public object Value
{
get
@@ -77,12 +67,24 @@
}
}
- public bool IsEmpty
+ #endregion
+
+ private void reset()
{
- get { return _isEmpty; }
+ _accesses = 0;
+ _lastAccessed = _created = DateTime.Now;
}
+ private void markAccess()
+ {
+ lock (this)
+ {
+ _accesses++;
+ _lastAccessed = DateTime.Now;
+ }
+ }
+
protected abstract object getValue();
protected abstract void setValue(object Value);
}
Modified: trunk/Source/StructureMap/Caching/CacheManager.cs
===================================================================
--- trunk/Source/StructureMap/Caching/CacheManager.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/CacheManager.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -17,11 +17,11 @@
#endregion
+ private EventDispatcher _clearAllDispatcher;
+ private bool _continuePolling = true;
private HybridDictionary _dispatchers;
- private bool _continuePolling = true;
private bool _isPolling = false;
private int _PollingTimeInMinutes;
- private EventDispatcher _clearAllDispatcher;
private EventDispatcher _pruneAllDispatcher;
@@ -91,8 +91,27 @@
_clearAllDispatcher.Dispatch();
}
+ public void DispatchEvent(string EventName)
+ {
+ if (_dispatchers.Contains(EventName))
+ {
+ EventDispatcher _dispatcher = (EventDispatcher) _dispatchers[EventName];
+ _dispatcher.Dispatch();
+ }
+ }
+
#region polling
+ public bool IsPolling
+ {
+ get { return _isPolling; }
+ }
+
+ public int PollingTimeInMinutes
+ {
+ get { return _PollingTimeInMinutes; }
+ }
+
public void StartPolling()
{
if (!IsPolling)
@@ -108,17 +127,7 @@
_continuePolling = false;
}
- public bool IsPolling
- {
- get { return _isPolling; }
- }
- public int PollingTimeInMinutes
- {
- get { return _PollingTimeInMinutes; }
- }
-
-
private void poll()
{
while (_continuePolling)
@@ -135,14 +144,5 @@
}
#endregion
-
- public void DispatchEvent(string EventName)
- {
- if (_dispatchers.Contains(EventName))
- {
- EventDispatcher _dispatcher = (EventDispatcher) _dispatchers[EventName];
- _dispatcher.Dispatch();
- }
- }
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Caching/CloneStorageStrategy.cs
===================================================================
--- trunk/Source/StructureMap/Caching/CloneStorageStrategy.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/CloneStorageStrategy.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -2,9 +2,13 @@
{
public class CloneStorageStrategy : IStorageStrategy
{
+ #region IStorageStrategy Members
+
public ICacheItem BuildCacheItem(object Key)
{
return new CloneCacheItem(Key);
}
+
+ #endregion
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Caching/Expirations/AbsoluteTimeExpirationPolicy.cs
===================================================================
--- trunk/Source/StructureMap/Caching/Expirations/AbsoluteTimeExpirationPolicy.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/Expirations/AbsoluteTimeExpirationPolicy.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -5,8 +5,8 @@
[Pluggable("AbsoluteTime")]
public class AbsoluteTimeExpirationPolicy : IExpirationPolicy
{
+ private DateTime _currentTime;
private long _ticks;
- private DateTime _currentTime;
public AbsoluteTimeExpirationPolicy(int minutes)
{
Modified: trunk/Source/StructureMap/Caching/Expirations/SlidingTimeExpirationPolicy.cs
===================================================================
--- trunk/Source/StructureMap/Caching/Expirations/SlidingTimeExpirationPolicy.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/Expirations/SlidingTimeExpirationPolicy.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -5,8 +5,8 @@
[Pluggable("SlidingTime")]
public class SlidingTimeExpirationPolicy : IExpirationPolicy
{
+ private DateTime _currentTime;
private long _ticks;
- private DateTime _currentTime;
public SlidingTimeExpirationPolicy(int minutes)
{
Modified: trunk/Source/StructureMap/Caching/FileModificationWatcher.cs
===================================================================
--- trunk/Source/StructureMap/Caching/FileModificationWatcher.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/FileModificationWatcher.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -4,9 +4,9 @@
{
public class FileModificationWatcher : ClearEventDispatcher
{
+ private string _fullPath;
private string _key;
private FileSystemWatcher _watcher;
- private string _fullPath;
public FileModificationWatcher(string FilePath)
: base(SubjectNameFromFilePath(FilePath))
Modified: trunk/Source/StructureMap/Caching/LazyCache.cs
===================================================================
--- trunk/Source/StructureMap/Caching/LazyCache.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/LazyCache.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -6,12 +6,12 @@
{
public class LazyCache : IManagedCache
{
+ private IExpirationPolicy[] _expirations;
+ private HybridDictionary _items;
private string _name;
- private IExpirationPolicy[] _expirations;
+ private bool _refillOnExpiration;
private IValueSource _source;
private IStorageStrategy _storage;
- private HybridDictionary _items;
- private bool _refillOnExpiration;
public LazyCache(string CacheName, IExpirationPolicy[] Expirations, IValueSource Source,
@@ -27,6 +27,52 @@
CacheManager.CurrentManager.ManageCache(this);
}
+ [IndexerName("Value")]
+ public object this[object key]
+ {
+ get
+ {
+ if (!_items.Contains(key))
+ {
+ lock (_items.SyncRoot)
+ {
+ if (!_items.Contains(key))
+ {
+ ICacheItem newItem = _storage.BuildCacheItem(key);
+ newItem.Value = _source.GetValue(key);
+ _items.Add(key, newItem);
+ }
+ }
+ }
+
+ ICacheItem item = (ICacheItem) _items[key];
+ return item.Value;
+ }
+ set
+ {
+ ICacheItem item = null;
+
+ if (!_items.Contains(key))
+ {
+ lock (_items.SyncRoot)
+ {
+ if (!_items.Contains(key))
+ {
+ item = _storage.BuildCacheItem(key);
+ _items.Add(key, item);
+ }
+ }
+ }
+
+ if (item == null)
+ {
+ item = (ICacheItem) _items[key];
+ }
+
+ item.Value = value;
+ }
+ }
+
#region IManagedCache Members
public string CacheName
@@ -61,6 +107,13 @@
}
}
+ public void AddWatches(CacheManager Manager)
+ {
+ // TODO: Add LazyCache.AddWatches implementation
+ }
+
+ #endregion
+
private void expire(ICacheItem item)
{
if (_refillOnExpiration)
@@ -73,59 +126,6 @@
}
}
- public void AddWatches(CacheManager Manager)
- {
- // TODO: Add LazyCache.AddWatches implementation
- }
-
- #endregion
-
// TODO -- optimize this. Go to record level locking
-
- [IndexerName("Value")]
- public object this[object key]
- {
- get
- {
- if (!_items.Contains(key))
- {
- lock (_items.SyncRoot)
- {
- if (!_items.Contains(key))
- {
- ICacheItem newItem = _storage.BuildCacheItem(key);
- newItem.Value = _source.GetValue(key);
- _items.Add(key, newItem);
- }
- }
- }
-
- ICacheItem item = (ICacheItem) _items[key];
- return item.Value;
- }
- set
- {
- ICacheItem item = null;
-
- if (!_items.Contains(key))
- {
- lock (_items.SyncRoot)
- {
- if (!_items.Contains(key))
- {
- item = _storage.BuildCacheItem(key);
- _items.Add(key, item);
- }
- }
- }
-
- if (item == null)
- {
- item = (ICacheItem) _items[key];
- }
-
- item.Value = value;
- }
- }
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Caching/SerializationStorageStrategy.cs
===================================================================
--- trunk/Source/StructureMap/Caching/SerializationStorageStrategy.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/SerializationStorageStrategy.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -2,9 +2,13 @@
{
public class SerializationStorageStrategy : IStorageStrategy
{
+ #region IStorageStrategy Members
+
public ICacheItem BuildCacheItem(object Key)
{
return new SerializationCacheItem(Key);
}
+
+ #endregion
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Caching/SharedStorageStrategy.cs
===================================================================
--- trunk/Source/StructureMap/Caching/SharedStorageStrategy.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Caching/SharedStorageStrategy.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -2,9 +2,13 @@
{
public class SharedStorageStrategy : IStorageStrategy
{
+ #region IStorageStrategy Members
+
public ICacheItem BuildCacheItem(object Key)
{
return new SharedCacheItem(Key);
}
+
+ #endregion
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -2,46 +2,52 @@
{
public class ConfigurationConstants
{
- private ConfigurationConstants()
- {
- }
+ public const string CONFIGURED_DEFAULT_KEY_CANNOT_BE_FOUND =
+ "The default instance key configured for this PluginFamily cannot be found";
+ public const string COULD_NOT_CREATE_INSTANCE = "Cannot create the configured InstanceMemento";
+ public const string COULD_NOT_CREATE_MEMENTO_SOURCE = "Could not create the externally configured MementoSource";
+
public const string COULD_NOT_LOAD_ASSEMBLY = "Could not load Assembly into target AppDomain";
public const string COULD_NOT_LOAD_TYPE = "Could not load Type into target AppDomain";
- public const string PLUGIN_IS_MISSING_CONCRETE_KEY = "Plugin definition is missing a value for ConcreteKey";
- public const string INVALID_SETTER = "Requested Setter property does not exist";
- public const string MEMENTO_PROPERTY_IS_MISSING = "Property is missing from the InstanceMemento configuration";
+
+ public const string FATAL_ERROR =
+ "A fatal error in configuration is preventing StructureMap from functioning correctly";
+
public const string INVALID_ENUMERATION_VALUE = "Property value is not a valid name for this Enumeration type";
+ public const string INVALID_PLUGIN = "Requested ConcreteKey for this PluginType cannot be found";
+ public const string INVALID_PLUGIN_FAMILY = "The PluginFamily is not configured in StructureMap";
+
public const string INVALID_PROPERTY_CAST =
"Property value in the configured InstanceMemento could not be casted to the target type";
- public const string INVALID_PLUGIN = "Requested ConcreteKey for this PluginType cannot be found";
- public const string MISSING_INSTANCE_KEY = "InstanceKey is required";
- public const string MISSING_CHILD = "Child memento is not defined";
- public const string INVALID_PLUGIN_FAMILY = "The PluginFamily is not configured in StructureMap";
- public const string VALIDATION_METHOD_FAILURE = "A Validation Method Failed";
- public const string COULD_NOT_CREATE_INSTANCE = "Cannot create the configured InstanceMemento";
- public const string NO_DEFAULT_INSTANCE_CONFIGURED = "No default instance is configured for this PluginFamily";
- public const string NO_MATCHING_INSTANCE_CONFIGURED = "No matching instance is configured for this PluginFamily";
- public const string COULD_NOT_CREATE_MEMENTO_SOURCE = "Could not create the externally configured MementoSource";
+ public const string INVALID_SETTER = "Requested Setter property does not exist";
+ public const string MEMENTO_PROPERTY_IS_MISSING = "Property is missing from the InstanceMemento configuration";
public const string MEMENTO_SOURCE_CANNOT_RETRIEVE =
"The configured MementoSource cannot retrieve InstanceMemento objects";
- public const string CONFIGURED_DEFAULT_KEY_CANNOT_BE_FOUND =
- "The default instance key configured for this PluginFamily cannot be found";
+ public const string MISSING_CHILD = "Child memento is not defined";
+ public const string MISSING_INSTANCE_KEY = "InstanceKey is required";
+ public const string MISSING_TEMPLATE_VALUE = "A required value for a Templated InstanceMemento is missing";
- public const string PLUGIN_FAMILY_CANNOT_BE_FOUND_FOR_INSTANCE =
- "No matching PluginFamily for the embedded memento in the <Instances> node";
+ public const string NO_DEFAULT_INSTANCE_CONFIGURED = "No default instance is configured for this PluginFamily";
+ public const string NO_MATCHING_INSTANCE_CONFIGURED = "No matching instance is configured for this PluginFamily";
public const string PLUGIN_CANNOT_READ_CONSTRUCTOR_PROPERTIES =
"There was an error trying to determine the constructor arguments for a Plugin. Check for missing dependencies of the concrete type.";
- public const string FATAL_ERROR =
- "A fatal error in configuration is preventing StructureMap from functioning correctly";
+ public const string PLUGIN_FAMILY_CANNOT_BE_FOUND_FOR_INSTANCE =
+ "No matching PluginFamily for the embedded memento in the <Instances> node";
- public const string MISSING_TEMPLATE_VALUE = "A required value for a Templated InstanceMemento is missing";
+ public const string PLUGIN_IS_MISSING_CONCRETE_KEY = "Plugin definition is missing a value for ConcreteKey";
+
public const string UNKNOWN_PLUGIN_PROBLEM = "Exception occured while attaching a Plugin to a PluginFamily";
+ public const string VALIDATION_METHOD_FAILURE = "A Validation Method Failed";
+
+ private ConfigurationConstants()
+ {
+ }
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/ConfigurationParser.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationParser.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/ConfigurationParser.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -94,8 +94,8 @@
#endregion
+ private readonly XmlMementoCreator _mementoCreator;
private readonly XmlNode _structureMapNode;
- private readonly XmlMementoCreator _mementoCreator;
public ConfigurationParser(XmlNode structureMapNode)
{
Modified: trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -9,10 +9,16 @@
public class ConfigurationParserCollection
{
+ private List<FetchNodeDelegate> _fetchers = new List<FetchNodeDelegate>();
+ private List<string> _otherFiles = new List<string>();
private bool _useDefaultFile = true;
- private List<string> _otherFiles = new List<string>();
- private List<FetchNodeDelegate> _fetchers = new List<FetchNodeDelegate>();
+ public bool UseDefaultFile
+ {
+ get { return _useDefaultFile; }
+ set { _useDefaultFile = value; }
+ }
+
public ConfigurationParser[] GetParsers()
{
List<ConfigurationParser> list = new List<ConfigurationParser>();
@@ -58,12 +64,6 @@
list.AddRange(parsers);
}
- public bool UseDefaultFile
- {
- get { return _useDefaultFile; }
- set { _useDefaultFile = value; }
- }
-
public void IncludeFile(string filename)
{
_otherFiles.Add(filename);
Modified: trunk/Source/StructureMap/Configuration/DSL/ExpressionValidator.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/ExpressionValidator.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/DSL/ExpressionValidator.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -10,6 +10,7 @@
return new ValidateExpression(pluggedType);
}
+ #region Nested type: ValidateExpression
public class ValidateExpression
{
@@ -31,5 +32,7 @@
}
}
}
+
+ #endregion
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/ChildArrayExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/ChildArrayExpression.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/ChildArrayExpression.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -6,8 +6,8 @@
{
public class ChildArrayExpression<PLUGINTYPE> : IExpression
{
+ private readonly MemoryInstanceMemento _memento;
private readonly InstanceExpression _parent;
- private readonly MemoryInstanceMemento _memento;
private readonly string _propertyName;
private IMementoBuilder[] _builders;
private Type _pluginType = typeof (PLUGINTYPE);
@@ -21,6 +21,8 @@
_pluginType = typeof (PLUGINTYPE).GetElementType();
}
+ #region IExpression Members
+
void IExpression.Configure(PluginGraph graph)
{
PluginFamily family = graph.LocateOrCreateFamilyForType(_pluginType);
@@ -34,6 +36,8 @@
_memento.AddChildArray(_propertyName, childMementos);
}
+ #endregion
+
private InstanceMemento processMementoBuilder(IMementoBuilder builder, PluginFamily family, PluginGraph graph)
{
builder.ValidatePluggability(_pluginType);
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/ChildInstanceExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/ChildInstanceExpression.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/ChildInstanceExpression.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -14,9 +14,9 @@
private readonly InstanceExpression _instance;
private readonly MemoryInstanceMemento _memento;
private readonly string _propertyName;
+ private IMementoBuilder _builder;
+ private List<IExpression> _children = new List<IExpression>();
private Type _childType;
- private List<IExpression> _children = new List<IExpression>();
- private IMementoBuilder _builder;
public ChildInstanceExpression(InstanceExpression instance, MemoryInstanceMemento memento, string propertyName)
@@ -33,6 +33,35 @@
_childType = childType;
}
+ internal Type ChildType
+ {
+ set { _childType = value; }
+ }
+
+ #region IExpression Members
+
+ void IExpression.Configure(PluginGraph graph)
+ {
+ if (_childType == null)
+ {
+ return;
+ }
+
+ PluginFamily family = graph.LocateOrCreateFamilyForType(_childType);
+ if (_builder != null)
+ {
+ InstanceMemento childMemento = _builder.BuildMemento(family);
+ _memento.AddChild(_propertyName, childMemento);
+ }
+
+ foreach (IExpression child in _children)
+ {
+ child.Configure(graph);
+ }
+ }
+
+ #endregion
+
/// <summary>
/// Use a previously configured and named instance for the child
/// </summary>
@@ -67,31 +96,6 @@
}
- void IExpression.Configure(PluginGraph graph)
- {
- if (_childType == null)
- {
- return;
- }
-
- PluginFamily family = graph.LocateOrCreateFamilyForType(_childType);
- if (_builder != null)
- {
- InstanceMemento childMemento = _builder.BuildMemento(family);
- _memento.AddChild(_propertyName, childMemento);
- }
-
- foreach (IExpression child in _children)
- {
- child.Configure(graph);
- }
- }
-
- internal Type ChildType
- {
- set { _childType = value; }
- }
-
/// <summary>
/// Registers a configured instance to use as the argument to the parent's
/// constructor
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using StructureMap.Attributes;
-using StructureMap.Configuration.Mementos;
using StructureMap.Graph;
using StructureMap.Interceptors;
@@ -171,7 +170,7 @@
public CreatePluginFamilyExpression<PLUGINTYPE> InterceptConstructionWith(InstanceFactoryInterceptor interceptor)
{
- _alterations.Add(delegate(PluginFamily family){family.InterceptionChain.AddInterceptor(interceptor);});
+ _alterations.Add(delegate(PluginFamily family) { family.InterceptionChain.AddInterceptor(interceptor); });
return this;
}
}
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceDefaultExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceDefaultExpression.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceDefaultExpression.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -1,5 +1,4 @@
using System;
-using StructureMap.Configuration.DSL.Expressions;
using StructureMap.Graph;
namespace StructureMap.Configuration.DSL.Expressions
@@ -9,8 +8,8 @@
/// </summary>
public class InstanceDefaultExpression
{
- private readonly Type _pluginType;
private readonly ProfileExpression _parent;
+ private readonly Type _pluginType;
private string _instanceKey = string.Empty;
private IMementoBuilder _mementoBuilder;
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceExpression.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceExpression.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -1,5 +1,4 @@
using System;
-using StructureMap.Configuration.DSL.Expressions;
using StructureMap.Configuration.Mementos;
using StructureMap.Graph;
@@ -10,8 +9,8 @@
/// </summary>
public class InstanceExpression : MementoBuilder<InstanceExpression>
{
+ private MemoryInstanceMemento _memento;
private Type _pluggedType;
- private MemoryInstanceMemento _memento;
public InstanceExpression(Type pluginType) : base(pluginType)
{
@@ -23,12 +22,7 @@
get { return _pluggedType; }
}
- protected override void buildMemento()
- {
- _memento = new MemoryInstanceMemento();
- }
-
protected override InstanceMemento memento
{
get { return _memento; }
@@ -39,6 +33,11 @@
get { return this; }
}
+ protected override void buildMemento()
+ {
+ _memento = new MemoryInstanceMemento();
+ }
+
protected override void configureMemento(PluginFamily family)
{
Plugin plugin = _pluggedType == null
@@ -128,6 +127,35 @@
return new InstanceTypeExpression(this);
}
+ public ChildArrayExpression<PLUGINTYPE> ChildArray<PLUGINTYPE>()
+ {
+ validateTypeIsArray<PLUGINTYPE>();
+
+ string propertyName = findPropertyName<PLUGINTYPE>();
+ return ChildArray<PLUGINTYPE>(propertyName);
+ }
+
+ public ChildArrayExpression<PLUGINTYPE> ChildArray<PLUGINTYPE>(string propertyName)
+ {
+ validateTypeIsArray<PLUGINTYPE>();
+
+ ChildArrayExpression<PLUGINTYPE> expression =
+ new ChildArrayExpression<PLUGINTYPE>(this, _memento, propertyName);
+ addChildExpression(expression);
+
+ return expression;
+ }
+
+ private static void validateTypeIsArray<PLUGINTYPE>()
+ {
+ if (!typeof (PLUGINTYPE).IsArray)
+ {
+ throw new StructureMapException(307);
+ }
+ }
+
+ #region Nested type: InstanceTypeExpression
+
/// <summary>
/// Helper class to capture the actual concrete type of an Instance
/// </summary>
@@ -163,31 +191,6 @@
}
}
- public ChildArrayExpression<PLUGINTYPE> ChildArray<PLUGINTYPE>()
- {
- validateTypeIsArray<PLUGINTYPE>();
-
- string propertyName = findPropertyName<PLUGINTYPE>();
- return ChildArray<PLUGINTYPE>(propertyName);
- }
-
- public ChildArrayExpression<PLUGINTYPE> ChildArray<PLUGINTYPE>(string propertyName)
- {
- validateTypeIsArray<PLUGINTYPE>();
-
- ChildArrayExpression<PLUGINTYPE> expression =
- new ChildArrayExpression<PLUGINTYPE>(this, _memento, propertyName);
- addChildExpression(expression);
-
- return expression;
- }
-
- private static void validateTypeIsArray<PLUGINTYPE>()
- {
- if (!typeof (PLUGINTYPE).IsArray)
- {
- throw new StructureMapException(307);
- }
- }
+ #endregion
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/MementoBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/MementoBuilder.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/MementoBuilder.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using StructureMap.Configuration.DSL.Expressions;
using StructureMap.Graph;
using StructureMap.Interceptors;
@@ -19,6 +18,23 @@
memento.InstanceKey = Guid.NewGuid().ToString();
}
+ protected abstract InstanceMemento memento { get; }
+
+ protected abstract T thisInstance { get; }
+
+ public string InstanceKey
+ {
+ get { return memento.InstanceKey; }
+ set { memento.InstanceKey = value; }
+ }
+
+ internal Type PluginType
+ {
+ get { return _pluginType; }
+ }
+
+ #region IExpression Members
+
void IExpression.Configure(PluginGraph graph)
{
validate();
@@ -38,10 +54,30 @@
}
}
- protected abstract InstanceMemento memento { get; }
+ #endregion
- protected abstract T thisInstance { get; }
+ #region IMementoBuilder Members
+ InstanceMemento IMementoBuilder.BuildMemento(PluginFamily family)
+ {
+ return buildMementoFromFamily(family);
+ }
+
+ InstanceMemento IMementoBuilder.BuildMemento(PluginGraph graph)
+ {
+ PluginFamily family = graph.LocateOrCreateFamilyForType(_pluginType);
+ return buildMementoFromFamily(family);
+ }
+
+ public void SetInstanceName(string instanceKey)
+ {
+ _instanceKey = instanceKey;
+ }
+
+ public abstract void ValidatePluggability(Type pluginType);
+
+ #endregion
+
protected abstract void configureMemento(PluginFamily family);
protected abstract void validate();
@@ -68,24 +104,8 @@
return thisInstance;
}
- public string InstanceKey
- {
- get { return memento.InstanceKey; }
- set { memento.InstanceKey = value; }
- }
-
- internal Type PluginType
- {
- get { return _pluginType; }
- }
-
protected abstract void buildMemento();
- InstanceMemento IMementoBuilder.BuildMemento(PluginFamily family)
- {
- return buildMementoFromFamily(family);
- }
-
private InstanceMemento buildMementoFromFamily(PluginFamily family)
{
validate();
@@ -94,19 +114,6 @@
}
- InstanceMemento IMementoBuilder.BuildMemento(PluginGraph graph)
- {
- PluginFamily family = graph.LocateOrCreateFamilyForType(_pluginType);
- return buildMementoFromFamily(family);
- }
-
- public void SetInstanceName(string instanceKey)
- {
- _instanceKey = instanceKey;
- }
-
- public abstract void ValidatePluggability(Type pluginType);
-
protected void addChildExpression(IExpression expression)
{
_children.Add(expression);
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/ProfileExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/ProfileExpression.cs 2008-01-15 15:15:50 UTC (rev 56)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/ProfileExpression.cs 2008-01-15 15:56:14 UTC (rev 57)
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using StructureMap.Configuration.DSL.Expressions;
using StructureMap.Graph;
namespace StructureMap.Configuration.DSL.Expressions
@@ -9,14 +8,16 @@
/// </summary>
public class ProfileExpression : IExpression
{
+ private readonly List<InstanceDefaultExpression> _defaults = new List<Instanc...
[truncated message content] |
