User: xtoff
Date: 2010/01/20 10:16 AM
Modified:
/InversionOfControl/trunk/src/Castle.MicroKernel/Registration/
Component.cs
/InversionOfControl/trunk/src/Castle.Windsor/Configuration/Interpreters/
XmlInterpreter.cs
Log:
- minor formatting changes.
File Changes:
Directory:
/InversionOfControl/trunk/src/Castle.Windsor/Configuration/Interpreters/
===================================================================================
File [modified]: XmlInterpreter.cs
Delta lines: +0 -0
===================================================================
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Registration/
=========================================================================
File [modified]: Component.cs
Delta lines: +16 -17
===================================================================
---
InversionOfControl/trunk/src/Castle.Windsor/Configuration/Interpreters/XmlInterpreter.cs
2010-01-20 17:15:55 UTC (rev 6703)
+++
InversionOfControl/trunk/src/Castle.Windsor/Configuration/Interpreters/XmlInterpreter.cs
2010-01-20 17:16:23 UTC (rev 6704)
@@ -45,8 +45,6 @@
/// </summary>
public class XmlInterpreter : AbstractInterpreter
{
- private IKernel kernel;
-
#region Constructors
/// <summary>
@@ -78,18 +76,20 @@
/// Gets or sets the kernel.
/// </summary>
/// <value>The kernel.</value>
- public IKernel Kernel
- {
- get { return kernel ; }
- set { kernel = value; }
- }
+ public IKernel Kernel { get; set; }
public override void ProcessResource(IResource source,
IConfigurationStore store)
{
- XmlProcessor.XmlProcessor processor = (kernel == null) ?
- new XmlProcessor.XmlProcessor(EnvironmentName) :
- new XmlProcessor.XmlProcessor(EnvironmentName,
-
kernel.GetSubSystem(SubSystemConstants.ResourceKey) as IResourceSubSystem);
+ XmlProcessor.XmlProcessor processor;
+ if (Kernel == null)
+ {
+ processor = new
XmlProcessor.XmlProcessor(EnvironmentName);
+ }
+ else
+ {
+ var resourceSubSystem =
Kernel.GetSubSystem(SubSystemConstants.ResourceKey) as IResourceSubSystem;
+ processor = new
XmlProcessor.XmlProcessor(EnvironmentName, resourceSubSystem);
+ }
try
{
@@ -225,9 +225,8 @@
private static void DeserializeComponent(XmlNode node,
IConfigurationStore store)
{
- IConfiguration config =
XmlConfigurationDeserializer.GetDeserializedNode(node);
-
- string id = GetRequiredAttributeValue(config, "id");
+ var config =
XmlConfigurationDeserializer.GetDeserializedNode(node);
+ var id = GetRequiredAttributeValue(config, "id");
AddComponentConfig(id, config, store);
}
@@ -257,10 +256,10 @@
{
if (expectedName.Equals(node.Name))
return;
-
- String message = String.Format("Unexpected node under
'{0}': Expected '{1}' but found '{2}'",
-
expectedName, expectedName, node.Name);
+ String message = String.Format("Unexpected node under
'{0}': Expected '{1}' but found '{2}'", expectedName,
+ expectedName, node.Name);
+
throw new Exception(message);
}
--
You received this message because you are subscribed to the Google Groups
"Castle Project Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/castle-project-commits?hl=en.
