Author: rgrabowski
Date: Sun Jun 14 02:02:32 2009
New Revision: 784501
URL: http://svn.apache.org/viewvc?rev=784501&view=rev
Log:
Removed unused namespaces from xml element configuration handlers.
Refactored some lines of duplicate code into helper method.
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessAddElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessCaseElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDataSourceElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDatabaseElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDefaultElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDiscriminatorElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDynamicElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushIntervallElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushOnExecuteElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterMapElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessPropertyElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProviderElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProvidersElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultMapElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessSettingElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessStatementElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTextElement.cs
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTypeHandlerElement.cs
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessAddElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessAddElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessAddElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessAddElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessCaseElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessCaseElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessCaseElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessCaseElement.cs
Sun Jun 14 02:02:32 2009
@@ -43,8 +43,7 @@
element.Attributes[ConfigConstants.ATTRIBUTE_VALUE]);
config.CreateAttributes(element.Attributes);
- config.Attributes[ConfigConstants.ATTRIBUTE_RESULTMAP] =
-
ApplyNamespace(config.Attributes[ConfigConstants.ATTRIBUTE_RESULTMAP]);
+ AddAttribute(config, ConfigConstants.ATTRIBUTE_RESULTMAP,
true);
element.Parent.Configuration.Children.Add(config);
}
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDataSourceElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDataSourceElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDataSourceElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDataSourceElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
using Apache.Ibatis.Common.Data;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDatabaseElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDatabaseElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDatabaseElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDatabaseElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDefaultElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDefaultElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDefaultElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDefaultElement.cs
Sun Jun 14 02:02:32 2009
@@ -45,8 +45,7 @@
config.CreateAttributes(element.Attributes);
config.CreateAttribute(ConfigConstants.ATTRIBUTE_VALUE,
Discriminator.DEFAULT_KEY);
- config.Attributes[ConfigConstants.ATTRIBUTE_RESULTMAP] =
-
ApplyNamespace(config.Attributes[ConfigConstants.ATTRIBUTE_RESULTMAP]);
+ AddAttribute(config, ConfigConstants.ATTRIBUTE_RESULTMAP,
true);
element.Parent.Configuration.Children.Add(config);
}
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDiscriminatorElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDiscriminatorElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDiscriminatorElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDiscriminatorElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDynamicElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDynamicElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDynamicElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessDynamicElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushIntervallElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushIntervallElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushIntervallElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushIntervallElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushOnExecuteElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushOnExecuteElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushOnExecuteElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessFlushOnExecuteElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterMapElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterMapElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterMapElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessParameterMapElement.cs
Sun Jun 14 02:02:32 2009
@@ -54,11 +54,7 @@
config.CreateAttributes(element.Attributes);
config.CreateAttribute(ConfigConstants.ATTRIBUTE_NAMESPACE,
nameSpace);
- if
(config.Attributes.ContainsKey(ConfigConstants.ATTRIBUTE_EXTENDS))
- {
- config.Attributes[ConfigConstants.ATTRIBUTE_EXTENDS] =
-
ApplyNamespace(config.Attributes[ConfigConstants.ATTRIBUTE_EXTENDS]);
- }
+ AddAttribute(config, ConfigConstants.ATTRIBUTE_EXTENDS, true);
configurationStore.AddParameterMapConfiguration(config);
element.Configuration = config;
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessPropertyElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessPropertyElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessPropertyElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessPropertyElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,8 +23,6 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
using System.Xml;
using Apache.Ibatis.Common.Configuration;
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProviderElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProviderElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProviderElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProviderElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
using Apache.Ibatis.Common.Data;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProvidersElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProvidersElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProvidersElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessProvidersElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,11 +23,8 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
using System.Xml;
-using Apache.Ibatis.Common.Configuration;
using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultMapElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultMapElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultMapElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessResultMapElement.cs
Sun Jun 14 02:02:32 2009
@@ -43,11 +43,7 @@
config.CreateAttributes(element.Attributes);
config.CreateAttribute(ConfigConstants.ATTRIBUTE_NAMESPACE,
nameSpace);
- if
(config.Attributes.ContainsKey(ConfigConstants.ATTRIBUTE_EXTENDS))
- {
- config.Attributes[ConfigConstants.ATTRIBUTE_EXTENDS] =
-
ApplyNamespace(config.Attributes[ConfigConstants.ATTRIBUTE_EXTENDS]);
- }
+ AddAttribute(config, ConfigConstants.ATTRIBUTE_EXTENDS, true);
configurationStore.AddResultMapConfiguration(config);
element.Configuration = config;
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessSettingElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessSettingElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessSettingElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessSettingElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
@@ -42,12 +37,15 @@
/// <param name="configurationStore">The configuration store.</param>
private void ProcessSettingElement(Tag element, IConfigurationStore
configurationStore)
{
- string value = element.GetAttributeValue(0);
+ // <setting hello="world" />
+
+ string settingKey = element.GetAttributeName(0);
+ string settingValue = element.GetAttributeValue(0);
IConfiguration config = new MutableConfiguration(
element.Name,
- element.GetAttributeName(0),
- value);
+ settingKey,
+ settingValue);
configurationStore.AddSettingConfiguration(config);
}
}
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessStatementElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessStatementElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessStatementElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessStatementElement.cs
Sun Jun 14 02:02:32 2009
@@ -42,24 +42,23 @@
config.CreateAttributes(element.Attributes);
config.CreateAttribute(ConfigConstants.ATTRIBUTE_NAMESPACE,
nameSpace);
- if
(config.Attributes.ContainsKey(ConfigConstants.ATTRIBUTE_CACHEMODEL))
- {
- config.Attributes[ConfigConstants.ATTRIBUTE_CACHEMODEL] =
-
ApplyNamespace(config.Attributes[ConfigConstants.ATTRIBUTE_CACHEMODEL]);
- }
- if
(config.Attributes.ContainsKey(ConfigConstants.ELEMENT_PARAMETERMAP))
- {
- config.Attributes[ConfigConstants.ELEMENT_PARAMETERMAP] =
-
ApplyNamespace(config.Attributes[ConfigConstants.ELEMENT_PARAMETERMAP]);
- }
- if
(config.Attributes.ContainsKey(ConfigConstants.ELEMENT_RESULTMAP))
- {
- config.Attributes[ConfigConstants.ELEMENT_RESULTMAP] =
-
ApplyNamespace(config.Attributes[ConfigConstants.ELEMENT_RESULTMAP]);
- }
+ AddAttribute(config, ConfigConstants.ATTRIBUTE_CACHEMODEL, true);
+ AddAttribute(config, ConfigConstants.ELEMENT_PARAMETERMAP, true);
+ AddAttribute(config, ConfigConstants.ELEMENT_RESULTMAP, true);
+ AddAttribute(config, ConfigConstants.ELEMENT_CONDENSESQL, false);
configurationStore.AddStatementConfiguration(config);
element.Configuration = config;
}
+
+ private void AddAttribute(IConfiguration config, string
configConstant, bool applyNamespace)
+ {
+ if (config.Attributes.ContainsKey(configConstant))
+ {
+ config.Attributes[configConstant] = applyNamespace
+ ? ApplyNamespace(config.Attributes[configConstant])
+ : config.Attributes[configConstant];
+ }
+ }
}
}
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTextElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTextElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTextElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTextElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
@@ -48,7 +43,7 @@
MutableConfiguration config = new MutableConfiguration(
element.Name,
string.Empty,
- text);
+ element.Value); // text);
element.Parent.Configuration.Children.Add(config);
element.Configuration = config;
Modified:
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTypeHandlerElement.cs
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTypeHandlerElement.cs?rev=784501&r1=784500&r2=784501&view=diff
==============================================================================
---
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTypeHandlerElement.cs
(original)
+++
ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/ProcessTypeHandlerElement.cs
Sun Jun 14 02:02:32 2009
@@ -23,12 +23,7 @@
********************************************************************************/
#endregion
-using System;
-using System.Text;
-using System.Xml;
-
using Apache.Ibatis.Common.Configuration;
-using Apache.Ibatis.Common.Resources;
namespace
Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
{
