ibatis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gba...@apache.org
Subject svn commit: r705978 [1/2] - in /ibatis/trunk/cs/V3/src: ./ Apache.Ibatis.Common.Test/ Apache.Ibatis.Common/ Apache.Ibatis.Common/Utilities/Objects/ Apache.Ibatis.DataMapper.MySql.Test/ Apache.Ibatis.DataMapper.Odbc.Test/ Apache.Ibatis.DataMapper.OleDb....
Date Sun, 19 Oct 2008 11:25:14 GMT
Author: gbayon
Date: Sun Oct 19 04:25:12 2008
New Revision: 705978

URL: http://svn.apache.org/viewvc?rev=705978&view=rev
Log:
Cleaning code + use .NET V3 for target .NET framework

Added:
    ibatis/trunk/cs/V3/src/Apache.Ibatis.sln
Removed:
    ibatis/trunk/cs/V3/src/Apache.Ibatis.2005.sln
Modified:
    ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.Common.Test/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.Common.Test/Apache.Ibatis.Common.Test.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Apache.Ibatis.Common.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/Objects/ObjectProbe.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.MySql.Test/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.MySql.Test/Apache.Ibatis.DataMapper.MySql.Test.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.Odbc.Test/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.Odbc.Test/Apache.Ibatis.DataMapper.Odbc.Test.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OleDb.Test/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OleDb.Test/Apache.Ibatis.DataMapper.OleDb.Test.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleClient.Test/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleClient.Test/Apache.Ibatis.DataMapper.OracleClient.Test.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleODP.Test/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleODP.Test/Apache.Ibatis.DataMapper.OracleODP.Test.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.PostgreSQL.Test/   (props changed)
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.PostgreSQL.Test/Apache.Ibatis.DataMapper.PostgreSQL.Test.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Apache.Ibatis.DataMapper.SqlClient.Test.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Maps/Account.xml
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Apache.Ibatis.DataMapper.csproj
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/XmlTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Serializers/ParameterMapDeSerializer.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderDecorator.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderTransformer.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DbCommandDecorator.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DefaultPreparedCommand.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatement.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatementEventSupport.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/BaseCache.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Decorators/LoggingCache.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/ICache.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/FifoCache.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/LruCache.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/BaseStatementEventArgs.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostCreateEventArgs.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostPropertyEventArgs.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostStatementEventArgs.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PreCreateEventArgs.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PrePropertyEventArgs.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/InlineParemeterMapBuilder.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterMap.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterProperty.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterPropertyCollection.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/AutoResultMap.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/NullResultMap.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMap.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMapEventSupport.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultProperty.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultPropertyEventSupport.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/DynamicSql.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/BaseTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ConditionalTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/DynamicTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ISqlTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEqualTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNullTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsPropertyAvailableTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IterateContext.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IterateTagHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/SqlTagContext.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/SqlText.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/SimpleDynamic/SimpleDynamicSql.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Statements/PreparedStatementFactory.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/TypeHandlers/BaseTypeHandler.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/TypeHandlers/TypeHandlerFactory.cs
    ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/TypeHandlers/UnknownTypeHandler.cs

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common.Test/Apache.Ibatis.Common.Test.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common.Test/Apache.Ibatis.Common.Test.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common.Test/Apache.Ibatis.Common.Test.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common.Test/Apache.Ibatis.Common.Test.csproj Sun Oct 19 04:25:12 2008
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Apache.Ibatis.Common.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Apache.Ibatis.Common.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Apache.Ibatis.Common.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Apache.Ibatis.Common.csproj Sun Oct 19 04:25:12 2008
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/Objects/ObjectProbe.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/Objects/ObjectProbe.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/Objects/ObjectProbe.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/Objects/ObjectProbe.cs Sun Oct 19 04:25:12 2008
@@ -456,7 +456,7 @@
 			} 
 			catch (ProbeException pe) 
 			{
-				throw pe;
+				throw;
 			} 
 			catch(Exception e)
 			{
@@ -560,7 +560,7 @@
 			}
 			catch (ProbeException pe) 
 			{
-				throw pe;
+				throw;
 			} 
 			catch (Exception e) 
 			{

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.MySql.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.MySql.Test/Apache.Ibatis.DataMapper.MySql.Test.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.MySql.Test/Apache.Ibatis.DataMapper.MySql.Test.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.MySql.Test/Apache.Ibatis.DataMapper.MySql.Test.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.MySql.Test/Apache.Ibatis.DataMapper.MySql.Test.csproj Sun Oct 19 04:25:12 2008
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2F90BECE-AB2A-45A4-95DB-83025E8C1BD5}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.Odbc.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.Odbc.Test/Apache.Ibatis.DataMapper.Odbc.Test.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.Odbc.Test/Apache.Ibatis.DataMapper.Odbc.Test.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.Odbc.Test/Apache.Ibatis.DataMapper.Odbc.Test.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.Odbc.Test/Apache.Ibatis.DataMapper.Odbc.Test.csproj Sun Oct 19 04:25:12 2008
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{63B29CDE-E446-44F7-89FF-48C7D20A13D0}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OleDb.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OleDb.Test/Apache.Ibatis.DataMapper.OleDb.Test.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OleDb.Test/Apache.Ibatis.DataMapper.OleDb.Test.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OleDb.Test/Apache.Ibatis.DataMapper.OleDb.Test.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OleDb.Test/Apache.Ibatis.DataMapper.OleDb.Test.csproj Sun Oct 19 04:25:12 2008
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleClient.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleClient.Test/Apache.Ibatis.DataMapper.OracleClient.Test.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleClient.Test/Apache.Ibatis.DataMapper.OracleClient.Test.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleClient.Test/Apache.Ibatis.DataMapper.OracleClient.Test.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleClient.Test/Apache.Ibatis.DataMapper.OracleClient.Test.csproj Sun Oct 19 04:25:12 2008
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{72849281-1C73-4F05-96F5-05B0D859FFA6}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleODP.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleODP.Test/Apache.Ibatis.DataMapper.OracleODP.Test.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleODP.Test/Apache.Ibatis.DataMapper.OracleODP.Test.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleODP.Test/Apache.Ibatis.DataMapper.OracleODP.Test.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.OracleODP.Test/Apache.Ibatis.DataMapper.OracleODP.Test.csproj Sun Oct 19 04:25:12 2008
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{96F8E93D-2B4F-4223-8EFE-01731CCBC979}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Propchange: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.PostgreSQL.Test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 19 04:25:12 2008
@@ -0,0 +1,7 @@
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.PostgreSQL.Test/Apache.Ibatis.DataMapper.PostgreSQL.Test.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.PostgreSQL.Test/Apache.Ibatis.DataMapper.PostgreSQL.Test.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.PostgreSQL.Test/Apache.Ibatis.DataMapper.PostgreSQL.Test.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.PostgreSQL.Test/Apache.Ibatis.DataMapper.PostgreSQL.Test.csproj Sun Oct 19 04:25:12 2008
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DA5A59F0-DF1E-4653-BC64-5AEE32F5308E}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Apache.Ibatis.DataMapper.SqlClient.Test.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Apache.Ibatis.DataMapper.SqlClient.Test.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Apache.Ibatis.DataMapper.SqlClient.Test.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Apache.Ibatis.DataMapper.SqlClient.Test.csproj Sun Oct 19 04:25:12 2008
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,7 +38,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\External-Bin\Net\2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.4.4.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
     <Reference Include="NVelocity, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\External-Bin\Net\2.0\NVelocity.dll</HintPath>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Maps/Account.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Maps/Account.xml?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Maps/Account.xml (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper.SqlClient.Test/Maps/Account.xml Sun Oct 19 04:25:12 2008
@@ -152,7 +152,7 @@
     <!-- external sql source -->
     <select id="SimpleSqlSource" sqlSource="SimpleSqlSource" resultMap="account-result"/>
     <select id="SqlSourceWithParameter" parameterClass="Integer" sqlSource="SqlSourceWithParameter" resultMap="account-result"/>
-    <select id="SqlSourceWithInlineParameter" parameterClass="Integer" sqlSource="SqlSourceWithInlineParameter" resultMap="account-result"/>
+    <select id="SqlSourceWithInlineParameter" parameterClass="map" sqlSource="SqlSourceWithInlineParameter" resultMap="account-result"/>
 
     <!-- New parmeter syntax-->
     <update id="NewUpdateAccountViaInlineParameters" parameterClass="Account">

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Apache.Ibatis.DataMapper.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Apache.Ibatis.DataMapper.csproj?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Apache.Ibatis.DataMapper.csproj (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Apache.Ibatis.DataMapper.csproj Sun Oct 19 04:25:12 2008
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/XmlTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/XmlTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/XmlTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Interpreters/Config/Xml/Processor/Handlers/XmlTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -23,10 +23,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
-using System.Xml;
-using Apache.Ibatis.Common.Configuration;
-
 namespace Apache.Ibatis.DataMapper.Configuration.Interpreters.Config.Xml.Processor
 {
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Serializers/ParameterMapDeSerializer.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Serializers/ParameterMapDeSerializer.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Serializers/ParameterMapDeSerializer.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Configuration/Serializers/ParameterMapDeSerializer.cs Sun Oct 19 04:25:12 2008
@@ -71,7 +71,7 @@
             else
             {
                 // Get the ComplexDataExchange
-                dataExchange = dataExchangeFactory.GetDataExchangeForClass(null);
+                dataExchange = dataExchangeFactory.GetDataExchangeForClass(dataExchangeFactory.TypeHandlerFactory.GetTypeAlias(className).Type);
             }
 
             return new ParameterMap(

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderDecorator.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderDecorator.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderDecorator.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderDecorator.cs Sun Oct 19 04:25:12 2008
@@ -33,10 +33,10 @@
     /// Decorate an <see cref="System.Data.IDataReader"></see>
     /// to auto move to next ResultMap on NextResult call. 
     /// </summary>
-    public class DataReaderDecorator : IDataReader
+    public sealed class DataReaderDecorator : IDataReader
     {
-        private IDataReader _innerDataReader = null;
-        private RequestScope _request = null;
+        private readonly IDataReader _innerDataReader = null;
+        private readonly RequestScope _request = null;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DataReaderDecorator"/> class.

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderTransformer.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderTransformer.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderTransformer.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DataReaderTransformer.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
 #endregion
 
 using System.Data;
-using Apache.Ibatis.Common;
 using Apache.Ibatis.Common.Data;
 
 namespace Apache.Ibatis.DataMapper.Data
@@ -43,15 +42,12 @@
 		/// <param name="dbProvider">The databse provider <see cref="IDbProvider"/></param>
 		public static IDataReader Transform(IDataReader reader, IDbProvider dbProvider)
 		{
-            if (!dbProvider.AllowMARS && !(reader is InMemoryDataReader))
+		    if (!dbProvider.AllowMARS && !(reader is InMemoryDataReader))
 			{
 				// The underlying reader will be closed.
 				return new InMemoryDataReader(reader);
 			}
-			else
-			{
-				return reader;	
-			}
+		    return reader;
 		}
 	}
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DbCommandDecorator.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DbCommandDecorator.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DbCommandDecorator.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DbCommandDecorator.cs Sun Oct 19 04:25:12 2008
@@ -33,7 +33,7 @@
     /// Decorate an <see cref="System.Data.IDbCommand"></see>
     /// to auto move to next ResultMap on ExecuteReader call. 
     /// </summary>
-    public class DbCommandDecorator : IDbCommand
+    public sealed class DbCommandDecorator : IDbCommand
     {
         private readonly IDbCommand innerDbCommand = null;
         private readonly RequestScope request = null;

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DefaultPreparedCommand.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DefaultPreparedCommand.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DefaultPreparedCommand.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Data/DefaultPreparedCommand.cs Sun Oct 19 04:25:12 2008
@@ -83,7 +83,7 @@
         /// <param name="session">The session.</param>
         /// <param name="commandType">Type of the command.</param>
         /// <returns>the command</returns>
-        private IDbCommand CreateCommand(ISession session, CommandType commandType)
+        private static IDbCommand CreateCommand(ISession session, CommandType commandType)
         {
             IDbCommand command = session.SessionFactory.DataSource.DbProvider.CreateCommand();
 
@@ -104,7 +104,7 @@
         /// </summary>
         /// <param name="cmd">The CMD.</param>
         /// <param name="commandTimeout">The command timeout.</param>
-        private void SetCommandTimeout(IDbCommand cmd, int commandTimeout)
+        private static void SetCommandTimeout(IDbCommand cmd, int commandTimeout)
         {
             if (commandTimeout >= 0)
             {
@@ -193,7 +193,7 @@
 				// With a ParameterMap, we could specify the ParameterDbTypeProperty
 				if (request.ParameterMap != null)
 				{
-                    if (property.DbType != null && property.DbType.Length > 0)
+                    if (!string.IsNullOrEmpty(property.DbType))
 					{
                         string dbTypePropertyName = dbProvider.ParameterDbTypeProperty;
 						object propertyValue = ObjectProbe.GetMemberValue(sqlParameter, dbTypePropertyName, request.DataExchangeFactory.AccessorFactory);

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatement.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatement.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatement.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatement.cs Sun Oct 19 04:25:12 2008
@@ -1122,7 +1122,7 @@
         /// <param name="command">The command sql.</param>
         private static void RetrieveOutputParameters(RequestScope request, ISession session, IDbCommand command, object result)
         {
-            if (request.ParameterMap != null)
+            if (request.ParameterMap != null && request.ParameterMap.HasOutputParameter)
             {
                 int count = request.ParameterMap.PropertiesList.Count;
                 for (int i = 0; i < count; i++)

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatementEventSupport.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatementEventSupport.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatementEventSupport.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/MappedStatements/MappedStatementEventSupport.cs Sun Oct 19 04:25:12 2008
@@ -25,7 +25,6 @@
 
 using System;
 using System.ComponentModel;
-using Apache.Ibatis.DataMapper.MappedStatements;
 using Apache.Ibatis.DataMapper.Model.Events;
 
 namespace Apache.Ibatis.DataMapper.MappedStatements

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/BaseCache.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/BaseCache.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/BaseCache.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/BaseCache.cs Sun Oct 19 04:25:12 2008
@@ -33,30 +33,19 @@
     /// </summary>
     public abstract class BaseCache : ICache
     {
-        protected string id = string.Empty;
-        protected int size = 0;
-
         #region ICache Members
 
         /// <summary>
         /// Gets the id.
         /// </summary>
         /// <value>The id.</value>
-        public virtual string Id
-        {
-            get { return id; }
-            set { id = value;}
-        }
+        public virtual string Id { get; set; }
 
         /// <summary>
         /// Gets the size.
         /// </summary>
         /// <value>The size.</value>
-        public virtual int Size
-        {
-            get { return size; }
-            set { size = value; }
-        }
+        public virtual int Size { get; set; }
 
         /// <summary>
         /// Adds an item with the specified key and value into cached data.

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Decorators/LoggingCache.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Decorators/LoggingCache.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Decorators/LoggingCache.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Decorators/LoggingCache.cs Sun Oct 19 04:25:12 2008
@@ -131,7 +131,7 @@
         {
             if (logger.IsDebugEnabled)
             {
-                logger.Debug("Clears cache :" + id);
+                logger.Debug("Clears cache :" + Id);
             }
 
             delegateCache.Clear();

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/ICache.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/ICache.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/ICache.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/ICache.cs Sun Oct 19 04:25:12 2008
@@ -25,7 +25,6 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 
 namespace Apache.Ibatis.DataMapper.Model.Cache
 {

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/FifoCache.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/FifoCache.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/FifoCache.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/FifoCache.cs Sun Oct 19 04:25:12 2008
@@ -41,19 +41,19 @@
         /// </summary>
         public FifoCache()
         {
-            size = 256;
+            Size = 256;
             cache = new Dictionary<object, object>();
             keyList = new LinkedList<object>();
         }
 
-        /// <summary>
-        /// Gets the size.
-        /// </summary>
-        /// <value>The size.</value>
-        public override int Size
-        {
-            set { size = value; }
-        }
+        ///// <summary>
+        ///// Gets the size.
+        ///// </summary>
+        ///// <value>The size.</value>
+        //public override int Size
+        //{
+        //    set { Size = value; }
+        //}
 
 		/// <summary>
 		/// Remove an object from a cache model
@@ -98,7 +98,7 @@
 			{
                 cache[key] = value;
                 keyList.AddLast(key);
-                if (keyList.Count > size)
+                if (keyList.Count > Size)
                 {
                     LinkedListNode<object> oldestKey = keyList.First;
                     keyList.RemoveFirst();

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/LruCache.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/LruCache.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/LruCache.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Cache/Implementation/LruCache.cs Sun Oct 19 04:25:12 2008
@@ -42,19 +42,19 @@
         /// </summary>
 		public LruCache() 
 		{
-			size = 256;
+			Size = 256;
             cache = new Dictionary<object, object>();
             keyList = new LinkedList<object>();
 		}
 
-        /// <summary>
-        /// Gets the size.
-        /// </summary>
-        /// <value>The size.</value>
-        public override int Size
-        {
-            set { size =value; }
-        }
+        ///// <summary>
+        ///// Gets the size.
+        ///// </summary>
+        ///// <value>The size.</value>
+        //public override int Size
+        //{
+        //    set { size =value; }
+        //}
 
 		/// <summary>
 		/// Remove an object from a cache model
@@ -103,7 +103,7 @@
 			{
                 cache[key] = value;
                 keyList.AddLast(key);
-                if (keyList.Count > size)
+                if (keyList.Count > Size)
                 {
                     LinkedListNode<object> oldestKey = keyList.First;
                     keyList.RemoveFirst();

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/BaseStatementEventArgs.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/BaseStatementEventArgs.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/BaseStatementEventArgs.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/BaseStatementEventArgs.cs Sun Oct 19 04:25:12 2008
@@ -32,19 +32,13 @@
     /// </summary>
     public abstract class BaseStatementEventArgs : EventArgs
     {
-        private object parameterObject = null;
-
         #region ISatementEvent Members
 
         /// <summary>
         /// Gets or sets the parameter object.
         /// </summary>
         /// <value>The parameter object.</value>
-        public object ParameterObject
-        {
-            get { return parameterObject; }
-            set { parameterObject = value; }
-        }
+        public object ParameterObject { get; set; }
 
         #endregion
     }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostCreateEventArgs.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostCreateEventArgs.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostCreateEventArgs.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostCreateEventArgs.cs Sun Oct 19 04:25:12 2008
@@ -34,16 +34,10 @@
     /// </summary>
     public sealed class PostCreateEventArgs : EventArgs
     {
-        private object instance = null;
-
         /// <summary>
         /// Gets or sets the newly created instance.
         /// </summary>
         /// <value>The instance.</value>
-        public object Instance
-        {
-            get { return instance; }
-            set { instance = value; }
-        }
+        public object Instance { get; set; }
     }
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostPropertyEventArgs.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostPropertyEventArgs.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostPropertyEventArgs.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostPropertyEventArgs.cs Sun Oct 19 04:25:12 2008
@@ -34,16 +34,10 @@
     /// </summary>
     public sealed class PostPropertyEventArgs : EventArgs
     {
-        private object target = null;
-
         /// <summary>
         /// Gets or sets the target.
         /// </summary>
         /// <value>The target.</value>
-        public object Target
-        {
-            get { return target; }
-            set { target = value; }
-        }
+        public object Target { get; set; }
     }
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostStatementEventArgs.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostStatementEventArgs.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostStatementEventArgs.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PostStatementEventArgs.cs Sun Oct 19 04:25:12 2008
@@ -30,16 +30,10 @@
     /// </summary>
     public abstract class PostStatementEventArgs : BaseStatementEventArgs
     {
-        private object resultObject = null;
-
         /// <summary>
         /// Gets or sets the result object.
         /// </summary>
         /// <value>The result object.</value>
-        public object ResultObject
-        {
-            get { return resultObject; }
-            set { resultObject = value; }
-        }
+        public object ResultObject { get; set; }
     }
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PreCreateEventArgs.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PreCreateEventArgs.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PreCreateEventArgs.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PreCreateEventArgs.cs Sun Oct 19 04:25:12 2008
@@ -34,16 +34,10 @@
     /// </summary>
     public sealed class PreCreateEventArgs : EventArgs
     {
-        private object[] parameters = null;
-
         /// <summary>
         /// Gets or sets the parameters used for create the instance 
         /// </summary>
         /// <value>The parameters.</value>
-        public object[] Parameters
-        {
-            get { return parameters; }
-            set { parameters = value; }
-        }
+        public object[] Parameters { get; set; }
     }
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PrePropertyEventArgs.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PrePropertyEventArgs.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PrePropertyEventArgs.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Events/PrePropertyEventArgs.cs Sun Oct 19 04:25:12 2008
@@ -34,27 +34,16 @@
     /// </summary>
     public sealed class PrePropertyEventArgs : EventArgs
     {
-        private object dataBaseValue = null;
-        private object target = null;
-
         /// <summary>
         /// Gets or sets the data base value.
         /// </summary>
         /// <value>The data base value.</value>
-        public object DataBaseValue
-        {
-            get { return dataBaseValue; }
-            set { dataBaseValue = value; }
-        }
+        public object DataBaseValue { get; set; }
 
         /// <summary>
         /// Gets or sets the target.
         /// </summary>
         /// <value>The target.</value>
-        public object Target
-        {
-            get { return target; }
-            set { target = value; }
-        }
+        public object Target { get; set; }
     }
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/InlineParemeterMapBuilder.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/InlineParemeterMapBuilder.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/InlineParemeterMapBuilder.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/InlineParemeterMapBuilder.cs Sun Oct 19 04:25:12 2008
@@ -81,7 +81,7 @@
                     {
                         className = statement.ParameterClass.Name;
                         classType = statement.ParameterClass;
-                        dataExchange = modelStore.DataExchangeFactory.GetDataExchangeForClass(classType);
+                        //dataExchange = modelStore.DataExchangeFactory.GetDataExchangeForClass(classType);
                     }
 
                     if (statement.ParameterClass == null &&
@@ -91,7 +91,7 @@
                     }
                     else
                     {
-                        dataExchange = modelStore.DataExchangeFactory.GetDataExchangeForClass(null);
+                        dataExchange = modelStore.DataExchangeFactory.GetDataExchangeForClass(statement.ParameterClass);
                     }
 
                     map = new ParameterMap(

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterMap.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterMap.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterMap.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterMap.cs Sun Oct 19 04:25:12 2008
@@ -64,7 +64,16 @@
 		#endregion
 
 		#region Properties
-		/// <summary>
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this ParameterMap has output parameter.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance has output parameter; otherwise, <c>false</c>.
+        /// </value>
+        public bool HasOutputParameter { get; set;}
+
+        /// <summary>
 		/// The parameter class name.
 		/// </summary>
 		public string ClassName
@@ -147,9 +156,11 @@
             Contract.Require.That(id, Is.Not.Null & Is.Not.Empty).When("retrieving argument id in ParameterMap constructor");
             Contract.Require.That(dataExchange, Is.Not.Null & Is.Not.Empty).When("retrieving argument dataExchange in ParameterMap constructor for id " + id );
 
+            HasOutputParameter = false;
+
             if (logger.IsInfoEnabled)
             {
-                if ((className == null) || (className.Length < 1))
+                if (string.IsNullOrEmpty(className))
                 {
                     logger.Info("The class attribute is recommended for better performance in a ParameterMap tag '" + id + "'.");
                 }
@@ -158,7 +169,7 @@
             this.id = id;
             this.className = className;
             this.usePositionalParameters = usePositionalParameters;
-            this.parameterClass = type;
+            parameterClass = type;
             this.dataExchange = dataExchange;
             this.extendMap = extendMap;
 		}
@@ -173,17 +184,14 @@
 		/// <returns>A ParameterProperty</returns>
 		public ParameterProperty GetProperty(int index)
 		{
-			if (usePositionalParameters) //obdc/oledb
+		    if (usePositionalParameters) //obdc/oledb
 			{
 				return properties[index];
 			}
-			else 
-			{
-				return propertiesList[index];
-			}
+		    return propertiesList[index];
 		}
 
-		/// <summary>
+	    /// <summary>
 		/// Get a ParameterProperty by his name.
 		/// </summary>
 		/// <param name="name">The name of the ParameterProperty</param>
@@ -200,7 +208,13 @@
 		/// <param name="property"></param>
 		public void AddParameterProperty(ParameterProperty property)
 		{
-			// These mappings will replace any mappings that this map 
+            if (property.Direction == ParameterDirection.Output ||
+                        property.Direction == ParameterDirection.InputOutput)
+            {
+                HasOutputParameter = true;
+            }
+
+		    // These mappings will replace any mappings that this map 
 			// had for any of the keys currently in the specified map. 
 			propertiesMap[property.PropertyName] = property;
 			properties.Add( property );
@@ -220,6 +234,12 @@
 		/// <param name="property">The ParameterProperty to insert. </param>
 		public void InsertParameterProperty(int index, ParameterProperty property)
 		{
+            if (property.Direction == ParameterDirection.Output ||
+            property.Direction == ParameterDirection.InputOutput)
+            {
+                HasOutputParameter = true;
+            }
+
 			// These mappings will replace any mappings that this map 
 			// had for any of the keys currently in the specified map. 
 			propertiesMap[property.PropertyName] = property;

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterProperty.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterProperty.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterProperty.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterProperty.cs Sun Oct 19 04:25:12 2008
@@ -309,11 +309,11 @@
             #endregion 
 
             #region TypeHandler
-            if (this.CallBackName.Length > 0)
+            if (CallBackName.Length > 0)
             {
                 try
                 {
-                    Type type = dataExchangeFactory.TypeHandlerFactory.GetType(this.CallBackName);
+                    Type type = dataExchangeFactory.TypeHandlerFactory.GetType(CallBackName);
                     ITypeHandlerCallback typeHandlerCallback = (ITypeHandlerCallback)Activator.CreateInstance(type);
                     typeHandler = new CustomTypeHandler(typeHandlerCallback);
                 }
@@ -324,7 +324,7 @@
             }
             else
             {
-                if (this.CLRType.Length == 0)  // Unknown
+                if (CLRType.Length == 0)  // Unknown
                 {
                     if (getAccessor != null &&
                         dataExchangeFactory.TypeHandlerFactory.IsSimpleType(getAccessor.MemberType))
@@ -339,7 +339,7 @@
                 }
                 else // If we specify a CLR type, use it
                 {
-                    Type type = TypeUtils.ResolveType(this.CLRType);
+                    Type type = TypeUtils.ResolveType(CLRType);
 
                     if (dataExchangeFactory.TypeHandlerFactory.IsSimpleType(type))
                     {
@@ -349,7 +349,7 @@
                     else
                     {
                         // .NET object
-                        type = ObjectProbe.GetMemberTypeForGetter(parameterClass, this.PropertyName);
+                        type = ObjectProbe.GetMemberTypeForGetter(parameterClass, PropertyName);
                         typeHandler = dataExchangeFactory.TypeHandlerFactory.GetTypeHandler(type, dbType);
                     }
                 }
@@ -373,7 +373,7 @@
 			//Check for null and compare run-time types.
 			if (obj == null || GetType() != obj.GetType()) return false;
 			ParameterProperty p = (ParameterProperty)obj;
-			return (this.PropertyName == p.PropertyName);
+			return (PropertyName == p.PropertyName);
 		}
 
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterPropertyCollection.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterPropertyCollection.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterPropertyCollection.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ParameterMapping/ParameterPropertyCollection.cs Sun Oct 19 04:25:12 2008
@@ -23,7 +23,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using System.Collections.Generic;
 
 namespace Apache.Ibatis.DataMapper.Model.ParameterMapping

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/AutoResultMap.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/AutoResultMap.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/AutoResultMap.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/AutoResultMap.cs Sun Oct 19 04:25:12 2008
@@ -168,10 +168,7 @@
             {
                 return resultClassFactory.CreateInstance(null);
             }
-            else
-            {
-                return TypeUtils.InstantiatePrimitiveType(resultClass);
-            }
+            return TypeUtils.InstantiatePrimitiveType(resultClass);
         }
 
         /// <summary>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/NullResultMap.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/NullResultMap.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/NullResultMap.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/NullResultMap.cs Sun Oct 19 04:25:12 2008
@@ -85,7 +85,7 @@
         /// <summary>
         /// The discriminator used to choose the good Case
         /// </summary>
-        public Discriminator Discriminator
+        public static Discriminator Discriminator
         {
             get { throw new Exception("The method or operation is not implemented."); }
             set { throw new Exception("The method or operation is not implemented."); }
@@ -119,7 +119,7 @@
         /// <summary>
         /// Extend ResultMap attribute
         /// </summary>
-        public string ExtendMap
+        public static string ExtendMap
         {
             get { throw new Exception("The method or operation is not implemented."); }
             set { throw new Exception("The method or operation is not implemented."); }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMap.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMap.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMap.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMap.cs Sun Oct 19 04:25:12 2008
@@ -276,10 +276,7 @@
 
                 return instance;
             }
-            else
-            {
-                return TypeUtils.InstantiatePrimitiveType(type);
-            }
+            return TypeUtils.InstantiatePrimitiveType(type);
         }
 
         /// <summary>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMapEventSupport.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMapEventSupport.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMapEventSupport.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultMapEventSupport.cs Sun Oct 19 04:25:12 2008
@@ -81,10 +81,7 @@
                 
                 return eventArgs.Parameters;
             }
-            else
-            {
-                return parameters;
-            }
+            return parameters;
         }
 
         /// <summary>
@@ -107,10 +104,7 @@
 
                 return eventArgs.Instance;
             }
-            else
-            {
-                return instance;
-            }
+            return instance;
         }
     }
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultProperty.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultProperty.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultProperty.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultProperty.cs Sun Oct 19 04:25:12 2008
@@ -262,19 +262,16 @@
                 {
                     return setAccessor.MemberType;
                 }
-                else if (nestedResultMap != null)
+                if (nestedResultMap != null)
                 {
                     return nestedResultMap.Class;
                 }
-                else
-                {
-                    throw new DataMapperException(
-                        String.Format(CultureInfo.InvariantCulture,
-                                      "Could not resolve member type for result property '{0}'. Neither nested result map nor typed setter was provided.",
-                                      PropertyName));
-                }
+                throw new DataMapperException(
+                    String.Format(CultureInfo.InvariantCulture,
+                                  "Could not resolve member type for result property '{0}'. Neither nested result map nor typed setter was provided.",
+                                  PropertyName));
             }
-        }
+		}
 
 		/// <summary>
 		/// Tell if a nullValue is defined.
@@ -473,7 +470,7 @@
 			}
 
             #region TypeHandler
-            if (CallBackName != null && CallBackName.Length > 0)
+            if (!string.IsNullOrEmpty(CallBackName))
             {
                 try
                 {
@@ -503,7 +500,7 @@
             } 
             #endregion
 
-            if (!this.GetType().IsSubclassOf(typeof(ResultProperty)))
+            if (!GetType().IsSubclassOf(typeof(ResultProperty)))
             {
                 propertyStrategy = PropertyStrategyFactory.Get(this);
             }
@@ -573,7 +570,7 @@
 				}
 				else
 				{
-                    value = this.TypeHandler.NullValue;
+                    value = TypeHandler.NullValue;
 				}			
 			}
 
@@ -586,18 +583,15 @@
         /// <param name="value">The value.</param>
         /// <returns></returns>
 		public object TranslateValue(object value)
-		{
-			if (value == null)
+        {
+            if (value == null)
 			{
                 return TypeHandler.NullValue;
 			}
-			else
-			{
-				return value;
-			}
-		}
+            return value;
+        }
 
-		#endregion
+	    #endregion
     
 	    /// <summary>
         /// <see cref="IFactory"/> that constructs <see cref="ArrayList"/> instance

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultPropertyEventSupport.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultPropertyEventSupport.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultPropertyEventSupport.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/ResultMapping/ResultPropertyEventSupport.cs Sun Oct 19 04:25:12 2008
@@ -81,10 +81,7 @@
 
                 return evnt.DataBaseValue;
             }
-            else
-            {
-                return value;
-            }
+            return value;
         }
 
         /// <summary>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/DynamicSql.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/DynamicSql.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/DynamicSql.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/DynamicSql.cs Sun Oct 19 04:25:12 2008
@@ -89,7 +89,7 @@
             this.usePositionalParameters = usePositionalParameters;
             this.dataExchangeFactory = dataExchangeFactory;
             this.dbHelperParameterCache = dbHelperParameterCache;
-            this.paramParser = new InlineParameterMapParser();
+            paramParser = new InlineParameterMapParser();
 		}
 
 		#region Methods

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/BaseTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/BaseTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/BaseTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/BaseTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -53,7 +53,7 @@
 		public const int REPEAT_BODY = 2;
 		#endregion
 
-        private AccessorFactory _accessorFactory = null;
+        private readonly AccessorFactory _accessorFactory = null;
 
 		/// <summary>
         /// The factory which build <see cref="IAccessor"/>
@@ -67,7 +67,7 @@
         /// Initializes a new instance of the <see cref="BaseTagHandler"/> class.
         /// </summary>
         /// <param name="accessorFactory">The accessor factory.</param>
-        public BaseTagHandler(AccessorFactory accessorFactory)
+        protected BaseTagHandler(AccessorFactory accessorFactory)
 		{
             _accessorFactory = accessorFactory;
 		}
@@ -82,7 +82,7 @@
 		/// <returns></returns>
 		public virtual int DoStartFragment(SqlTagContext ctx, SqlTag tag, object parameterObject) 
 		{
-			return BaseTagHandler.INCLUDE_BODY;
+			return INCLUDE_BODY;
 		}
 
 		/// <summary>
@@ -95,7 +95,7 @@
 		/// <returns></returns>
 		public virtual int DoEndFragment(SqlTagContext ctx, SqlTag tag, object parameterObject, StringBuilder bodyContent) 
 		{
-			return BaseTagHandler.INCLUDE_BODY;
+			return INCLUDE_BODY;
 		}
 
 		/// <summary>

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ConditionalTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ConditionalTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ConditionalTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ConditionalTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -54,7 +54,7 @@
         /// Initializes a new instance of the <see cref="ConditionalTagHandler"/> class.
         /// </summary>
         /// <param name="accessorFactory">The accessor factory.</param>
-        public ConditionalTagHandler(AccessorFactory accessorFactory)
+        protected ConditionalTagHandler(AccessorFactory accessorFactory)
             : base(accessorFactory)
 		{
 		}
@@ -76,19 +76,16 @@
 		/// <param name="tag"></param>
 		/// <param name="parameterObject"></param>
 		/// <returns></returns>
-		public override int DoStartFragment(SqlTagContext ctx, SqlTag tag, Object parameterObject) 
+		public override int DoStartFragment(SqlTagContext ctx, SqlTag tag, Object parameterObject)
 		{
-			if (IsCondition(ctx, tag, parameterObject)) 
+		    if (IsCondition(ctx, tag, parameterObject)) 
 			{
-				return BaseTagHandler.INCLUDE_BODY;
-			} 
-			else 
-			{
-				return BaseTagHandler.SKIP_BODY;
+				return INCLUDE_BODY;
 			}
+		    return SKIP_BODY;
 		}
 
-		/// <summary>
+	    /// <summary>
 		/// 
 		/// </summary>
 		/// <param name="ctx"></param>
@@ -98,7 +95,7 @@
 		/// <returns></returns>
 		public override int DoEndFragment(SqlTagContext ctx, SqlTag tag, Object parameterObject, StringBuilder bodyContent) 
 		{
-			return BaseTagHandler.INCLUDE_BODY;
+			return INCLUDE_BODY;
 		}
 
 		/// <summary>
@@ -117,9 +114,9 @@
 
 			object value1 = null;
 			Type type = null;
-			if (propertyName != null && propertyName.Length > 0) 
+			if (!string.IsNullOrEmpty(propertyName)) 
 			{
-				value1 = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.AccessorFactory);
+				value1 = ObjectProbe.GetMemberValue(parameterObject, propertyName, AccessorFactory);
 				type = value1.GetType();
 			} 
 			else 
@@ -134,19 +131,16 @@
 					type = typeof(object);
 				}
 			}
-			if (comparePropertyName != null && comparePropertyName.Length > 0) 
+			if (!string.IsNullOrEmpty(comparePropertyName)) 
 			{
-                object value2 = ObjectProbe.GetMemberValue(parameterObject, comparePropertyName, this.AccessorFactory);
+                object value2 = ObjectProbe.GetMemberValue(parameterObject, comparePropertyName, AccessorFactory);
 				return CompareValues(type, value1, value2);
-			} 
-			else if (compareValue != null && compareValue != "") 
-			{
-				return CompareValues(type, value1, compareValue);
-			} 
-			else 
-			{
-				throw new DataMapperException("Error comparing in conditional fragment.  Uknown 'compare to' values.");
 			}
+		    if (!string.IsNullOrEmpty(compareValue)) 
+		    {
+		        return CompareValues(type, value1, compareValue);
+		    }
+		    throw new DataMapperException("Error comparing in conditional fragment.  Uknown 'compare to' values.");
 		}
 
 		/// <summary>
@@ -156,7 +150,7 @@
 		/// <param name="value1"></param>
 		/// <param name="value2"></param>
 		/// <returns></returns>
-		protected long CompareValues(Type type, object value1, object value2) 
+		protected static long CompareValues(Type type, object value1, object value2) 
 		{
 			long result = NOT_COMPARABLE;
 
@@ -191,67 +185,63 @@
 		/// <param name="type"></param>
 		/// <param name="value"></param>
 		/// <returns></returns>
-		protected object ConvertValue(Type type, string value) 
+		protected static object ConvertValue(Type type, string value)
 		{
-
-			if (type == typeof(String)) 
-			{
-				return value;
-			} 
-			else if (type == typeof(bool)) 
-			{
-				return System.Convert.ToBoolean(value);
-			} 
-			else if (type == typeof(Byte)) 
-			{
-				return System.Convert.ToByte(value);
-			} 
-			else if (type == typeof(Char)) 
-			{
-				return System.Convert.ToChar(value.Substring(0,1));//new Character(value.charAt(0));
-			}			
-			else if (type == typeof(DateTime)) 
-			{
-				try 
-				{
-					return System.Convert.ToDateTime(value);
-				} 
-				catch (Exception e) 
-				{
-					throw new DataMapperException("Error parsing date. Cause: " + e.Message, e);
-				}
-			} 
-			else if (type == typeof(Decimal)) 
-			{
-				return System.Convert.ToDecimal(value);
-			} 
-			else if (type == typeof(Double))  
-			{
-				return System.Convert.ToDouble(value);
-			} 
-			else if (type == typeof(Int16)) 
-			{
-				return System.Convert.ToInt16(value);
-			} 
-			else if (type == typeof(Int32)) 
-			{
-				return System.Convert.ToInt32(value);
-			} 
-			else if (type == typeof(Int64)) 
-			{
-				return System.Convert.ToInt64(value);
-			} 
-			else if (type == typeof(Single)) 
-			{
-				return System.Convert.ToSingle(value);
-			} 
-			else 
+		    if (type == typeof(String)) 
 			{
 				return value;
 			}
-
+		    if (type == typeof(bool)) 
+		    {
+		        return Convert.ToBoolean(value);
+		    }
+		    if (type == typeof(Byte)) 
+		    {
+		        return Convert.ToByte(value);
+		    }
+		    if (type == typeof(Char)) 
+		    {
+		        return Convert.ToChar(value.Substring(0,1));//new Character(value.charAt(0));
+		    }
+		    if (type == typeof(DateTime)) 
+		    {
+		        try 
+		        {
+		            return Convert.ToDateTime(value);
+		        } 
+		        catch (Exception e) 
+		        {
+		            throw new DataMapperException("Error parsing date. Cause: " + e.Message, e);
+		        }
+		    }
+		    if (type == typeof(Decimal)) 
+		    {
+		        return Convert.ToDecimal(value);
+		    }
+		    if (type == typeof(Double))  
+		    {
+		        return Convert.ToDouble(value);
+		    }
+		    if (type == typeof(Int16)) 
+		    {
+		        return Convert.ToInt16(value);
+		    }
+		    if (type == typeof(Int32)) 
+		    {
+		        return Convert.ToInt32(value);
+		    }
+		    if (type == typeof(Int64)) 
+		    {
+		        return Convert.ToInt64(value);
+		    }
+		    if (type == typeof(Single)) 
+		    {
+		        return Convert.ToSingle(value);
+		    }
+		    return value;
 		}
-		#endregion
+
+	    #endregion
 
 	}
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/DynamicTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/DynamicTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/DynamicTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/DynamicTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -62,7 +62,7 @@
 			{
 				ctx.IsOverridePrepend = true;
 			}
-			return BaseTagHandler.INCLUDE_BODY;
+			return INCLUDE_BODY;
 		}
 		#endregion
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ISqlTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ISqlTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ISqlTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/ISqlTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,13 +24,8 @@
  ********************************************************************************/
 #endregion
 
-#region Imports
-using System;
 using System.Text;
-
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
-#endregion
-
 
 namespace Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Handlers
 {

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEmptyTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -64,32 +64,26 @@
 			if (parameterObject == null) 
 			{
 				return true;
-			} 
-			else 
-			{
-				string propertyName = ((BaseTag)tag).Property;
-				object value = null;
-				if (propertyName != null && propertyName.Length>0) 
-				{
-					value = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.AccessorFactory);
-				} 
-				else 
-				{
-					value = parameterObject;
-				}
-				if (value is ICollection) 
-				{
-					return ((value == null) || (((ICollection) value).Count< 1));
-				} 
-				else if (value != null && typeof(Array).IsAssignableFrom(value.GetType())) //value.GetType().IsArray
-				{
-					return ((Array) value).GetLength(0) == 0;
-				}
-				else 
-				{
-					return ((value == null) || (System.Convert.ToString(value).Equals("")));
-				}
 			}
+		    string propertyName = ((BaseTag)tag).Property;
+		    object value = null;
+		    if (!string.IsNullOrEmpty(propertyName)) 
+		    {
+		        value = ObjectProbe.GetMemberValue(parameterObject, propertyName, AccessorFactory);
+		    } 
+		    else 
+		    {
+		        value = parameterObject;
+		    }
+		    if (value is ICollection) 
+		    {
+		        return ((value == null) || (((ICollection) value).Count< 1));
+		    }
+		    if (value != null && typeof(Array).IsAssignableFrom(value.GetType())) //value.GetType().IsArray
+		    {
+		        return ((Array) value).GetLength(0) == 0;
+		    }
+		    return ((value == null) || (Convert.ToString(value).Equals("")));
 		}
 		#endregion
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEqualTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEqualTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEqualTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsEqualTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,12 +24,8 @@
  ********************************************************************************/
 #endregion
 
-#region Imports
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
-#endregion
-
 
 namespace Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Handlers
 {
@@ -58,7 +54,7 @@
 		/// <returns></returns>
 		public override bool IsCondition(SqlTagContext ctx, SqlTag tag, object parameterObject)
 		{
-			return (this.Compare(ctx, tag, parameterObject) == 0);
+			return (Compare(ctx, tag, parameterObject) == 0);
 		}
 		#endregion
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterEqualTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,12 +24,8 @@
  ********************************************************************************/
 #endregion
 
-#region Imports
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
-#endregion
-
 
 namespace Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Handlers
 {
@@ -59,8 +55,8 @@
 		/// <returns></returns>
 		public override bool IsCondition(SqlTagContext ctx, SqlTag tag, object parameterObject)
 		{
-			long x = this.Compare(ctx, tag, parameterObject);
-			return ((x >= 0) && (x != ConditionalTagHandler.NOT_COMPARABLE));
+			long x = Compare(ctx, tag, parameterObject);
+			return ((x >= 0) && (x != NOT_COMPARABLE));
 		}
 		#endregion
 	}

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsGreaterThanTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 
@@ -54,8 +53,8 @@
 		/// <returns></returns>
 		public override bool IsCondition(SqlTagContext ctx, SqlTag tag, object parameterObject)
 		{
-			long x = this.Compare(ctx, tag, parameterObject);
-			return ((x > 0) && x != (ConditionalTagHandler.NOT_COMPARABLE));
+			long x = Compare(ctx, tag, parameterObject);
+			return ((x > 0) && x != (NOT_COMPARABLE));
 		}
 	}
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessEqualTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 
@@ -55,8 +54,8 @@
 		/// <returns></returns>
 		public override bool IsCondition(SqlTagContext ctx, SqlTag tag, object parameterObject)
 		{
-			long x = this.Compare(ctx, tag, parameterObject);
-			return ((x <= 0) && (x != ConditionalTagHandler.NOT_COMPARABLE));
+			long x = Compare(ctx, tag, parameterObject);
+			return ((x <= 0) && (x != NOT_COMPARABLE));
 		}
 	}
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsLessThanTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 
@@ -55,8 +54,8 @@
 		/// <returns></returns>
 		public override bool IsCondition(SqlTagContext ctx, SqlTag tag, object parameterObject)
 		{
-			long x = this.Compare(ctx, tag, parameterObject);
-			return ((x < 0) && (x != ConditionalTagHandler.NOT_COMPARABLE));
+			long x = Compare(ctx, tag, parameterObject);
+			return ((x < 0) && (x != NOT_COMPARABLE));
 		}
 	}
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEmptyTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotEqualTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotNullTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotParameterPresentTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNotPropertyAvailableTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNullTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNullTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNullTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsNullTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -57,21 +57,18 @@
 			if (parameterObject == null) 
 			{
 				return true;
-			} 
-			else 
-			{
-				string propertyName = ((BaseTag)tag).Property;
-				object value;
-				if (propertyName != null && propertyName.Length>0 ) 
-				{
-					value = ObjectProbe.GetMemberValue(parameterObject, propertyName, this.AccessorFactory);
-				} 
-				else 
-				{
-					value = parameterObject;
-				}
-				return (value == null);
-			}		
+			}
+		    string propertyName = ((BaseTag)tag).Property;
+		    object value;
+		    if (!string.IsNullOrEmpty(propertyName) ) 
+		    {
+		        value = ObjectProbe.GetMemberValue(parameterObject, propertyName, AccessorFactory);
+		    } 
+		    else 
+		    {
+		        value = parameterObject;
+		    }
+		    return (value == null);
 		}
 	}
 }

Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs?rev=705978&r1=705977&r2=705978&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.DataMapper/Model/Sql/Dynamic/Handlers/IsParameterPresentTagHandler.cs Sun Oct 19 04:25:12 2008
@@ -24,7 +24,6 @@
  ********************************************************************************/
 #endregion
 
-using System;
 using Apache.Ibatis.Common.Utilities.Objects.Members;
 using Apache.Ibatis.DataMapper.Model.Sql.Dynamic.Elements;
 



Mime
View raw message