diff --git a/NewLife.Core/Net/IPacket.cs b/NewLife.Core/Net/IPacket.cs
index c21e880..9008a0e 100644
--- a/NewLife.Core/Net/IPacket.cs
+++ b/NewLife.Core/Net/IPacket.cs
@@ -265,7 +265,7 @@ namespace NewLife.Net
// 凑齐10个带有长度的数据帧一起发出
var ms = new MemoryStream();
- for (int i = 0; i < 5; i++)
+ for (Int32 i = 0; i < 5; i++)
{
var size = i < 4 ? Security.Rand.Next(1400) : Security.Rand.Next(2000, 30000);
var str = Security.Rand.NextString(size);
diff --git a/NewLife.Core/Remoting/ApiTest.cs b/NewLife.Core/Remoting/ApiTest.cs
index aef7060..7144296 100644
--- a/NewLife.Core/Remoting/ApiTest.cs
+++ b/NewLife.Core/Remoting/ApiTest.cs
@@ -57,13 +57,13 @@ namespace NewLife.Remoting
//XTrace.WriteLine(logined + "");
var msg = "NewLifeX";
- var rs = await client.InvokeAsync<string>("Hello/Say", new { msg });
+ var rs = await client.InvokeAsync<String>("Hello/Say", new { msg });
XTrace.WriteLine(rs);
try
{
msg = "报错";
- rs = await client.InvokeAsync<string>("Hello/Say", new { msg });
+ rs = await client.InvokeAsync<String>("Hello/Say", new { msg });
}
catch (ApiException ex)
{
@@ -107,7 +107,7 @@ namespace NewLife.Remoting
//[FF(Name = "方法")]
//[FE(Name = "方法")]
- public string Say(string msg)
+ public String Say(String msg)
{
if (msg == "报错") throw new Exception("出错，上一次 " + Session["Last"]);
diff --git a/NewLife.Core/Serialization/Binary/BinaryTest.cs b/NewLife.Core/Serialization/Binary/BinaryTest.cs
index d8228ba..2dc8192 100644
--- a/NewLife.Core/Serialization/Binary/BinaryTest.cs
+++ b/NewLife.Core/Serialization/Binary/BinaryTest.cs
@@ -25,7 +25,7 @@ namespace NewLife.Serialization
Console.Clear();
var ks = new String[] { "普通", "高级", "名值普通", "名值高级" };
- for (int i = 0; i < 4; i++)
+ for (Int32 i = 0; i < 4; i++)
{
var ext = i == 1 || i == 3;
var unm = i == 2 || i == 3;
@@ -108,21 +108,21 @@ namespace NewLife.Serialization
{
var n = Rand.Next(2, 10);
obj.Points = new Double[n];
- for (int i = 0; i < n; i++)
+ for (Int32 i = 0; i < n; i++)
{
obj.Points[i] = (Double)Rand.Next() / 10000;
}
obj.Items = new List<String>();
n = Rand.Next(2, 10);
- for (int i = 0; i < n; i++)
+ for (Int32 i = 0; i < n; i++)
{
obj.Items.Add(Rand.NextString(32));
}
obj.Container = new Dictionary<String, String>();
n = Rand.Next(2, 10);
- for (int i = 0; i < n; i++)
+ for (Int32 i = 0; i < n; i++)
{
obj.Container.Add("元素" + (i + 1), Rand.NextString(32));
}
diff --git a/NewLife.Core/Serialization/Json/JsonTest.cs b/NewLife.Core/Serialization/Json/JsonTest.cs
index 0fa9fe9..0543a0a 100644
--- a/NewLife.Core/Serialization/Json/JsonTest.cs
+++ b/NewLife.Core/Serialization/Json/JsonTest.cs
@@ -25,7 +25,7 @@ namespace NewLife.Serialization
var hosts = typeof(IJsonHost).GetAllSubclasses().Select(e => e.CreateInstance() as IJsonHost).ToArray();
Console.Clear();
- for (int i = 0; i < 2; i++)
+ for (Int32 i = 0; i < 2; i++)
{
var obj = Create(i > 0);
@@ -97,21 +97,21 @@ namespace NewLife.Serialization
{
var n = Rand.Next(2, 10);
obj.Points = new Double[n];
- for (int i = 0; i < n; i++)
+ for (Int32 i = 0; i < n; i++)
{
obj.Points[i] = (Double)Rand.Next() / 10000;
}
obj.Items = new List<String>();
n = Rand.Next(2, 10);
- for (int i = 0; i < n; i++)
+ for (Int32 i = 0; i < n; i++)
{
obj.Items.Add(Rand.NextString(32));
}
obj.Container = new Dictionary<String, String>();
n = Rand.Next(2, 10);
- for (int i = 0; i < n; i++)
+ for (Int32 i = 0; i < n; i++)
{
obj.Container.Add("元素" + (i + 1), Rand.NextString(32));
}
diff --git a/NewLife.Net/Modbus/ModbusSlave.cs b/NewLife.Net/Modbus/ModbusSlave.cs
index 00b0ef3..0d0548a 100644
--- a/NewLife.Net/Modbus/ModbusSlave.cs
+++ b/NewLife.Net/Modbus/ModbusSlave.cs
@@ -107,7 +107,7 @@ namespace NewLife.Net.Modbus
{
#if DEBUG
var str = "Request :";
- for (int i = 0; i < buf.Length; i++)
+ for (Int32 i = 0; i < buf.Length; i++)
{
str += " " + buf[i].ToString("X2");
}
@@ -128,7 +128,7 @@ namespace NewLife.Net.Modbus
#if DEBUG
str = "Response:";
- for (int i = 0; i < buf.Length; i++)
+ for (Int32 i = 0; i < buf.Length; i++)
{
str += " " + buf[i].ToString("X2");
}
diff --git a/XCode/Cache/EntityCache.cs b/XCode/Cache/EntityCache.cs
index 9fb0203..98ff8a5 100644
--- a/XCode/Cache/EntityCache.cs
+++ b/XCode/Cache/EntityCache.cs
@@ -202,13 +202,13 @@ namespace XCode.Cache
/// <param name="name">属性名</param>
/// <param name="value">属性值</param>
/// <returns></returns>
- public IEntity Find(string name, object value) { return Entities.Find(name, value); }
+ public IEntity Find(String name, Object value) { return Entities.Find(name, value); }
/// <summary>根据指定项查找</summary>
/// <param name="name">属性名</param>
/// <param name="value">属性值</param>
/// <returns></returns>
- public EntityList<IEntity> FindAll(string name, object value) { return new EntityList<IEntity>(Entities.FindAll(name, value)); }
+ public EntityList<IEntity> FindAll(String name, Object value) { return new EntityList<IEntity>(Entities.FindAll(name, value)); }
/// <summary>检索与指定谓词定义的条件匹配的所有元素。</summary>
/// <param name="match">条件</param>
diff --git a/XCode/Cache/SingleEntityCache.cs b/XCode/Cache/SingleEntityCache.cs
index 2c97965..cb8f825 100644
--- a/XCode/Cache/SingleEntityCache.cs
+++ b/XCode/Cache/SingleEntityCache.cs
@@ -66,7 +66,7 @@ namespace XCode.Cache
/// <summary>子类重载实现资源释放逻辑时必须首先调用基类方法</summary>
/// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）。
/// 因为该方法只会被调用一次，所以该参数的意义不太大。</param>
- protected override void OnDispose(bool disposing)
+ protected override void OnDispose(Boolean disposing)
{
base.OnDispose(disposing);
@@ -370,7 +370,7 @@ namespace XCode.Cache
/// <summary>获取数据</summary>
/// <param name="key"></param>
/// <returns></returns>
- IEntity ISingleEntityCache.this[object key] { get { return GetItem(Entities, (TKey)key); } }
+ IEntity ISingleEntityCache.this[Object key] { get { return GetItem(Entities, (TKey)key); } }
/// <summary>根据从键获取实体数据</summary>
/// <param name="slaveKey"></param>
@@ -419,7 +419,7 @@ namespace XCode.Cache
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
return "SingleEntityCache<{0}, {1}>[{2}]".F(typeof(TKey).Name, typeof(TEntity).Name, Entities.Count);
}
diff --git a/XCode/Code/EntityAssembly.cs b/XCode/Code/EntityAssembly.cs
index 28fe6f8..a2ffcce 100644
--- a/XCode/Code/EntityAssembly.cs
+++ b/XCode/Code/EntityAssembly.cs
@@ -267,7 +267,7 @@ namespace XCode.Code
else
{
var name = tb.Name;
- for (int i = 2; i < Int32.MaxValue; i++)
+ for (Int32 i = 2; i < Int32.MaxValue; i++)
{
name = tb.Name + i;
if (!list.Contains(name))
@@ -497,7 +497,7 @@ namespace XCode.Code
#region 辅助函数
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString() { return Name; }
+ public override String ToString() { return Name; }
#endregion
}
diff --git a/XCode/Code/EntityClass.cs b/XCode/Code/EntityClass.cs
index ecf477f..3617fa0 100644
--- a/XCode/Code/EntityClass.cs
+++ b/XCode/Code/EntityClass.cs
@@ -323,7 +323,7 @@ namespace XCode.Code
#region 辅助函数
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString() { return Name; }
+ public override String ToString() { return Name; }
#endregion
}
}
\ No newline at end of file
diff --git a/XCode/Configuration/FieldExtension.cs b/XCode/Configuration/FieldExtension.cs
index f080400..0bd3c72 100644
--- a/XCode/Configuration/FieldExtension.cs
+++ b/XCode/Configuration/FieldExtension.cs
@@ -222,7 +222,7 @@ namespace XCode
var ks = keys.Split(" ");
- for (int i = 0; i < ks.Length; i++)
+ for (Int32 i = 0; i < ks.Length; i++)
{
if (!ks[i].IsNullOrWhiteSpace()) exp &= field.Contains(ks[i].Trim());
}
@@ -241,7 +241,7 @@ namespace XCode
var ks = keys.Split(" ");
- for (int i = 0; i < ks.Length; i++)
+ for (Int32 i = 0; i < ks.Length; i++)
{
if (!ks[i].IsNullOrWhiteSpace()) exp |= field.Contains(ks[i].Trim());
}
diff --git a/XCode/Configuration/FieldItem.cs b/XCode/Configuration/FieldItem.cs
index 1515c66..741164a 100644
--- a/XCode/Configuration/FieldItem.cs
+++ b/XCode/Configuration/FieldItem.cs
@@ -225,7 +225,7 @@ namespace XCode.Configuration
#region 方法
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
// 为了保持兼容旧的_.Name等代码，必须只能返回字段名
return ColumnName;
@@ -291,12 +291,12 @@ namespace XCode.Configuration
/// <summary>等于</summary>
/// <param name="value">数值</param>
/// <returns></returns>
- public Expression Equal(object value) { return CreateFieldExpression(this, "=", value); }
+ public Expression Equal(Object value) { return CreateFieldExpression(this, "=", value); }
/// <summary>不等于</summary>
/// <param name="value">数值</param>
/// <returns></returns>
- public Expression NotEqual(object value) { return CreateFieldExpression(this, "<>", value); }
+ public Expression NotEqual(Object value) { return CreateFieldExpression(this, "<>", value); }
Expression CreateLike(String value) { return CreateFormatExpression("{0} Like {1}", Factory.FormatValue(this, value)); }
@@ -581,12 +581,12 @@ namespace XCode.Configuration
/// <summary>重写一下</summary>
/// <returns></returns>
- public override int GetHashCode() { return base.GetHashCode(); }
+ public override Int32 GetHashCode() { return base.GetHashCode(); }
/// <summary>重写一下</summary>
/// <param name="obj"></param>
/// <returns></returns>
- public override bool Equals(object obj) { return base.Equals(obj); }
+ public override Boolean Equals(Object obj) { return base.Equals(obj); }
#region 类型转换
/// <summary>类型转换</summary>
diff --git a/XCode/Configuration/TableItem.cs b/XCode/Configuration/TableItem.cs
index 8ead6e3..5659cd4 100644
--- a/XCode/Configuration/TableItem.cs
+++ b/XCode/Configuration/TableItem.cs
@@ -345,7 +345,7 @@ namespace XCode.Configuration
{
// 反序入栈，因为属性可能是顺序的，这里先反序，待会出来再反一次
// 没有数据属性的
- for (int i = list.Count - 1; i >= 0; i--)
+ for (Int32 i = list.Count - 1; i >= 0; i--)
{
var item = list[i];
if (item.DeclaringType == t && !item.IsDataObjectField)
@@ -421,7 +421,7 @@ namespace XCode.Configuration
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
if (String.IsNullOrEmpty(Description))
return TableName;
diff --git a/XCode/DataAccessLayer/Common/DbBase.cs b/XCode/DataAccessLayer/Common/DbBase.cs
index 7c7f6a4..c1ad817 100644
--- a/XCode/DataAccessLayer/Common/DbBase.cs
+++ b/XCode/DataAccessLayer/Common/DbBase.cs
@@ -40,7 +40,7 @@ namespace XCode.DataAccessLayer
/// <summary>销毁资源时，回滚未提交事务，并关闭数据库连接</summary>
/// <param name="disposing"></param>
- protected override void OnDispose(bool disposing)
+ protected override void OnDispose(Boolean disposing)
{
base.OnDispose(disposing);
@@ -300,7 +300,7 @@ namespace XCode.DataAccessLayer
}
[DllImport("kernel32.dll")]
- static extern int SetDllDirectory(String pathName);
+ static extern Int32 SetDllDirectory(String pathName);
#endregion
#region 分页
@@ -691,7 +691,7 @@ namespace XCode.DataAccessLayer
#region 辅助函数
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
return String.Format("[{0}] {1} {2}", ConnName, DbType, ServerVersion);
}
diff --git a/XCode/DataAccessLayer/Common/DbSession.cs b/XCode/DataAccessLayer/Common/DbSession.cs
index 59363f0..ab54bd4 100644
--- a/XCode/DataAccessLayer/Common/DbSession.cs
+++ b/XCode/DataAccessLayer/Common/DbSession.cs
@@ -28,7 +28,7 @@ namespace XCode.DataAccessLayer
/// <summary>销毁资源时，回滚未提交事务，并关闭数据库连接</summary>
/// <param name="disposing"></param>
- protected override void OnDispose(bool disposing)
+ protected override void OnDispose(Boolean disposing)
{
base.OnDispose(disposing);
@@ -634,7 +634,7 @@ namespace XCode.DataAccessLayer
var sb = new StringBuilder(64);
sb.Append(sql);
sb.Append("[");
- for (int i = 0; i < ps.Length; i++)
+ for (Int32 i = 0; i < ps.Length; i++)
{
if (i > 0) sb.Append(", ");
var v = ps[i].Value;
@@ -689,7 +689,7 @@ namespace XCode.DataAccessLayer
var cps = cmd.Parameters;
ps = new DbParameter[cps.Count];
//cmd.Parameters.CopyTo(ps, 0);
- for (int i = 0; i < ps.Length; i++)
+ for (Int32 i = 0; i < ps.Length; i++)
{
ps[i] = cps[i];
}
diff --git a/XCode/DataAccessLayer/Common/FileDb.cs b/XCode/DataAccessLayer/Common/FileDb.cs
index 81bbb5b..2ba6c69 100644
--- a/XCode/DataAccessLayer/Common/FileDb.cs
+++ b/XCode/DataAccessLayer/Common/FileDb.cs
@@ -9,7 +9,7 @@ namespace XCode.DataAccessLayer
abstract class FileDbBase : DbBase
{
#region 属性
- protected override string DefaultConnectionString
+ protected override String DefaultConnectionString
{
get
{
@@ -67,7 +67,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 方法
- private static List<String> hasChecked = new List<string>();
+ private static List<String> hasChecked = new List<String>();
/// <summary>已重载。打开数据库连接前创建数据库</summary>
public override void Open()
@@ -115,7 +115,7 @@ namespace XCode.DataAccessLayer
/// <param name="schema"></param>
/// <param name="values"></param>
/// <returns></returns>
- public override object SetSchema(DDLSchema schema, object[] values)
+ public override Object SetSchema(DDLSchema schema, Object[] values)
{
//Object obj = null;
switch (schema)
diff --git a/XCode/DataAccessLayer/Common/IDbSession.cs b/XCode/DataAccessLayer/Common/IDbSession.cs
index 8ecb4f0..4f10835 100644
--- a/XCode/DataAccessLayer/Common/IDbSession.cs
+++ b/XCode/DataAccessLayer/Common/IDbSession.cs
@@ -37,7 +37,7 @@ namespace XCode.DataAccessLayer
#region 打开/关闭
/// <summary>连接是否已经打开</summary>
- bool Opened { get; }
+ Boolean Opened { get; }
/// <summary>打开</summary>
void Open();
@@ -168,7 +168,7 @@ namespace XCode.DataAccessLayer
/// <param name="collectionName">指定要返回的架构的名称。</param>
/// <param name="restrictionValues">为请求的架构指定一组限制值。</param>
/// <returns></returns>
- DataTable GetSchema(string collectionName, string[] restrictionValues);
+ DataTable GetSchema(String collectionName, String[] restrictionValues);
#endregion
}
}
\ No newline at end of file
diff --git a/XCode/DataAccessLayer/Common/RemoteDb.cs b/XCode/DataAccessLayer/Common/RemoteDb.cs
index c1d406f..91f8a5e 100644
--- a/XCode/DataAccessLayer/Common/RemoteDb.cs
+++ b/XCode/DataAccessLayer/Common/RemoteDb.cs
@@ -39,7 +39,7 @@ namespace XCode.DataAccessLayer
}
}
- protected override string DefaultConnectionString
+ protected override String DefaultConnectionString
{
get
{
@@ -80,7 +80,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 架构
- public override DataTable GetSchema(string collectionName, string[] restrictionValues)
+ public override DataTable GetSchema(String collectionName, String[] restrictionValues)
{
try
{
@@ -142,7 +142,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 架构定义
- public override object SetSchema(DDLSchema schema, params object[] values)
+ public override Object SetSchema(DDLSchema schema, params Object[] values)
{
var session = Database.CreateSession();
var databaseName = session.DatabaseName;
diff --git a/XCode/DataAccessLayer/DAL_Setting.cs b/XCode/DataAccessLayer/DAL_Setting.cs
index 8bd6279..a2b1f36 100644
--- a/XCode/DataAccessLayer/DAL_Setting.cs
+++ b/XCode/DataAccessLayer/DAL_Setting.cs
@@ -58,7 +58,7 @@ namespace XCode.DataAccessLayer
#region 辅助函数
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString() { return Db.ToString(); }
+ public override String ToString() { return Db.ToString(); }
/// <summary>建立数据表对象</summary>
/// <returns></returns>
diff --git a/XCode/DataAccessLayer/DAL.cs b/XCode/DataAccessLayer/DAL.cs
index 489c0de..1639703 100644
--- a/XCode/DataAccessLayer/DAL.cs
+++ b/XCode/DataAccessLayer/DAL.cs
@@ -109,7 +109,7 @@ namespace XCode.DataAccessLayer
}
}
- static object lockObj = new object();
+ static Object lockObj = new Object();
/// <summary>添加连接字符串</summary>
/// <param name="connName">连接名</param>
diff --git a/XCode/DataAccessLayer/Database/Access.cs b/XCode/DataAccessLayer/Database/Access.cs
index d2469f1..650fc6a 100644
--- a/XCode/DataAccessLayer/Database/Access.cs
+++ b/XCode/DataAccessLayer/Database/Access.cs
@@ -41,7 +41,7 @@ namespace XCode.DataAccessLayer
}
}
- protected override string DefaultConnectionString
+ protected override String DefaultConnectionString
{
get
{
@@ -70,7 +70,7 @@ namespace XCode.DataAccessLayer
/// <returns></returns>
protected override IMetaData OnCreateMetaData() { return new AccessMetaData(); }
- public override bool Support(string providerName)
+ public override Boolean Support(String providerName)
{
providerName = providerName.ToLower();
if (providerName.Contains("microsoft.jet.oledb")) return true;
@@ -106,7 +106,7 @@ namespace XCode.DataAccessLayer
/// <summary>长文本长度</summary>
public override Int32 LongTextLength { get { return 255; } }
- public override string FormatName(string name)
+ public override String FormatName(String name)
{
if (!String.IsNullOrEmpty(name) && name.Contains("$"))
return FormatKeyWord(name);
@@ -141,7 +141,7 @@ namespace XCode.DataAccessLayer
/// <param name="field">字段</param>
/// <param name="value">数值</param>
/// <returns></returns>
- public override string FormatValue(IDataColumn field, object value)
+ public override String FormatValue(IDataColumn field, Object value)
{
if (field != null && field.DataType == typeof(Boolean) || value != null && value.GetType() == typeof(Boolean))
{
@@ -155,7 +155,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 分页
- public override SelectBuilder PageSplit(SelectBuilder builder, int startRowIndex, int maximumRows)
+ public override SelectBuilder PageSplit(SelectBuilder builder, Int32 startRowIndex, Int32 maximumRows)
{
return MSPageSplit.PageSplit(builder, startRowIndex, maximumRows, false, b => CreateSession().QueryCount(b));
}
@@ -362,7 +362,7 @@ namespace XCode.DataAccessLayer
// if (TryGetDataRowValue<Boolean>(dr, "UNIQUE", out b)) index.PrimaryKey = b;
//}
- protected override string GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
+ protected override String GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
{
String str = base.GetFieldConstraints(field, onlyDefine);
@@ -375,7 +375,7 @@ namespace XCode.DataAccessLayer
/// <param name="field">字段</param>
/// <param name="onlyDefine">仅仅定义</param>
/// <returns></returns>
- protected override string GetFieldDefault(IDataColumn field, bool onlyDefine)
+ protected override String GetFieldDefault(IDataColumn field, Boolean onlyDefine)
{
// Access不能通过DDL来操作默认值
return null;
@@ -462,7 +462,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 反向工程创建表
- protected override void CreateTable(StringBuilder sb, IDataTable table, bool onlySql)
+ protected override void CreateTable(StringBuilder sb, IDataTable table, Boolean onlySql)
{
base.CreateTable(sb, table, onlySql);
@@ -496,7 +496,7 @@ namespace XCode.DataAccessLayer
}
}
- public override string CreateTableSQL(IDataTable table)
+ public override String CreateTableSQL(IDataTable table)
{
var sql = base.CreateTableSQL(table);
@@ -521,7 +521,7 @@ namespace XCode.DataAccessLayer
return sql;
}
- public override string CreateIndexSQL(IDataIndex index)
+ public override String CreateIndexSQL(IDataIndex index)
{
String sql = base.CreateIndexSQL(index);
if (String.IsNullOrEmpty(sql) || !index.PrimaryKey) return sql;
@@ -618,7 +618,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 数据类型
- protected override DataRow[] FindDataType(IDataColumn field, string typeName, bool? isLong)
+ protected override DataRow[] FindDataType(IDataColumn field, String typeName, Boolean? isLong)
{
DataRow[] drs = base.FindDataType(field, typeName, isLong);
if (drs != null && drs.Length > 0) return drs;
@@ -656,7 +656,7 @@ namespace XCode.DataAccessLayer
return drs;
}
- protected override string GetFieldType(IDataColumn field)
+ protected override String GetFieldType(IDataColumn field)
{
String typeName = base.GetFieldType(field);
diff --git a/XCode/DataAccessLayer/Database/Firebird.cs b/XCode/DataAccessLayer/Database/Firebird.cs
index 1bdaf91..48d143d 100644
--- a/XCode/DataAccessLayer/Database/Firebird.cs
+++ b/XCode/DataAccessLayer/Database/Firebird.cs
@@ -72,7 +72,7 @@ namespace XCode.DataAccessLayer
/// <param name="maximumRows">最大返回行数，0表示所有行</param>
/// <param name="keyColumn">主键列。用于not in分页</param>
/// <returns></returns>
- public override string PageSplit(string sql, Int32 startRowIndex, Int32 maximumRows, string keyColumn)
+ public override String PageSplit(String sql, Int32 startRowIndex, Int32 maximumRows, String keyColumn)
{
// 从第一行开始，不需要分页
if (startRowIndex <= 0)
@@ -172,13 +172,13 @@ namespace XCode.DataAccessLayer
//}
/// <summary>长文本长度</summary>
- public override int LongTextLength { get { return 32767; } }
+ public override Int32 LongTextLength { get { return 32767; } }
/// <summary>格式化标识列，返回插入数据时所用的表达式，如果字段本身支持自增，则返回空</summary>
/// <param name="field">字段</param>
/// <param name="value">数值</param>
/// <returns></returns>
- public override string FormatIdentity(IDataColumn field, Object value)
+ public override String FormatIdentity(IDataColumn field, Object value)
{
//return String.Format("GEN_ID(GEN_{0}, 1)", field.Table.TableName);
return String.Format("next value for SEQ_{0}", field.Table.TableName);
@@ -209,7 +209,7 @@ namespace XCode.DataAccessLayer
/// <param name="type">命令类型，默认SQL文本</param>
/// <param name="ps">命令参数</param>
/// <returns>新增行的自动编号</returns>
- public override Int64 InsertAndGetIdentity(string sql, CommandType type = CommandType.Text, params DbParameter[] ps)
+ public override Int64 InsertAndGetIdentity(String sql, CommandType type = CommandType.Text, params DbParameter[] ps)
{
BeginTransaction(IsolationLevel.Serializable);
try
@@ -249,7 +249,7 @@ namespace XCode.DataAccessLayer
return GetTables(rows);
}
- protected override string GetFieldType(IDataColumn field)
+ protected override String GetFieldType(IDataColumn field)
{
if (field.DataType == typeof(Boolean)) return "smallint";
@@ -281,7 +281,7 @@ namespace XCode.DataAccessLayer
Reflect.Invoke(null, method, Database.ConnectionString);
}
- public override string CreateDatabaseSQL(string dbname, string file)
+ public override String CreateDatabaseSQL(String dbname, String file)
{
return String.Empty;
}
@@ -291,7 +291,7 @@ namespace XCode.DataAccessLayer
// return String.Format("Drop Database If Exists {0}", FormatKeyWord(dbname));
//}
- protected override string GetFieldConstraints(IDataColumn field, bool onlyDefine)
+ protected override String GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
{
if (field.Nullable)
return "";
@@ -299,7 +299,7 @@ namespace XCode.DataAccessLayer
return " not null";
}
- public override string CreateTableSQL(IDataTable table)
+ public override String CreateTableSQL(IDataTable table)
{
String sql = base.CreateTableSQL(table);
if (String.IsNullOrEmpty(sql)) return sql;
@@ -313,7 +313,7 @@ namespace XCode.DataAccessLayer
return sql + ";" + Environment.NewLine + sqlSeq;
}
- public override string DropTableSQL(String tableName)
+ public override String DropTableSQL(String tableName)
{
String sql = base.DropTableSQL(tableName);
if (String.IsNullOrEmpty(sql)) return sql;
diff --git a/XCode/DataAccessLayer/Database/MySql.cs b/XCode/DataAccessLayer/Database/MySql.cs
index f9134fb..57a6996 100644
--- a/XCode/DataAccessLayer/Database/MySql.cs
+++ b/XCode/DataAccessLayer/Database/MySql.cs
@@ -68,7 +68,7 @@ namespace XCode.DataAccessLayer
/// <returns></returns>
protected override IMetaData OnCreateMetaData() { return new MySqlMetaData(); }
- public override bool Support(string providerName)
+ public override Boolean Support(String providerName)
{
providerName = providerName.ToLower();
if (providerName.Contains("mysql.data.mysqlclient")) return true;
@@ -85,7 +85,7 @@ namespace XCode.DataAccessLayer
/// <param name="maximumRows">最大返回行数，0表示所有行</param>
/// <param name="keyColumn">主键列。用于not in分页</param>
/// <returns></returns>
- public override string PageSplit(string sql, Int32 startRowIndex, Int32 maximumRows, string keyColumn)
+ public override String PageSplit(String sql, Int32 startRowIndex, Int32 maximumRows, String keyColumn)
{
// 从第一行开始，不需要分页
if (startRowIndex <= 0)
@@ -141,7 +141,7 @@ namespace XCode.DataAccessLayer
/// <summary>获取Guid的函数</summary>
public override String NewGuid { get { return "uuid()"; } }
- protected override string ReservedWordsStr
+ protected override String ReservedWordsStr
{
get
{
@@ -175,7 +175,7 @@ namespace XCode.DataAccessLayer
/// <param name="field">字段</param>
/// <param name="value">数值</param>
/// <returns></returns>
- public override string FormatValue(IDataColumn field, object value)
+ public override String FormatValue(IDataColumn field, Object value)
{
var code = Type.GetTypeCode(field.DataType);
if (code == TypeCode.String)
@@ -196,7 +196,7 @@ namespace XCode.DataAccessLayer
}
/// <summary>长文本长度</summary>
- public override int LongTextLength { get { return 255; } }
+ public override Int32 LongTextLength { get { return 255; } }
internal protected override String ParamPrefix { get { return "?"; } }
@@ -277,7 +277,7 @@ namespace XCode.DataAccessLayer
/// <param name="type">命令类型，默认SQL文本</param>
/// <param name="ps">命令参数</param>
/// <returns>新增行的自动编号</returns>
- public override Int64 InsertAndGetIdentity(string sql, CommandType type = CommandType.Text, params DbParameter[] ps)
+ public override Int64 InsertAndGetIdentity(String sql, CommandType type = CommandType.Text, params DbParameter[] ps)
{
sql += ";Select LAST_INSERT_ID()";
return ExecuteScalar<Int64>(CreateCommand(sql, type, ps));
@@ -297,7 +297,7 @@ namespace XCode.DataAccessLayer
base.FixTable(table, dr);
}
- protected override bool IsColumnChanged(IDataColumn entityColumn, IDataColumn dbColumn, IDatabase entityDb)
+ protected override Boolean IsColumnChanged(IDataColumn entityColumn, IDataColumn dbColumn, IDatabase entityDb)
{
return base.IsColumnChanged(entityColumn, dbColumn, entityDb);
}
@@ -338,7 +338,7 @@ namespace XCode.DataAccessLayer
base.FixField(field, dr);
}
- protected override DataRow[] FindDataType(IDataColumn field, string typeName, bool? isLong)
+ protected override DataRow[] FindDataType(IDataColumn field, String typeName, Boolean? isLong)
{
// MySql没有ntext，映射到text
if (typeName.EqualIgnoreCase("ntext")) typeName = "text";
@@ -438,14 +438,14 @@ namespace XCode.DataAccessLayer
return drs;
}
- protected override string GetFieldType(IDataColumn field)
+ protected override String GetFieldType(IDataColumn field)
{
if (field.DataType == typeof(Boolean)) return "enum('N','Y')";
return base.GetFieldType(field);
}
- public override string FieldClause(IDataColumn field, bool onlyDefine)
+ public override String FieldClause(IDataColumn field, Boolean onlyDefine)
{
String sql = base.FieldClause(field, onlyDefine);
// 加上注释
@@ -453,7 +453,7 @@ namespace XCode.DataAccessLayer
return sql;
}
- protected override string GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
+ protected override String GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
{
String str = null;
if (!field.Nullable) str = " NOT NULL";
@@ -463,7 +463,7 @@ namespace XCode.DataAccessLayer
return str;
}
- protected override string GetFieldDefault(IDataColumn field, bool onlyDefine)
+ protected override String GetFieldDefault(IDataColumn field, Boolean onlyDefine)
{
if (String.IsNullOrEmpty(field.Default)) return null;
@@ -513,7 +513,7 @@ namespace XCode.DataAccessLayer
// return base.SetSchema(schema, values);
//}
- protected override bool DatabaseExist(string databaseName)
+ protected override Boolean DatabaseExist(String databaseName)
{
//return base.DatabaseExist(databaseName);
@@ -527,7 +527,7 @@ namespace XCode.DataAccessLayer
// return String.Format("Create Database Binary {0}", FormatKeyWord(dbname));
//}
- public override string DropDatabaseSQL(string dbname)
+ public override String DropDatabaseSQL(String dbname)
{
return String.Format("Drop Database If Exists {0}", FormatName(dbname));
}
@@ -572,19 +572,19 @@ namespace XCode.DataAccessLayer
return sb.ToString();
}
- public override string AddTableDescriptionSQL(IDataTable table)
+ public override String AddTableDescriptionSQL(IDataTable table)
{
if (String.IsNullOrEmpty(table.Description)) return null;
return String.Format("Alter Table {0} Comment '{1}'", FormatName(table.TableName), table.Description);
}
- public override string AlterColumnSQL(IDataColumn field, IDataColumn oldfield)
+ public override String AlterColumnSQL(IDataColumn field, IDataColumn oldfield)
{
return String.Format("Alter Table {0} Modify Column {1}", FormatName(field.Table.TableName), FieldClause(field, false));
}
- public override string AddColumnDescriptionSQL(IDataColumn field)
+ public override String AddColumnDescriptionSQL(IDataColumn field)
{
// 返回String.Empty表示已经在别的SQL中处理
return String.Empty;
@@ -596,7 +596,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 辅助函数
- protected override string GetFormatParam(IDataColumn field, DataRow dr)
+ protected override String GetFormatParam(IDataColumn field, DataRow dr)
{
String str = base.GetFormatParam(field, dr);
if (String.IsNullOrEmpty(str)) return str;
diff --git a/XCode/DataAccessLayer/Database/Network.cs b/XCode/DataAccessLayer/Database/Network.cs
index 23443b7..dc49471 100644
--- a/XCode/DataAccessLayer/Database/Network.cs
+++ b/XCode/DataAccessLayer/Database/Network.cs
@@ -97,7 +97,7 @@ namespace XCode.DataAccessLayer
/// <summary>快速查询单表记录数，稍有偏差</summary>
/// <param name="tableName"></param>
/// <returns></returns>
- public override Int64 QueryCountFast(string tableName)
+ public override Int64 QueryCountFast(String tableName)
{
return base.QueryCountFast(tableName);
}
@@ -117,7 +117,7 @@ namespace XCode.DataAccessLayer
/// <summary>执行DbCommand，返回受影响的行数</summary>
/// <param name="cmd">DbCommand</param>
/// <returns></returns>
- public override int Execute(DbCommand cmd)
+ public override Int32 Execute(DbCommand cmd)
{
throw new NotSupportedException();
}
@@ -143,7 +143,7 @@ namespace XCode.DataAccessLayer
/// <param name="collectionName">指定要返回的架构的名称。</param>
/// <param name="restrictionValues">为请求的架构指定一组限制值。</param>
/// <returns></returns>
- public override DataTable GetSchema(string collectionName, string[] restrictionValues)
+ public override DataTable GetSchema(String collectionName, String[] restrictionValues)
{
return base.GetSchema(collectionName, restrictionValues);
}
diff --git a/XCode/DataAccessLayer/Database/Oracle.cs b/XCode/DataAccessLayer/Database/Oracle.cs
index 59b4f1f..60c6571 100644
--- a/XCode/DataAccessLayer/Database/Oracle.cs
+++ b/XCode/DataAccessLayer/Database/Oracle.cs
@@ -120,7 +120,7 @@ namespace XCode.DataAccessLayer
/// <returns></returns>
protected override IMetaData OnCreateMetaData() { return new OracleMeta(); }
- public override bool Support(string providerName)
+ public override Boolean Support(String providerName)
{
providerName = providerName.ToLower();
if (providerName.Contains("oracleclient")) return true;
@@ -184,7 +184,7 @@ namespace XCode.DataAccessLayer
#region 数据库特性
/// <summary>当前时间函数</summary>
- public override string DateTimeNow { get { return "sysdate"; } }
+ public override String DateTimeNow { get { return "sysdate"; } }
/// <summary>获取Guid的函数</summary>
public override String NewGuid { get { return "sys_guid()"; } }
@@ -198,7 +198,7 @@ namespace XCode.DataAccessLayer
// return String.Format("To_Date('{0}', 'YYYY-MM-DD HH24:MI:SS')", dateTime.ToString("yyyy-MM-dd HH:mm:ss"));
//}
- public override string FormatValue(IDataColumn field, object value)
+ public override String FormatValue(IDataColumn field, Object value)
{
TypeCode code = Type.GetTypeCode(field.DataType);
Boolean isNullable = field.Nullable;
@@ -222,7 +222,7 @@ namespace XCode.DataAccessLayer
/// <param name="field">字段</param>
/// <param name="value">数值</param>
/// <returns></returns>
- public override string FormatIdentity(IDataColumn field, Object value)
+ public override String FormatIdentity(IDataColumn field, Object value)
{
return String.Format("SEQ_{0}.nextval", field.Table.TableName);
}
@@ -237,7 +237,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 关键字
- protected override string ReservedWordsStr
+ protected override String ReservedWordsStr
{
get { return "Sort,Level,ALL,ALTER,AND,ANY,AS,ASC,BETWEEN,BY,CHAR,CHECK,CLUSTER,COMPRESS,CONNECT,CREATE,DATE,DECIMAL,DEFAULT,DELETE,DESC,DISTINCT,DROP,ELSE,EXCLUSIVE,EXISTS,FLOAT,FOR,FROM,GRANT,GROUP,HAVING,IDENTIFIED,IN,INDEX,INSERT,INTEGER,INTERSECT,INTO,IS,LIKE,LOCK,LONG,MINUS,MODE,NOCOMPRESS,NOT,NOWAIT,NULL,NUMBER,OF,ON,OPTION,OR,ORDER,PCTFREE,PRIOR,PUBLIC,RAW,RENAME,RESOURCE,REVOKE,SELECT,SET,SHARE,SIZE,SMALLINT,START,SYNONYM,TABLE,THEN,TO,TRIGGER,UNION,UNIQUE,UPDATE,VALUES,VARCHAR,VARCHAR2,VIEW,WHERE,WITH"; }
}
@@ -265,7 +265,7 @@ namespace XCode.DataAccessLayer
/// <summary>是否忽略大小写，如果不忽略则在表名字段名外面加上双引号</summary>
static Boolean _IgnoreCase = Setting.Current.Oracle.IgnoreCase;
- public override string FormatName(string name)
+ public override String FormatName(String name)
{
if (_IgnoreCase)
return base.FormatName(name);
@@ -315,7 +315,7 @@ namespace XCode.DataAccessLayer
/// <summary>快速查询单表记录数，稍有偏差</summary>
/// <param name="tableName"></param>
/// <returns></returns>
- public override Int64 QueryCountFast(string tableName)
+ public override Int64 QueryCountFast(String tableName)
{
if (String.IsNullOrEmpty(tableName)) return 0;
@@ -648,7 +648,7 @@ namespace XCode.DataAccessLayer
String where = String.Format("{0}='{1}' AND {2}='{3}'", _.TalbeName, tableName, _.ColumnName, columnName);
DataRow[] drs = dtColumnDefault.Select(where);
- string result = null;
+ String result = null;
if (drs == null || drs.Length == 0) return null;
result = Convert.ToString(drs[0]["DATA_DEFAULT"]); //如果默认值中最后一个字符是 \n ,则排除掉
@@ -700,7 +700,7 @@ namespace XCode.DataAccessLayer
if (TryGetDataRowValue<Int32>(drColumn, "LENGTH", out len) && len > 0) field.NumOfByte = len;
}
- protected override string GetFieldType(IDataColumn field)
+ protected override String GetFieldType(IDataColumn field)
{
Int32 precision = field.Precision;
Int32 scale = field.Scale;
@@ -741,7 +741,7 @@ namespace XCode.DataAccessLayer
return base.GetFieldType(field);
}
- protected override DataRow[] FindDataType(IDataColumn field, string typeName, bool? isLong)
+ protected override DataRow[] FindDataType(IDataColumn field, String typeName, Boolean? isLong)
{
DataRow[] drs = base.FindDataType(field, typeName, isLong);
if (drs != null && drs.Length > 1)
@@ -788,7 +788,7 @@ namespace XCode.DataAccessLayer
}
#region 架构定义
- public override object SetSchema(DDLSchema schema, params object[] values)
+ public override Object SetSchema(DDLSchema schema, params Object[] values)
{
IDbSession session = Database.CreateSession();
@@ -806,12 +806,12 @@ namespace XCode.DataAccessLayer
return base.SetSchema(schema, values);
}
- public override string DatabaseExistSQL(string dbname)
+ public override String DatabaseExistSQL(String dbname)
{
return String.Empty;
}
- protected override string GetFieldConstraints(IDataColumn field, bool onlyDefine)
+ protected override String GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
{
// 有默认值时直接返回，待会在默认值里面加约束
// 因为Oracle的声明是先有默认值再有约束的
@@ -825,14 +825,14 @@ namespace XCode.DataAccessLayer
return " NOT NULL";
}
- protected override string GetFieldDefault(IDataColumn field, bool onlyDefine)
+ protected override String GetFieldDefault(IDataColumn field, Boolean onlyDefine)
{
if (String.IsNullOrEmpty(field.Default)) return null;
return base.GetFieldDefault(field, onlyDefine) + base.GetFieldConstraints(field, onlyDefine);
}
- public override string CreateTableSQL(IDataTable table)
+ public override String CreateTableSQL(IDataTable table)
{
var Fields = new List<IDataColumn>(table.Columns);
Fields.OrderBy(dc => dc.ID);
@@ -855,7 +855,7 @@ namespace XCode.DataAccessLayer
sb.AppendLine(",");
sb.Append("\t");
sb.AppendFormat("constraint pk_{0} primary key (", table.TableName);
- for (int i = 0; i < pks.Length; i++)
+ for (Int32 i = 0; i < pks.Length; i++)
{
if (i > 0) sb.Append(",");
sb.Append(FormatName(pks[i].ColumnName));
@@ -876,7 +876,7 @@ namespace XCode.DataAccessLayer
return sql + ";" + Environment.NewLine + sqlSeq;
}
- public override string DropTableSQL(String tableName)
+ public override String DropTableSQL(String tableName)
{
String sql = base.DropTableSQL(tableName);
if (String.IsNullOrEmpty(sql)) return sql;
@@ -909,28 +909,28 @@ namespace XCode.DataAccessLayer
return String.Format("Alter Table {2}.{0} Drop Column {1}", FormatName(field.Table.TableName), field.ColumnName, Owner);
}
- public override string AddTableDescriptionSQL(IDataTable table)
+ public override String AddTableDescriptionSQL(IDataTable table)
{
//return String.Format("Update USER_TAB_COMMENTS Set COMMENTS='{0}' Where TABLE_NAME='{1}'", table.Description, table.Name);
return String.Format("Comment On Table {0} is '{1}'", FormatName(table.TableName), table.Description);
}
- public override string DropTableDescriptionSQL(IDataTable table)
+ public override String DropTableDescriptionSQL(IDataTable table)
{
//return String.Format("Update USER_TAB_COMMENTS Set COMMENTS='' Where TABLE_NAME='{0}'", table.Name);
return String.Format("Comment On Table {0} is ''", FormatName(table.TableName));
}
- public override string AddColumnDescriptionSQL(IDataColumn field)
+ public override String AddColumnDescriptionSQL(IDataColumn field)
{
//return String.Format("Update USER_COL_COMMENTS Set COMMENTS='{0}' Where TABLE_NAME='{1}' AND COLUMN_NAME='{2}'", field.Description, field.Table.Name, field.Name);
return String.Format("Comment On Column {0}.{1} is '{2}'", FormatName(field.Table.TableName), FormatName(field.ColumnName), field.Description);
}
- public override string DropColumnDescriptionSQL(IDataColumn field)
+ public override String DropColumnDescriptionSQL(IDataColumn field)
{
//return String.Format("Update USER_COL_COMMENTS Set COMMENTS='' Where TABLE_NAME='{0}' AND COLUMN_NAME='{1}'", field.Table.Name, field.Name);
diff --git a/XCode/DataAccessLayer/Database/PostgreSQL.cs b/XCode/DataAccessLayer/Database/PostgreSQL.cs
index a29af74..b3d11aa 100644
--- a/XCode/DataAccessLayer/Database/PostgreSQL.cs
+++ b/XCode/DataAccessLayer/Database/PostgreSQL.cs
@@ -51,7 +51,7 @@ namespace XCode.DataAccessLayer
/// <returns></returns>
protected override IMetaData OnCreateMetaData() { return new PostgreSQLMetaData(); }
- public override bool Support(string providerName)
+ public override Boolean Support(String providerName)
{
providerName = providerName.ToLower();
if (providerName.Contains("postgresql.data.postgresqlclient")) return true;
@@ -69,7 +69,7 @@ namespace XCode.DataAccessLayer
/// <param name="maximumRows">最大返回行数，0表示所有行</param>
/// <param name="keyColumn">主键列。用于not in分页</param>
/// <returns></returns>
- public override string PageSplit(string sql, Int32 startRowIndex, Int32 maximumRows, string keyColumn)
+ public override String PageSplit(String sql, Int32 startRowIndex, Int32 maximumRows, String keyColumn)
{
// 从第一行开始，不需要分页
if (startRowIndex <= 0)
@@ -148,7 +148,7 @@ namespace XCode.DataAccessLayer
/// <param name="field">字段</param>
/// <param name="value">数值</param>
/// <returns></returns>
- public override string FormatValue(IDataColumn field, object value)
+ public override String FormatValue(IDataColumn field, Object value)
{
if (field.DataType == typeof(String))
{
@@ -166,7 +166,7 @@ namespace XCode.DataAccessLayer
}
/// <summary>长文本长度</summary>
- public override int LongTextLength { get { return 4000; } }
+ public override Int32 LongTextLength { get { return 4000; } }
internal protected override String ParamPrefix { get { return "$"; } }
@@ -194,7 +194,7 @@ namespace XCode.DataAccessLayer
/// <param name="type">命令类型，默认SQL文本</param>
/// <param name="ps">命令参数</param>
/// <returns>新增行的自动编号</returns>
- public override Int64 InsertAndGetIdentity(string sql, CommandType type = CommandType.Text, params DbParameter[] ps)
+ public override Int64 InsertAndGetIdentity(String sql, CommandType type = CommandType.Text, params DbParameter[] ps)
{
sql += ";Select LAST_INSERT_ID()";
return ExecuteScalar<Int64>(CreateCommand(sql, type, ps));
@@ -254,7 +254,7 @@ namespace XCode.DataAccessLayer
base.FixField(field, dr);
}
- protected override DataRow[] FindDataType(IDataColumn field, string typeName, bool? isLong)
+ protected override DataRow[] FindDataType(IDataColumn field, String typeName, Boolean? isLong)
{
DataRow[] drs = base.FindDataType(field, typeName, isLong);
if (drs != null && drs.Length > 1)
@@ -331,14 +331,14 @@ namespace XCode.DataAccessLayer
// base.SetFieldType(field, typeName);
//}
- protected override string GetFieldType(IDataColumn field)
+ protected override String GetFieldType(IDataColumn field)
{
if (field.DataType == typeof(Boolean)) return "enum('N','Y')";
return base.GetFieldType(field);
}
- public override string FieldClause(IDataColumn field, bool onlyDefine)
+ public override String FieldClause(IDataColumn field, Boolean onlyDefine)
{
String sql = base.FieldClause(field, onlyDefine);
// 加上注释
@@ -346,7 +346,7 @@ namespace XCode.DataAccessLayer
return sql;
}
- protected override string GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
+ protected override String GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
{
String str = null;
if (!field.Nullable) str = " NOT NULL";
@@ -356,7 +356,7 @@ namespace XCode.DataAccessLayer
return str;
}
- protected override string GetFieldDefault(IDataColumn field, bool onlyDefine)
+ protected override String GetFieldDefault(IDataColumn field, Boolean onlyDefine)
{
if (String.IsNullOrEmpty(field.Default)) return null;
@@ -407,7 +407,7 @@ namespace XCode.DataAccessLayer
// return base.SetSchema(schema, values);
//}
- protected override bool DatabaseExist(string databaseName)
+ protected override Boolean DatabaseExist(String databaseName)
{
//return base.DatabaseExist(databaseName);
@@ -421,7 +421,7 @@ namespace XCode.DataAccessLayer
// return String.Format("Create Database Binary {0}", FormatKeyWord(dbname));
//}
- public override string DropDatabaseSQL(string dbname)
+ public override String DropDatabaseSQL(String dbname)
{
return String.Format("Drop Database If Exists {0}", FormatName(dbname));
}
@@ -456,19 +456,19 @@ namespace XCode.DataAccessLayer
return sb.ToString();
}
- public override string AddTableDescriptionSQL(IDataTable table)
+ public override String AddTableDescriptionSQL(IDataTable table)
{
if (String.IsNullOrEmpty(table.Description)) return null;
return String.Format("Alter Table {0} Comment '{1}'", FormatName(table.TableName), table.Description);
}
- public override string AlterColumnSQL(IDataColumn field, IDataColumn oldfield)
+ public override String AlterColumnSQL(IDataColumn field, IDataColumn oldfield)
{
return String.Format("Alter Table {0} Modify Column {1}", FormatName(field.Table.TableName), FieldClause(field, false));
}
- public override string AddColumnDescriptionSQL(IDataColumn field)
+ public override String AddColumnDescriptionSQL(IDataColumn field)
{
// 返回String.Empty表示已经在别的SQL中处理
return String.Empty;
diff --git a/XCode/DataAccessLayer/Database/SqlCe.cs b/XCode/DataAccessLayer/Database/SqlCe.cs
index cfd2a82..57a147b 100644
--- a/XCode/DataAccessLayer/Database/SqlCe.cs
+++ b/XCode/DataAccessLayer/Database/SqlCe.cs
@@ -88,7 +88,7 @@ namespace XCode.DataAccessLayer
}
}
- protected override string DefaultConnectionString
+ protected override String DefaultConnectionString
{
get
{
@@ -147,7 +147,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 分页
- public override SelectBuilder PageSplit(SelectBuilder builder, int startRowIndex, int maximumRows)
+ public override SelectBuilder PageSplit(SelectBuilder builder, Int32 startRowIndex, Int32 maximumRows)
{
return MSPageSplit.PageSplit(builder, startRowIndex, maximumRows, false, b => CreateSession().QueryCount(b));
}
@@ -177,7 +177,7 @@ namespace XCode.DataAccessLayer
/// <param name="type">命令类型，默认SQL文本</param>
/// <param name="ps">命令参数</param>
/// <returns>新增行的自动编号</returns>
- public override Int64 InsertAndGetIdentity(string sql, CommandType type = CommandType.Text, params DbParameter[] ps)
+ public override Int64 InsertAndGetIdentity(String sql, CommandType type = CommandType.Text, params DbParameter[] ps)
{
BeginTransaction(IsolationLevel.Serializable);
try
@@ -198,7 +198,7 @@ namespace XCode.DataAccessLayer
/// <param name="collectionName">指定要返回的架构的名称。</param>
/// <param name="restrictionValues">为请求的架构指定一组限制值。</param>
/// <returns></returns>
- public override DataTable GetSchema(string collectionName, string[] restrictionValues)
+ public override DataTable GetSchema(String collectionName, String[] restrictionValues)
{
//sqlce3.5 不支持GetSchema
if (SqlCe.SqlCeProviderVersion < SQLCEVersion.SQLCE40 && collectionName.EqualIgnoreCase(DbMetaDataCollectionNames.MetaDataCollections))
@@ -272,7 +272,7 @@ namespace XCode.DataAccessLayer
return list;
}
- public override string CreateTableSQL(IDataTable table)
+ public override String CreateTableSQL(IDataTable table)
{
var sql = base.CreateTableSQL(table);
@@ -293,7 +293,7 @@ namespace XCode.DataAccessLayer
//sb.Remove(sb.Length - 1, 1);
// sb.Remove涉及内存复制
- for (int i = 0; i < pks.Length; i++)
+ for (Int32 i = 0; i < pks.Length; i++)
{
if (i > 0) sb.Append(", ");
sb.Append(FormatName(pks[i].ColumnName));
@@ -306,7 +306,7 @@ namespace XCode.DataAccessLayer
return sb.ToString();
}
- protected override string GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
+ protected override String GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
{
// 非定义时（修改字段），主键字段没有约束
if (!onlyDefine && field.PrimaryKey) return null;
@@ -334,7 +334,7 @@ namespace XCode.DataAccessLayer
return src;
}
- private string DBTypeToDotNetDataType(string DBType)
+ private String DBTypeToDotNetDataType(String DBType)
{
switch (DBType)
{
@@ -428,7 +428,7 @@ namespace XCode.DataAccessLayer
/// <summary>SqlCe辅助类</summary>
public static class SqlCeHelper
{
- static Dictionary<int, SQLCEVersion> versionDictionary = new Dictionary<int, SQLCEVersion>
+ static Dictionary<Int32, SQLCEVersion> versionDictionary = new Dictionary<Int32, SQLCEVersion>
{
{ 0x73616261, SQLCEVersion.SQLCE20 },
{ 0x002dd714, SQLCEVersion.SQLCE30 },
@@ -439,9 +439,9 @@ namespace XCode.DataAccessLayer
/// <summary>检查给定SqlCe文件的版本</summary>
/// <param name="fileName"></param>
/// <returns></returns>
- public static SQLCEVersion DetermineVersion(string fileName)
+ public static SQLCEVersion DetermineVersion(String fileName)
{
- int versionLONGWORD = 0;
+ Int32 versionLONGWORD = 0;
using (var fs = new FileStream(fileName, FileMode.Open))
{
@@ -460,7 +460,7 @@ namespace XCode.DataAccessLayer
/// <summary>检测SqlServerCe3.5是否安装</summary>
/// <returns></returns>
- public static bool IsV35Installed()
+ public static Boolean IsV35Installed()
{
try
{
@@ -487,7 +487,7 @@ namespace XCode.DataAccessLayer
/// <summary>检测SqlServerCe4是否安装</summary>
/// <returns></returns>
- public static bool IsV40Installed()
+ public static Boolean IsV40Installed()
{
try
{
diff --git a/XCode/DataAccessLayer/Database/SQLite.cs b/XCode/DataAccessLayer/Database/SQLite.cs
index ffe42bb..df5afaa 100644
--- a/XCode/DataAccessLayer/Database/SQLite.cs
+++ b/XCode/DataAccessLayer/Database/SQLite.cs
@@ -63,7 +63,7 @@ namespace XCode.DataAccessLayer
static readonly String MemoryDatabase = ":memory:";
- protected override string OnResolveFile(string file)
+ protected override String OnResolveFile(String file)
{
if (String.IsNullOrEmpty(file) || file.EqualIgnoreCase(MemoryDatabase)) return MemoryDatabase;
@@ -108,7 +108,7 @@ namespace XCode.DataAccessLayer
#endregion
#region 构造
- protected override void OnDispose(bool disposing)
+ protected override void OnDispose(Boolean disposing)
{
base.OnDispose(disposing);
@@ -143,7 +143,7 @@ namespace XCode.DataAccessLayer
/// <param name="maximumRows">最大返回行数，0表示所有行</param>
/// <param name="keyColumn">主键列。用于not in分页</param>
/// <returns></returns>
- public override string PageSplit(string sql, Int32 startRowIndex, Int32 maximumRows, string keyColumn)
+ public override String PageSplit(String sql, Int32 startRowIndex, Int32 maximumRows, String keyColumn)
{
// 从第一行开始，不需要分页
if (startRowIndex <= 0)
@@ -212,7 +212,7 @@ namespace XCode.DataAccessLayer
//return keyWord;
}
- public override string FormatValue(IDataColumn field, object value)
+ public override String FormatValue(IDataColumn field, Object value)
{
if (field.DataType == typeof(Byte[]))
{
@@ -275,7 +275,7 @@ namespace XCode.DataAccessLayer
/// <param name="type">命令类型，默认SQL文本</param>
/// <param name="ps">命令参数</param>
/// <returns>新增行的自动编号</returns>
- public override Int64 InsertAndGetIdentity(string sql, CommandType type = CommandType.Text, params DbParameter[] ps)
+ public override Int64 InsertAndGetIdentity(String sql, CommandType type = CommandType.Text, params DbParameter[] ps)
{
sql += ";Select last_insert_rowid() newid";
return ExecuteScalar<Int64>(CreateCommand(sql, type, ps));
@@ -365,7 +365,7 @@ namespace XCode.DataAccessLayer
}
}
- protected override string GetFieldType(IDataColumn field)
+ protected override String GetFieldType(IDataColumn field)
{
var typeName = base.GetFieldType(field);
@@ -375,7 +375,7 @@ namespace XCode.DataAccessLayer
return typeName;
}
- protected override DataRow[] FindDataType(IDataColumn field, string typeName, bool? isLong)
+ protected override DataRow[] FindDataType(IDataColumn field, String typeName, Boolean? isLong)
{
var drs = base.FindDataType(field, typeName, isLong);
if (drs == null || drs.Length < 1)
@@ -397,7 +397,7 @@ namespace XCode.DataAccessLayer
return drs;
}
- protected override string GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
+ protected override String GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
{
String str = null;
@@ -503,7 +503,7 @@ namespace XCode.DataAccessLayer
}
sb.AppendFormat(" On {0} (", FormatName(index.Table.TableName));
- for (int i = 0; i < index.Columns.Length; i++)
+ for (Int32 i = 0; i < index.Columns.Length; i++)
{
if (i > 0) sb.Append(", ");
sb.Append(FormatName(index.Columns[i]));
@@ -524,12 +524,12 @@ namespace XCode.DataAccessLayer
/// <summary>删除索引方法</summary>
/// <param name="index"></param>
/// <returns></returns>
- public override string DropIndexSQL(IDataIndex index)
+ public override String DropIndexSQL(IDataIndex index)
{
return String.Format("Drop Index {0}", FormatName(index.Name));
}
- protected override string CheckColumnsChange(IDataTable entitytable, IDataTable dbtable, NegativeSetting setting)
+ protected override String CheckColumnsChange(IDataTable entitytable, IDataTable dbtable, NegativeSetting setting)
{
foreach (var item in entitytable.Columns)
{
@@ -632,35 +632,35 @@ namespace XCode.DataAccessLayer
#endregion
#region 表和字段备注
- public override string AddTableDescriptionSQL(IDataTable table)
+ public override String AddTableDescriptionSQL(IDataTable table)
{
// 返回Empty，告诉反向工程，该数据库类型不支持该功能，请不要输出日志
return String.Empty;
}
- public override string DropTableDescriptionSQL(IDataTable table)
+ public override String DropTableDescriptionSQL(IDataTable table)
{
return String.Empty;
}
- public override string AddColumnDescriptionSQL(IDataColumn field)
+ public override String AddColumnDescriptionSQL(IDataColumn field)
{
return String.Empty;
}
- public override string DropColumnDescriptionSQL(IDataColumn field)
+ public override String DropColumnDescriptionSQL(IDataColumn field)
{
return String.Empty;
}
#endregion
#region 默认值
- public override string AddDefaultSQL(IDataColumn field)
+ public override String AddDefaultSQL(IDataColumn field)
{
return String.Empty;
}
- public override string DropDefaultSQL(IDataColumn field)
+ public override String DropDefaultSQL(IDataColumn field)
{
return String.Empty;
}
@@ -684,7 +684,7 @@ namespace XCode.DataAccessLayer
base.CheckTable(entitytable, dbtable, setting);
}
- public override string CompactDatabaseSQL() { return "VACUUM"; }
+ public override String CompactDatabaseSQL() { return "VACUUM"; }
#endregion
}
}
\ No newline at end of file
diff --git a/XCode/DataAccessLayer/Database/SqlServer.cs b/XCode/DataAccessLayer/Database/SqlServer.cs
index acfc846..ac1e495 100644
--- a/XCode/DataAccessLayer/Database/SqlServer.cs
+++ b/XCode/DataAccessLayer/Database/SqlServer.cs
@@ -90,7 +90,7 @@ namespace XCode.DataAccessLayer
/// <returns></returns>
protected override IMetaData OnCreateMetaData() { return new SqlServerMetaData(); }
- public override bool Support(string providerName)
+ public override Boolean Support(String providerName)
{
providerName = providerName.ToLower();
if (providerName.Contains("system.data.sqlclient")) return true;
@@ -215,7 +215,7 @@ namespace XCode.DataAccessLayer
/// </summary>
/// <param name="sql"></param>
/// <returns></returns>
- private string FormatSqlserver2012SQL(string sql)
+ private String FormatSqlserver2012SQL(String sql)
{
SelectBuilder builder = new SelectBuilder();
builder.Parse(sql);
@@ -238,7 +238,7 @@ namespace XCode.DataAccessLayer
return sb.ToString();
}
- public override SelectBuilder PageSplit(SelectBuilder builder, int startRowIndex, int maximumRows)
+ public override SelectBuilder PageSplit(SelectBuilder builder, Int32 startRowIndex, Int32 maximumRows)
{
return MSPageSplit.PageSplit(builder, startRowIndex, maximumRows, IsSQL2005, b => CreateSession().QueryCount(b));
}
@@ -290,7 +290,7 @@ namespace XCode.DataAccessLayer
/// <summary>系统数据库名</summary>
public override String SystemDatabaseName { get { return "master"; } }
- public override string FormatValue(IDataColumn field, object value)
+ public override String FormatValue(IDataColumn field, Object value)
{
TypeCode code = Type.GetTypeCode(field.DataType);
Boolean isNullable = field.Nullable;
@@ -337,7 +337,7 @@ namespace XCode.DataAccessLayer
/// <summary>快速查询单表记录数，稍有偏差</summary>
/// <param name="tableName"></param>
/// <returns></returns>
- public override Int64 QueryCountFast(string tableName)
+ public override Int64 QueryCountFast(String tableName)
{
tableName = tableName.Trim().Trim('[', ']').Trim();
@@ -390,7 +390,7 @@ namespace XCode.DataAccessLayer
/// <param name="type">命令类型，默认SQL文本</param>
/// <param name="ps">命令参数</param>
/// <returns>新增行的自动编号</returns>
- public override Int64 InsertAndGetIdentity(string sql, CommandType type = CommandType.Text, params DbParameter[] ps)
+ public override Int64 InsertAndGetIdentity(String sql, CommandType type = CommandType.Text, params DbParameter[] ps)
{
sql = "SET NOCOUNT ON;" + sql + ";Select SCOPE_IDENTITY()";
return ExecuteScalar<Int64>(CreateCommand(sql, type, ps));
@@ -478,8 +478,8 @@ namespace XCode.DataAccessLayer
field.PrimaryKey = GetDataRowValue<Boolean>(dr2, "主键");
field.NumOfByte = GetDataRowValue<Int32>(dr2, "占用字节数");
field.Description = GetDataRowValue<String>(dr2, "字段说明");
- field.Precision = GetDataRowValue<int>(dr2, "精度");
- field.Scale = GetDataRowValue<int>(dr2, "小数位数");
+ field.Precision = GetDataRowValue<Int32>(dr2, "精度");
+ field.Scale = GetDataRowValue<Int32>(dr2, "小数位数");
}
// 整理默认值
@@ -535,7 +535,7 @@ namespace XCode.DataAccessLayer
return list;
}
- public override string CreateTableSQL(IDataTable table)
+ public override String CreateTableSQL(IDataTable table)
{
String sql = base.CreateTableSQL(table);
@@ -554,7 +554,7 @@ namespace XCode.DataAccessLayer
return sql;
}
- public override string FieldClause(IDataColumn field, bool onlyDefine)
+ public override String FieldClause(IDataColumn field, Boolean onlyDefine)
{
if (!String.IsNullOrEmpty(field.RawType) && field.RawType.Contains("char(-1)"))
{
@@ -576,7 +576,7 @@ namespace XCode.DataAccessLayer
return base.FieldClause(field, onlyDefine);
}
- protected override string GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
+ protected override String GetFieldConstraints(IDataColumn field, Boolean onlyDefine)
{
// 非定义时（修改字段），主键字段没有约束
if (!onlyDefine && field.PrimaryKey) return null;
@@ -589,7 +589,7 @@ namespace XCode.DataAccessLayer
return str;
}
- protected override string GetFormatParam(IDataColumn field, DataRow dr)
+ protected override String GetFormatParam(IDataColumn field, DataRow dr)
{
String str = base.GetFormatParam(field, dr);
if (String.IsNullOrEmpty(str)) return str;
@@ -599,14 +599,14 @@ namespace XCode.DataAccessLayer
return str;
}
- protected override string GetFormatParamItem(IDataColumn field, DataRow dr, string item)
+ protected override String GetFormatParamItem(IDataColumn field, DataRow dr, String item)
{
String pi = base.GetFormatParamItem(field, dr, item);
if (field.DataType == typeof(String) && pi == "-1" && IsSQL2005) return "MAX";
return pi;
}
- protected override string GetFieldDefault(IDataColumn field, bool onlyDefine)
+ protected override String GetFieldDefault(IDataColumn field, Boolean onlyDefine)
{
if (!onlyDefine) return null;
@@ -733,7 +733,7 @@ namespace XCode.DataAccessLayer
// return base.SetSchema(schema, values);
//}
- public override string CreateDatabaseSQL(string dbname, string file)
+ public override String CreateDatabaseSQL(String dbname, String file)
{
String dataPath = (Database as SqlServer).DataPath;
@@ -775,7 +775,7 @@ namespace XCode.DataAccessLayer
return sb.ToString();
}
- public override string DatabaseExistSQL(string dbname)
+ public override String DatabaseExistSQL(String dbname)
{
return String.Format("SELECT * FROM sysdatabases WHERE name = N'{0}'", dbname);
}
@@ -783,13 +783,13 @@ namespace XCode.DataAccessLayer
/// <summary>使用数据架构确定数据库是否存在，因为使用系统视图可能没有权限</summary>
/// <param name="dbname"></param>
/// <returns></returns>
- protected override Boolean DatabaseExist(string dbname)
+ protected override Boolean DatabaseExist(String dbname)
{
var dt = GetSchema(_.Databases, new String[] { dbname });
return dt != null && dt.Rows != null && dt.Rows.Count > 0;
}
- protected override Boolean DropDatabase(string databaseName)
+ protected override Boolean DropDatabase(String databaseName)
{
//return base.DropDatabase(databaseName);
@@ -818,7 +818,7 @@ namespace XCode.DataAccessLayer
return session.Execute(String.Format("Drop Database {0}", FormatName(databaseName))) > 0;
}
- public override string TableExistSQL(String tableName)
+ public override String TableExistSQL(String tableName)
{
if (IsSQL2005)
return String.Format("select * from sysobjects where xtype='U' and name='{0}'", tableName);
@@ -835,7 +835,7 @@ namespace XCode.DataAccessLayer
return dt != null && dt.Rows != null && dt.Rows.Count > 0;
}
- protected override string RenameTable(string tableName, string tempTableName)
+ protected override String RenameTable(String tableName, String tempTableName)
{
if (Version.Major >= 8)
return String.Format("EXECUTE sp_rename N'{0}', N'{1}', 'OBJECT' ", tableName, tempTableName);
@@ -843,7 +843,7 @@ namespace XCode.DataAccessLayer
return base.RenameTable(tableName, tempTableName);
}
- protected override string ReBuildTable(IDataTable entitytable, IDataTable dbtable)
+ protected override String ReBuildTable(IDataTable entitytable, IDataTable dbtable)
{
//return String.Format("SET IDENTITY_INSERT {1} ON;{0};SET IDENTITY_INSERT {1} OFF", base.ReBuildTable(entitytable, dbtable), Database.FormatName(entitytable.TableName));
var sql = base.ReBuildTable(entitytable, dbtable);
@@ -858,7 +858,7 @@ namespace XCode.DataAccessLayer
//list.Insert(1, String.Format("SET IDENTITY_INSERT {0} ON", tableName));
//list.Insert(list.Count - 1, String.Format("SET IDENTITY_INSERT {0} OFF", tableName));
//return String.Join("; " + Environment.NewLine, list.ToArray());
- for (int i = 0; i < ss.Length; i++)
+ for (Int32 i = 0; i < ss.Length; i++)
{
if (ss[i].StartsWithIgnoreCase("Insert Into"))
{
@@ -869,22 +869,22 @@ namespace XCode.DataAccessLayer
return String.Join("; " + Environment.NewLine, ss);
}
- public override string AddTableDescriptionSQL(IDataTable table)
+ public override String AddTableDescriptionSQL(IDataTable table)
{
return String.Format("EXEC dbo.sp_addextendedproperty @name=N'MS_Description', @value=N'{1}' , @level0type=N'{2}',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'{0}'", table.TableName, table.Description, level0type);
}
- public override string DropTableDescriptionSQL(IDataTable table)
+ public override String DropTableDescriptionSQL(IDataTable table)
{
return String.Format("EXEC dbo.sp_dropextendedproperty @name=N'MS_Description', @level0type=N'{1}',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'{0}'", table.TableName, level0type);
}
- public override string AddColumnSQL(IDataColumn field)
+ public override String AddColumnSQL(IDataColumn field)
{
return String.Format("Alter Table {0} Add {1}", FormatName(field.Table.TableName), FieldClause(field, true));
}
- public override string AlterColumnSQL(IDataColumn field, IDataColumn oldfield)
+ public override String AlterColumnSQL(IDataColumn field, IDataColumn oldfield)
{
// 创建为自增，重建表
if (field.Identity && !oldfield.Identity)
@@ -958,12 +958,12 @@ namespace XCode.DataAccessLayer
return sql;
}
- public override string DropIndexSQL(IDataIndex index)
+ public override String DropIndexSQL(IDataIndex index)
{
return String.Format("Drop Index {1}.{0}", FormatName(index.Name), FormatName(index.Table.TableName));
}
- public override string DropColumnSQL(IDataColumn field)
+ public override String DropColumnSQL(IDataColumn field)
{
//删除默认值
String sql = DropDefaultSQL(field);
@@ -977,18 +977,18 @@ namespace XCode.DataAccessLayer
return sql;
}
- public override string AddColumnDescriptionSQL(IDataColumn field)
+ public override String AddColumnDescriptionSQL(IDataColumn field)
{
String sql = String.Format("EXEC dbo.sp_addextendedproperty @name=N'MS_Description', @value=N'{1}' , @level0type=N'{3}',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'{0}', @level2type=N'COLUMN',@level2name=N'{2}'", field.Table.TableName, field.Description, field.ColumnName, level0type);
return sql;
}
- public override string DropColumnDescriptionSQL(IDataColumn field)
+ public override String DropColumnDescriptionSQL(IDataColumn field)
{
return String.Format("EXEC dbo.sp_dropextendedproperty @name=N'MS_Description', @level0type=N'{2}',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'{0}', @level2type=N'COLUMN',@level2name=N'{1}'", field.Table.TableName, field.ColumnName, level0type);
}
- public override string AddDefaultSQL(IDataColumn field)
+ public override String AddDefaultSQL(IDataColumn field)
{
var sql = DropDefaultSQL(field);
if (!String.IsNullOrEmpty(sql)) sql += ";" + Environment.NewLine;
@@ -1000,7 +1000,7 @@ namespace XCode.DataAccessLayer
return sql + ";" + Environment.NewLine + sql2;
}
- string AddDefaultSQLWithNoCheck(IDataColumn field)
+ String AddDefaultSQLWithNoCheck(IDataColumn field)
{
var tc = Type.GetTypeCode(field.DataType);
@@ -1023,7 +1023,7 @@ namespace XCode.DataAccessLayer
return String.Format("Alter Table {0} Add CONSTRAINT DF_{0}_{1} DEFAULT {2} FOR {1}", field.Table.TableName, field.ColumnName, field.Default);
}
- public override string DropDefaultSQL(IDataColumn field)
+ public override String DropDefaultSQL(IDataColumn field)
{
//if (String.IsNullOrEmpty(field.Default)) return String.Empty;
// 默认值有可能是空字符串
diff --git a/XCode/DataAccessLayer/MetaData/DbMetaData_Negative.cs b/XCode/DataAccessLayer/MetaData/DbMetaData_Negative.cs
index 9c10a11..c77feb6 100644
--- a/XCode/DataAccessLayer/MetaData/DbMetaData_Negative.cs
+++ b/XCode/DataAccessLayer/MetaData/DbMetaData_Negative.cs
@@ -243,7 +243,7 @@ namespace XCode.DataAccessLayer
#region 删除列
var sbDelete = new StringBuilder();
- for (int i = dbtable.Columns.Count - 1; i >= 0; i--)
+ for (Int32 i = dbtable.Columns.Count - 1; i >= 0; i--)
{
var item = dbtable.Columns[i];
if (!entitydic.ContainsKey(item.ColumnName.ToLower()))
@@ -325,7 +325,7 @@ namespace XCode.DataAccessLayer
#region 删除索引
if (dbtable.Indexes != null)
{
- for (int i = dbtable.Indexes.Count - 1; i >= 0; i--)
+ for (Int32 i = dbtable.Indexes.Count - 1; i >= 0; i--)
{
var item = dbtable.Indexes[i];
// 计算的索引不需要删除
@@ -1009,7 +1009,7 @@ namespace XCode.DataAccessLayer
sb.Append(FormatName(index.Name));
sb.AppendFormat(" On {0} (", FormatName(index.Table.TableName));
- for (int i = 0; i < index.Columns.Length; i++)
+ for (Int32 i = 0; i < index.Columns.Length; i++)
{
if (i > 0) sb.Append(", ");
sb.Append(FormatName(index.Columns[i]));
diff --git a/XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs b/XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs
index 904fde8..79404ca 100644
--- a/XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs
+++ b/XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs
@@ -407,7 +407,7 @@ namespace XCode.DataAccessLayer
IDataIndex di = table.CreateIndex();
di.Name = name;
- if (TryGetDataRowValue<string>(dr, _.ColumnName, out name) && !String.IsNullOrEmpty(name))
+ if (TryGetDataRowValue<String>(dr, _.ColumnName, out name) && !String.IsNullOrEmpty(name))
di.Columns = name.Split(new String[] { "," }, StringSplitOptions.RemoveEmptyEntries);
else if (_indexColumns != null)
{
@@ -421,7 +421,7 @@ namespace XCode.DataAccessLayer
DataRow[] dics = _indexColumns.Select(String.Format("{0}='{1}' And {2}='{3}'", _.TalbeName, table.TableName, _.IndexName, di.Name), orderby);
if (dics != null && dics.Length > 0)
{
- List<String> ns = new List<string>();
+ List<String> ns = new List<String>();
foreach (DataRow item in dics)
{
String dcname = null;
@@ -695,7 +695,7 @@ namespace XCode.DataAccessLayer
var sb = new StringBuilder();
sb.Append("(");
var pms = ps.Split(new Char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
- for (int i = 0; i < pms.Length; i++)
+ for (Int32 i = 0; i < pms.Length; i++)
{
if (sb.Length > 1) sb.Append(",");
sb.Append(GetFormatParamItem(field, dr, pms[i]));
diff --git a/XCode/DataAccessLayer/MetaData/DbMetaData.cs b/XCode/DataAccessLayer/MetaData/DbMetaData.cs
index dce323c..1118173 100644
--- a/XCode/DataAccessLayer/MetaData/DbMetaData.cs
+++ b/XCode/DataAccessLayer/MetaData/DbMetaData.cs
@@ -96,7 +96,7 @@ namespace XCode.DataAccessLayer
/// <param name="collectionName">指定要返回的架构的名称。</param>
/// <param name="restrictionValues">为请求的架构指定一组限制值。</param>
/// <returns></returns>
- public DataTable GetSchema(string collectionName, string[] restrictionValues)
+ public DataTable GetSchema(String collectionName, String[] restrictionValues)
{
// 如果不是MetaDataCollections，并且MetaDataCollections中没有该集合，则返回空
if (!collectionName.EqualIgnoreCase(DbMetaDataCollectionNames.MetaDataCollections))
diff --git a/XCode/DataAccessLayer/Model/IModelResolver.cs b/XCode/DataAccessLayer/Model/IModelResolver.cs
index d63e9d3..4a476a5 100644
--- a/XCode/DataAccessLayer/Model/IModelResolver.cs
+++ b/XCode/DataAccessLayer/Model/IModelResolver.cs
@@ -217,7 +217,7 @@ namespace XCode.DataAccessLayer
sb.Append("_");
sb.Append(di.Table.TableName);
}
- for (int i = 0; i < di.Columns.Length; i++)
+ for (Int32 i = 0; i < di.Columns.Length; i++)
{
sb.Append("_");
sb.Append(di.Columns[i]);
diff --git a/XCode/DataAccessLayer/Model/ModelHelper.cs b/XCode/DataAccessLayer/Model/ModelHelper.cs
index 937d796..90d7655 100644
--- a/XCode/DataAccessLayer/Model/ModelHelper.cs
+++ b/XCode/DataAccessLayer/Model/ModelHelper.cs
@@ -412,7 +412,7 @@ namespace XCode.DataAccessLayer
{
var ss = v.Split(new String[] { "," }, StringSplitOptions.RemoveEmptyEntries);
// 去除前后空格，因为手工修改xml的时候，可能在逗号后加上空格
- for (int i = 0; i < ss.Length; i++)
+ for (Int32 i = 0; i < ss.Length; i++)
{
ss[i] = ss[i].Trim();
}
@@ -625,7 +625,7 @@ namespace XCode.DataAccessLayer
//if (resetColumnID) src.Columns.ForEach((it, i) => it.ID = i + 1);
if (resetColumnID)
{
- for (int i = 0; i < src.Columns.Count; i++)
+ for (Int32 i = 0; i < src.Columns.Count; i++)
{
src.Columns[i].ID = i + 1;
}
diff --git a/XCode/DataAccessLayer/Model/XField.cs b/XCode/DataAccessLayer/Model/XField.cs
index 482eea4..e729698 100644
--- a/XCode/DataAccessLayer/Model/XField.cs
+++ b/XCode/DataAccessLayer/Model/XField.cs
@@ -183,7 +183,7 @@ namespace XCode.DataAccessLayer
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
if (!String.IsNullOrEmpty(DisplayName) && DisplayName != Name)
return String.Format("ID={0} Name={1} FieldType={2} RawType={3} DisplayName={4}", ID, ColumnName, FieldType, RawType, DisplayName);
@@ -195,7 +195,7 @@ namespace XCode.DataAccessLayer
#region ICloneable 成员
/// <summary>克隆</summary>
/// <returns></returns>
- object ICloneable.Clone()
+ Object ICloneable.Clone()
{
return Clone(Table);
}
diff --git a/XCode/DataAccessLayer/Model/XIndex.cs b/XCode/DataAccessLayer/Model/XIndex.cs
index dd43c4d..d970a86 100644
--- a/XCode/DataAccessLayer/Model/XIndex.cs
+++ b/XCode/DataAccessLayer/Model/XIndex.cs
@@ -71,7 +71,7 @@ namespace XCode.DataAccessLayer
#region ICloneable 成员
/// <summary>克隆</summary>
/// <returns></returns>
- object ICloneable.Clone() { return Clone(Table); }
+ Object ICloneable.Clone() { return Clone(Table); }
/// <summary>克隆</summary>
/// <param name="table"></param>
@@ -88,7 +88,7 @@ namespace XCode.DataAccessLayer
#region 辅助
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
if (Columns != null && Columns.Length > 0)
return String.Format("{0}=>{1} {2}", Name, String.Join(",", Columns), Unique ? "U" : "");
diff --git a/XCode/DataAccessLayer/Model/XRelation.cs b/XCode/DataAccessLayer/Model/XRelation.cs
index fa24467..5dc8434 100644
--- a/XCode/DataAccessLayer/Model/XRelation.cs
+++ b/XCode/DataAccessLayer/Model/XRelation.cs
@@ -50,7 +50,7 @@ namespace XCode.DataAccessLayer
#region ICloneable 成员
/// <summary>克隆</summary>
/// <returns></returns>
- object ICloneable.Clone()
+ Object ICloneable.Clone()
{
return Clone(Table);
}
@@ -70,7 +70,7 @@ namespace XCode.DataAccessLayer
#region 辅助
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
return String.Format("{0}=>{1}.{2} {3}", Column, RelationTable, RelationColumn, Unique ? "U" : "");
}
diff --git a/XCode/DataAccessLayer/Model/XTable.cs b/XCode/DataAccessLayer/Model/XTable.cs
index 73217eb..337e725 100644
--- a/XCode/DataAccessLayer/Model/XTable.cs
+++ b/XCode/DataAccessLayer/Model/XTable.cs
@@ -228,7 +228,7 @@ namespace XCode.DataAccessLayer
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
if (String.IsNullOrEmpty(DisplayName))
return Name;
@@ -256,7 +256,7 @@ namespace XCode.DataAccessLayer
#region ICloneable 成员
/// <summary>克隆</summary>
/// <returns></returns>
- object ICloneable.Clone() { return Clone(); }
+ Object ICloneable.Clone() { return Clone(); }
/// <summary>克隆</summary>
/// <returns></returns>
diff --git a/XCode/DataAccessLayer/MSPageSplit.cs b/XCode/DataAccessLayer/MSPageSplit.cs
index cad427c..64e3b91 100644
--- a/XCode/DataAccessLayer/MSPageSplit.cs
+++ b/XCode/DataAccessLayer/MSPageSplit.cs
@@ -172,7 +172,7 @@ namespace XCode.DataAccessLayer
// 把排序反过来
var isdescs2 = new Boolean[keys.Length];
- for (int i = 0; i < keys.Length; i++)
+ for (Int32 i = 0; i < keys.Length; i++)
{
if (isdescs != null && isdescs.Length > i)
isdescs2[i] = !isdescs[i];
diff --git a/XCode/DataAccessLayer/SelectBuilder.cs b/XCode/DataAccessLayer/SelectBuilder.cs
index a6f6336..295116b 100644
--- a/XCode/DataAccessLayer/SelectBuilder.cs
+++ b/XCode/DataAccessLayer/SelectBuilder.cs
@@ -68,7 +68,7 @@ namespace XCode.DataAccessLayer
// 把排序反过来
Boolean[] isdescs = new Boolean[_Keys.Length];
- for (int i = 0; i < isdescs.Length; i++)
+ for (Int32 i = 0; i < isdescs.Length; i++)
{
if (_IsDescs != null && _IsDescs.Length > i)
isdescs[i] = !_IsDescs[i];
@@ -426,7 +426,7 @@ $";
String[] keys = new String[ss.Length];
isdescs = new Boolean[ss.Length];
- for (int i = 0; i < ss.Length; i++)
+ for (Int32 i = 0; i < ss.Length; i++)
{
String[] ss2 = ss[i].Trim().Split(' ');
// 拆分名称和排序，不知道是否存在多余一个空格的情况
@@ -450,7 +450,7 @@ $";
if (keys.Length == 1) return isdescs != null && isdescs.Length > 0 && isdescs[0] ? keys[0] + " Desc" : keys[0];
var sb = new StringBuilder();
- for (int i = 0; i < keys.Length; i++)
+ for (Int32 i = 0; i < keys.Length; i++)
{
if (sb.Length > 0) sb.Append(", ");
diff --git a/XCode/DataAccessLayer/XDbConnectionStringBuilder.cs b/XCode/DataAccessLayer/XDbConnectionStringBuilder.cs
index 627a45a..2a1cd5d 100644
--- a/XCode/DataAccessLayer/XDbConnectionStringBuilder.cs
+++ b/XCode/DataAccessLayer/XDbConnectionStringBuilder.cs
@@ -137,7 +137,7 @@ namespace XCode.DataAccessLayer
#region 辅助
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString() { return ConnectionString; }
+ public override String ToString() { return ConnectionString; }
#endregion
}
}
\ No newline at end of file
diff --git a/XCode/Entity/Entity_Operate.cs b/XCode/Entity/Entity_Operate.cs
index f8c3272..8fe5af2 100644
--- a/XCode/Entity/Entity_Operate.cs
+++ b/XCode/Entity/Entity_Operate.cs
@@ -133,8 +133,8 @@ namespace XCode
}
}
- private static void DoAction(Action<IEntityList> action, string whereClause, string orderClause, string selects, int batchSize,
- int maxCount)
+ private static void DoAction(Action<IEntityList> action, String whereClause, String orderClause, String selects, Int32 batchSize,
+ Int32 maxCount)
{
var count = Entity<TEntity>.FindCount(whereClause, orderClause, selects, 0, 0);
var total = maxCount <= 0 ? count : Math.Min(maxCount, count);
@@ -293,7 +293,7 @@ namespace XCode
/// <param name="startRowIndex">开始行，0表示第一行</param>
/// <param name="maximumRows">最大返回行数，0表示所有行</param>
/// <returns>总行数</returns>
- public virtual Int32 FindCountByName(String name, Object value, String orderClause, int startRowIndex, int maximumRows)
+ public virtual Int32 FindCountByName(String name, Object value, String orderClause, Int32 startRowIndex, Int32 maximumRows)
{
return Entity<TEntity>.FindCountByName(name, value, orderClause, startRowIndex, maximumRows);
}
diff --git a/XCode/Entity/Entity.cs b/XCode/Entity/Entity.cs
index cccad48..72ae859 100644
--- a/XCode/Entity/Entity.cs
+++ b/XCode/Entity/Entity.cs
@@ -354,7 +354,7 @@ namespace XCode
{
var sb = new StringBuilder();
String name = null;
- for (int i = 0; i < names.Length; i++)
+ for (Int32 i = 0; i < names.Length; i++)
{
if (sb.Length > 0) sb.Append("，");
@@ -382,7 +382,7 @@ namespace XCode
// 根据指定键查找所有符合的数据，然后比对。
// 当然，也可以通过指定键和主键配合，找到拥有指定键，但是不是当前主键的数据，只查记录数。
Object[] values = new Object[names.Length];
- for (int i = 0; i < names.Length; i++)
+ for (Int32 i = 0; i < names.Length; i++)
{
values[i] = this[names[i]];
}
@@ -505,8 +505,8 @@ namespace XCode
}
}
- private static void DoAction(Action<EntityList<TEntity>> action, string whereClause, string orderClause, string selects, int batchSize,
- int maxCount)
+ private static void DoAction(Action<EntityList<TEntity>> action, String whereClause, String orderClause, String selects, Int32 batchSize,
+ Int32 maxCount)
{
var count = FindCount(whereClause, orderClause, selects, 0, 0);
var total = maxCount <= 0 ? count : Math.Min(maxCount, count);
@@ -1005,7 +1005,7 @@ namespace XCode
/// <param name="startRowIndex">开始行，0表示第一行。这里无意义，仅仅为了保持与FindAll相同的方法签名</param>
/// <param name="maximumRows">最大返回行数，0表示所有行。这里无意义，仅仅为了保持与FindAll相同的方法签名</param>
/// <returns>总行数</returns>
- public static Int32 FindCountByName(String name, Object value, String orderClause, int startRowIndex, int maximumRows)
+ public static Int32 FindCountByName(String name, Object value, String orderClause, Int32 startRowIndex, Int32 maximumRows)
{
if (String.IsNullOrEmpty(name))
return FindCount(null, null, null, 0, 0);
@@ -1105,7 +1105,7 @@ namespace XCode
var ks = keys.Split(" ");
- for (int i = 0; i < ks.Length; i++)
+ for (Int32 i = 0; i < ks.Length; i++)
{
if (!ks[i].IsNullOrWhiteSpace()) exp &= func(ks[i].Trim(), fields);
}
@@ -1454,7 +1454,7 @@ namespace XCode
#region 其它
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
// 优先主字段作为实体对象的字符串显示
if (Meta.Master != null && Meta.Master != Meta.Unique) return this[Meta.Master.Name] + "";
@@ -1568,7 +1568,7 @@ namespace XCode
/// <param name="fieldName"></param>
/// <param name="newValue"></param>
/// <returns></returns>
- protected override bool OnPropertyChanging(string fieldName, object newValue)
+ protected override Boolean OnPropertyChanging(String fieldName, Object newValue)
{
// 如果返回true，表示不相同，基类已经设置了脏数据
if (base.OnPropertyChanging(fieldName, newValue)) return true;
diff --git a/XCode/Entity/EntityBase_Interface.cs b/XCode/Entity/EntityBase_Interface.cs
index 15cc5fd..853ffbf 100644
--- a/XCode/Entity/EntityBase_Interface.cs
+++ b/XCode/Entity/EntityBase_Interface.cs
@@ -101,13 +101,13 @@ namespace XCode
return atts;
}
- string ICustomTypeDescriptor.GetClassName()
+ String ICustomTypeDescriptor.GetClassName()
{
//return TypeDescriptor.GetClassName(this, true);
return this.GetType().FullName;
}
- string ICustomTypeDescriptor.GetComponentName()
+ String ICustomTypeDescriptor.GetComponentName()
{
return TypeDescriptor.GetComponentName(this, true);
}
@@ -127,7 +127,7 @@ namespace XCode
return TypeDescriptor.GetDefaultProperty(this, true);
}
- object ICustomTypeDescriptor.GetEditor(Type editorBaseType)
+ Object ICustomTypeDescriptor.GetEditor(Type editorBaseType)
{
return TypeDescriptor.GetEditor(this, editorBaseType, true);
}
@@ -152,7 +152,7 @@ namespace XCode
return Fix(this.GetType(), TypeDescriptor.GetProperties(this, true));
}
- object ICustomTypeDescriptor.GetPropertyOwner(PropertyDescriptor pd)
+ Object ICustomTypeDescriptor.GetPropertyOwner(PropertyDescriptor pd)
{
return this;
}
@@ -164,7 +164,7 @@ namespace XCode
var factory = EntityFactory.CreateOperate(type);
// 准备字段集合
- var dic = new Dictionary<string, FieldItem>(StringComparer.OrdinalIgnoreCase);
+ var dic = new Dictionary<String, FieldItem>(StringComparer.OrdinalIgnoreCase);
foreach (var item in factory.Fields)
{
dic.Add(item.Name, item);
diff --git a/XCode/Entity/EntityList.cs b/XCode/Entity/EntityList.cs
index 5d5ab8d..1ba3eb9 100644
--- a/XCode/Entity/EntityList.cs
+++ b/XCode/Entity/EntityList.cs
@@ -75,7 +75,7 @@ namespace XCode
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
return String.Format("EntityList<{0}>[Count={1}]", typeof(T).Name, Count);
}
@@ -197,7 +197,7 @@ namespace XCode
// 特殊处理整数类型，避免出现相同值不同整型而导致结果不同
var ts = new Boolean[values.Length];
var vs = new Int64[values.Length];
- for (int i = 0; i < values.Length; i++)
+ for (Int32 i = 0; i < values.Length; i++)
{
field = Factory.Table.FindByName(names[i]);
if (field != null)
@@ -216,13 +216,13 @@ namespace XCode
}
var list = new EntityList<T>();
- for (int k = 0; k < Count; k++)
+ for (Int32 k = 0; k < Count; k++)
{
var item = this[k];
if (item == null) continue;
var b = true;
- for (int i = 0; i < names.Length; i++)
+ for (Int32 i = 0; i < names.Length; i++)
{
var iv = item[names[i]];
if (!Object.Equals(iv, values[i]) &&
@@ -420,9 +420,9 @@ namespace XCode
return count;
}
- private int DoAction(Func<T, int> func, int count)
+ private Int32 DoAction(Func<T, Int32> func, Int32 count)
{
- for (int i = 0; i < Count; i++)
+ for (Int32 i = 0; i < Count; i++)
{
count += func(this[i]);
}
@@ -463,7 +463,7 @@ namespace XCode
if (Count < 1) return list;
var type = typeof(TResult);
- for (int i = 0; i < Count; i++)
+ for (Int32 i = 0; i < Count; i++)
{
var item = this[i];
if (item == null) continue;
@@ -499,7 +499,7 @@ namespace XCode
if (Count < 1) return null;
var sb = new StringBuilder(Count * 10);
- for (int i = 0; i < Count; i++)
+ for (Int32 i = 0; i < Count; i++)
{
if (sb.Length > 0) sb.Append(separator);
sb.Append("" + this[i]);
@@ -548,7 +548,7 @@ namespace XCode
{
if (Count < 1) return this;
- for (int i = 0; i < names.Length; i++)
+ for (Int32 i = 0; i < names.Length; i++)
{
var name = names[i];
var isDesc = isDescs[i];
@@ -560,7 +560,7 @@ namespace XCode
Sort((item1, item2) =>
{
// 逐层对比
- for (int i = 0; i < names.Length; i++)
+ for (Int32 i = 0; i < names.Length; i++)
{
String name = names[i];
Boolean isDesc = isDescs[i];
@@ -619,7 +619,7 @@ namespace XCode
// 要先排序
Sort(sortKey, true);
- for (int i = 0; i < Count; i++)
+ for (Int32 i = 0; i < Count; i++)
{
Int32 s = Count - i;
// 当前项，排序增加。原来比较实体相等有问题，也许新旧实体类不对应，现在改为比较主键值
@@ -649,7 +649,7 @@ namespace XCode
// 要先排序
Sort(sortKey, true);
- for (int i = 0; i < Count; i++)
+ for (Int32 i = 0; i < Count; i++)
{
Int32 s = Count - i;
// 当前项，排序减少
@@ -786,7 +786,7 @@ namespace XCode
// 判断是否有数据，即使没有数据，也需要创建一个空格DataTable
if (Count > 0)
{
- for (int i = 0; i < Count; i++)
+ for (Int32 i = 0; i < Count; i++)
{
var entity = this[i];
var dr = dt.NewRow();
@@ -809,7 +809,7 @@ namespace XCode
return dt;
}
- void dt_TableNewRow(object sender, DataTableNewRowEventArgs e)
+ void dt_TableNewRow(Object sender, DataTableNewRowEventArgs e)
{
var entity = Factory.FindByKeyForEdit(null);
var dr = e.Row;
@@ -819,7 +819,7 @@ namespace XCode
}
}
- void dt_RowChanging(object sender, DataRowChangeEventArgs e)
+ void dt_RowChanging(Object sender, DataRowChangeEventArgs e)
{
var entity = Factory.Create();
var dr = e.Row;
@@ -840,7 +840,7 @@ namespace XCode
}
}
- void dt_RowDeleting(object sender, DataRowChangeEventArgs e)
+ void dt_RowDeleting(Object sender, DataRowChangeEventArgs e)
{
var entity = Factory.Create();
var dr = e.Row;
@@ -927,7 +927,7 @@ namespace XCode
#endregion
#region IListSource接口
- bool IListSource.ContainsListCollection { get { return Count > 0; } }
+ Boolean IListSource.ContainsListCollection { get { return Count > 0; } }
IList IListSource.GetList()
{
@@ -980,7 +980,7 @@ namespace XCode
#endregion
#region IList<IEntity> 成员
- private static bool IsCompatibleObject(IEntity value)
+ private static Boolean IsCompatibleObject(IEntity value)
{
if (!(value is T) && value != null || typeof(T).IsValueType) return false;
return true;
@@ -991,19 +991,19 @@ namespace XCode
if (!IsCompatibleObject(value)) throw new ArgumentException(String.Format("期待{0}类型的参数！", typeof(T).Name), "value");
}
- int IList<IEntity>.IndexOf(IEntity item)
+ Int32 IList<IEntity>.IndexOf(IEntity item)
{
if (!IsCompatibleObject(item)) return -1;
return IndexOf((T)item);
}
- void IList<IEntity>.Insert(int index, IEntity item)
+ void IList<IEntity>.Insert(Int32 index, IEntity item)
{
VerifyValueType(item);
Insert(index, (T)item);
}
- IEntity IList<IEntity>.this[int index] { get { return this[index]; } set { VerifyValueType(value); this[index] = (T)value; } }
+ IEntity IList<IEntity>.this[Int32 index] { get { return this[index]; } set { VerifyValueType(value); this[index] = (T)value; } }
#endregion
#region ICollection<IEntity> 成员
@@ -1014,29 +1014,29 @@ namespace XCode
Add((T)item);
}
- bool ICollection<IEntity>.Contains(IEntity item)
+ Boolean ICollection<IEntity>.Contains(IEntity item)
{
if (!IsCompatibleObject(item)) return false;
return Contains((T)item);
}
- void ICollection<IEntity>.CopyTo(IEntity[] array, int arrayIndex)
+ void ICollection<IEntity>.CopyTo(IEntity[] array, Int32 arrayIndex)
{
if (array == null || array.Length == 0) return;
VerifyValueType(array[0]);
var arr = new T[array.Length];
CopyTo(arr, arrayIndex);
- for (int i = arrayIndex; i < array.Length; i++)
+ for (Int32 i = arrayIndex; i < array.Length; i++)
{
array[i] = arr[i];
}
}
- bool ICollection<IEntity>.IsReadOnly { get { return (this as ICollection<T>).IsReadOnly; } }
+ Boolean ICollection<IEntity>.IsReadOnly { get { return (this as ICollection<T>).IsReadOnly; } }
- bool ICollection<IEntity>.Remove(IEntity item)
+ Boolean ICollection<IEntity>.Remove(IEntity item)
{
if (!IsCompatibleObject(item)) return false;
@@ -1045,7 +1045,7 @@ namespace XCode
#endregion
#region IEnumerable<IEntity> 成员
- IEnumerator<IEntity> IEnumerable<IEntity>.GetEnumerator() { for (int i = 0; i < Count; i++) yield return this[i]; }
+ IEnumerator<IEntity> IEnumerable<IEntity>.GetEnumerator() { for (Int32 i = 0; i < Count; i++) yield return this[i]; }
#endregion
#region 克隆接口
@@ -1054,7 +1054,7 @@ namespace XCode
/// <returns></returns>
public EntityList<T> Clone() { return new EntityList<T>(this); }
- object ICloneable.Clone() { return Clone(); }
+ Object ICloneable.Clone() { return Clone(); }
#endregion
}
}
\ No newline at end of file
diff --git a/XCode/Entity/EntityListView.cs b/XCode/Entity/EntityListView.cs
index 8de4586..30606e8 100644
--- a/XCode/Entity/EntityListView.cs
+++ b/XCode/Entity/EntityListView.cs
@@ -27,7 +27,7 @@ namespace XCode
/// <summary>已重载。新增元素时，触发事件改变</summary>
/// <param name="index"></param>
/// <param name="value">数值</param>
- public override void Insert(int index, T value)
+ public override void Insert(Int32 index, T value)
{
base.Insert(index, value);
@@ -36,7 +36,7 @@ namespace XCode
/// <summary>已重载。从列表中删除项时，同时从数据库中删除实体</summary>
/// <param name="index"></param>
- public override void RemoveAt(int index)
+ public override void RemoveAt(Int32 index)
{
T entity = this[index];
entity.Delete();
@@ -58,7 +58,7 @@ namespace XCode
return EntityBase.Fix(type, pdc);
}
- string ITypedList.GetListName(PropertyDescriptor[] listAccessors) { return null; }
+ String ITypedList.GetListName(PropertyDescriptor[] listAccessors) { return null; }
#endregion
#region IBindingList接口
@@ -133,7 +133,7 @@ namespace XCode
#region 方法
void IBindingList.AddIndex(PropertyDescriptor property) { }
- object IBindingList.AddNew()
+ Object IBindingList.AddNew()
{
T entity = (T)Factory.Create();
base.Add(entity);
@@ -155,7 +155,7 @@ namespace XCode
OnListChanged(ResetEventArgs);
}
- int IBindingList.Find(PropertyDescriptor property, object key)
+ Int32 IBindingList.Find(PropertyDescriptor property, Object key)
{
var list = InnerList as EntityList<T>;
if (list == null || list.Count < 1) return -1;
@@ -206,7 +206,7 @@ namespace XCode
var list = InnerList as EntityList<T>;
if (list == null || list.Count < 1) return;
- var ns = new List<string>();
+ var ns = new List<String>();
var ds = new List<Boolean>();
foreach (ListSortDescription item in sorts)
{
@@ -221,8 +221,8 @@ namespace XCode
OnListChanged(ResetEventArgs);
}
- string _Filter;
- string IBindingListView.Filter { get { return _Filter; } set { _Filter = value; } }
+ String _Filter;
+ String IBindingListView.Filter { get { return _Filter; } set { _Filter = value; } }
void IBindingListView.RemoveFilter() { _Filter = ""; }
@@ -241,14 +241,14 @@ namespace XCode
#endregion
#region ICancelAddNew 成员
- void ICancelAddNew.CancelNew(int itemIndex)
+ void ICancelAddNew.CancelNew(Int32 itemIndex)
{
if (itemIndex < 0 || itemIndex >= Count) return;
RemoveAt(itemIndex);
}
- void ICancelAddNew.EndNew(int itemIndex)
+ void ICancelAddNew.EndNew(Int32 itemIndex)
{
if (itemIndex < 0 || itemIndex >= Count) return;
diff --git a/XCode/Entity/EntityQueue.cs b/XCode/Entity/EntityQueue.cs
index 4ea168a..87e30b8 100644
--- a/XCode/Entity/EntityQueue.cs
+++ b/XCode/Entity/EntityQueue.cs
@@ -200,7 +200,7 @@ namespace XCode
var k = 0;
foreach (var item in list)
{
- Completed(this, new EventArgs<IEntity, int>(item, rs[k++]));
+ Completed(this, new EventArgs<IEntity, Int32>(item, rs[k++]));
}
}
}
diff --git a/XCode/Entity/EntitySession.cs b/XCode/Entity/EntitySession.cs
index 92add29..3f04991 100644
--- a/XCode/Entity/EntitySession.cs
+++ b/XCode/Entity/EntitySession.cs
@@ -83,7 +83,7 @@ namespace XCode
Key = connName + "###" + tableName;
}
- private static DictionaryCache<String, EntitySession<TEntity>> _es = new DictionaryCache<string, EntitySession<TEntity>>(StringComparer.OrdinalIgnoreCase);
+ private static DictionaryCache<String, EntitySession<TEntity>> _es = new DictionaryCache<String, EntitySession<TEntity>>(StringComparer.OrdinalIgnoreCase);
/// <summary>创建指定表名连接名的会话</summary>
/// <param name="connName"></param>
/// <param name="tableName"></param>
diff --git a/XCode/Entity/EntityTransaction.cs b/XCode/Entity/EntityTransaction.cs
index 20df7d7..7be734f 100644
--- a/XCode/Entity/EntityTransaction.cs
+++ b/XCode/Entity/EntityTransaction.cs
@@ -102,7 +102,7 @@ namespace XCode
/// <summary>子类重载实现资源释放逻辑时必须首先调用基类方法</summary>
/// <param name="disposing">从Dispose调用（释放所有资源）还是析构函数调用（释放非托管资源）。
/// 因为该方法只会被调用一次，所以该参数的意义不太大。</param>
- protected override void OnDispose(bool disposing)
+ protected override void OnDispose(Boolean disposing)
{
base.OnDispose(disposing);
diff --git a/XCode/Entity/IEntityModule.cs b/XCode/Entity/IEntityModule.cs
index 59e2d52..5c7bd51 100644
--- a/XCode/Entity/IEntityModule.cs
+++ b/XCode/Entity/IEntityModule.cs
@@ -89,15 +89,15 @@ namespace XCode
void ICollection<IEntityModule>.Clear() { Modules.Clear(); }
- bool ICollection<IEntityModule>.Contains(IEntityModule item) { return Modules.Contains(item); }
+ Boolean ICollection<IEntityModule>.Contains(IEntityModule item) { return Modules.Contains(item); }
- void ICollection<IEntityModule>.CopyTo(IEntityModule[] array, int arrayIndex) { Modules.CopyTo(array, arrayIndex); }
+ void ICollection<IEntityModule>.CopyTo(IEntityModule[] array, Int32 arrayIndex) { Modules.CopyTo(array, arrayIndex); }
- int ICollection<IEntityModule>.Count { get { return Modules.Count; } }
+ Int32 ICollection<IEntityModule>.Count { get { return Modules.Count; } }
- bool ICollection<IEntityModule>.IsReadOnly { get { return (Modules as ICollection<IEntityModule>).IsReadOnly; } }
+ Boolean ICollection<IEntityModule>.IsReadOnly { get { return (Modules as ICollection<IEntityModule>).IsReadOnly; } }
- bool ICollection<IEntityModule>.Remove(IEntityModule item) { return Modules.Remove(item); }
+ Boolean ICollection<IEntityModule>.Remove(IEntityModule item) { return Modules.Remove(item); }
#endregion
#region IEnumerable<IEntityModule> 成员
@@ -127,7 +127,7 @@ namespace XCode
/// <param name="entity"></param>
/// <param name="isNew"></param>
/// <returns></returns>
- public virtual Boolean Valid(IEntity entity, bool isNew) { return true; }
+ public virtual Boolean Valid(IEntity entity, Boolean isNew) { return true; }
#endregion
#region 辅助
diff --git a/XCode/Entity/IEntityOperate.cs b/XCode/Entity/IEntityOperate.cs
index 01a5380..64ad265 100644
--- a/XCode/Entity/IEntityOperate.cs
+++ b/XCode/Entity/IEntityOperate.cs
@@ -219,7 +219,7 @@ namespace XCode
/// <param name="startRowIndex">开始行，0表示第一行</param>
/// <param name="maximumRows">最大返回行数，0表示所有行</param>
/// <returns>总行数</returns>
- Int32 FindCountByName(String name, Object value, String orderClause, int startRowIndex, int maximumRows);
+ Int32 FindCountByName(String name, Object value, String orderClause, Int32 startRowIndex, Int32 maximumRows);
#endregion
#region 导入导出XML/Json
diff --git "a/XCode/Membership/\350\217\234\345\215\225.Biz.cs" "b/XCode/Membership/\350\217\234\345\215\225.Biz.cs"
index 047bd51..a9ea0e0 100644
--- "a/XCode/Membership/\350\217\234\345\215\225.Biz.cs"
+++ "b/XCode/Membership/\350\217\234\345\215\225.Biz.cs"
@@ -58,7 +58,7 @@ namespace XCode.Membership
/// <summary>验证数据，通过抛出异常的方式提示验证失败。</summary>
/// <param name="isNew">是否新数据</param>
- public override void Valid(bool isNew)
+ public override void Valid(Boolean isNew)
{
if (String.IsNullOrEmpty(Name)) throw new ArgumentNullException(__.Name, _.Name.DisplayName + "不能为空！");
@@ -69,13 +69,13 @@ namespace XCode.Membership
/// <summary>已重载。调用Save时写日志，而调用Insert和Update时不写日志</summary>
/// <returns></returns>
- public override int Save()
+ public override Int32 Save()
{
// 先处理一次，否则可能因为别的字段没有修改而没有脏数据
SavePermission();
// 更改日志保存顺序，先保存才能获取到id
- string action = "添加";
+ String action = "添加";
var isNew = IsNullKey;
if (!isNew)
{
@@ -88,7 +88,7 @@ namespace XCode.Membership
LogProvider.Provider.WriteLog(action, this);
}
- int result = base.Save();
+ Int32 result = base.Save();
if (isNew) LogProvider.Provider.WriteLog(action, this);
@@ -97,7 +97,7 @@ namespace XCode.Membership
/// <summary>已重载。</summary>
/// <returns></returns>
- public override int Delete()
+ public override Int32 Delete()
{
LogProvider.Provider.WriteLog("删除", this);
@@ -115,7 +115,7 @@ namespace XCode.Membership
/// <summary>如果Permission被修改，则重新加载</summary>
/// <param name="fieldName"></param>
- protected override void OnPropertyChanged(string fieldName)
+ protected override void OnPropertyChanged(String fieldName)
{
base.OnPropertyChanged(fieldName);
@@ -432,7 +432,7 @@ namespace XCode.Membership
//获取层级
var ss = dirPath.Split("\\");
var sb = new StringBuilder();
- for (int i = 0; i < ss.Length; i++)
+ for (Int32 i = 0; i < ss.Length; i++)
{
sb.Append("../");
}
@@ -443,7 +443,7 @@ namespace XCode.Membership
}
/// <summary>非业务的目录列表</summary>
- static HashSet<String> _NotBizDirs = new HashSet<string>(
+ static HashSet<String> _NotBizDirs = new HashSet<String>(
new String[] {
"Frame", "Asc", "Ascx", "images", "js", "css", "scripts" ,
"Bin","App_Code","App_Data","Config","Log"
@@ -581,7 +581,7 @@ namespace XCode.Membership
#region 辅助
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
var path = GetFullPath(true, "\\", e => e.FriendName);
if (!String.IsNullOrEmpty(path))
@@ -597,7 +597,7 @@ namespace XCode.Membership
/// <param name="separator">分隔符</param>
/// <param name="func">回调</param>
/// <returns></returns>
- string IMenu.GetFullPath(bool includeSelf, string separator, Func<IMenu, string> func)
+ String IMenu.GetFullPath(Boolean includeSelf, String separator, Func<IMenu, String> func)
{
Func<TEntity, String> d = null;
if (func != null) d = item => func(item);
@@ -646,7 +646,7 @@ namespace XCode.Membership
if (ss[0] == "~") max++;
// 寻找当前所属菜单，路径倒序，从最长Url路径查起
- for (int i = max; i > 0 && menu == null; i--)
+ for (Int32 i = max; i > 0 && menu == null; i--)
{
var url = ss.Take(i).Join("/");
menu = FindByUrl(url);
@@ -797,7 +797,7 @@ namespace XCode.Membership
// 所有都是新增菜单才排序
if (ms.All(m => m.Sort == 0)) ms = ms.OrderByDescending(m => m.Name).ToList();
- for (int i = 0; i < ms.Count; i++)
+ for (Int32 i = 0; i < ms.Count; i++)
{
ms[i].Sort = i;
ms[i].Save();
diff --git "a/XCode/Membership/\350\247\222\350\211\262.Biz.cs" "b/XCode/Membership/\350\247\222\350\211\262.Biz.cs"
index 0d0fdc4..5b06263 100644
--- "a/XCode/Membership/\350\247\222\350\211\262.Biz.cs"
+++ "b/XCode/Membership/\350\247\222\350\211\262.Biz.cs"
@@ -171,7 +171,7 @@ namespace XCode.Membership
/// <summary>验证数据，通过抛出异常的方式提示验证失败。</summary>
/// <param name="isNew">是否新数据</param>
- public override void Valid(bool isNew)
+ public override void Valid(Boolean isNew)
{
if (String.IsNullOrEmpty(Name)) throw new ArgumentNullException(__.Name, _.Name.DisplayName + "不能为空！");
@@ -182,7 +182,7 @@ namespace XCode.Membership
/// <summary>已重载。</summary>
/// <returns></returns>
- public override int Delete()
+ public override Int32 Delete()
{
var entity = this;
var name = entity.Name;
@@ -213,7 +213,7 @@ namespace XCode.Membership
/// <summary>已重载。</summary>
/// <returns></returns>
- public override int Save()
+ public override Int32 Save()
{
// 先处理一次，否则可能因为别的字段没有修改而没有脏数据
SavePermission();
@@ -232,7 +232,7 @@ namespace XCode.Membership
/// <summary>如果Permission被修改，则重新加载</summary>
/// <param name="fieldName"></param>
- protected override void OnPropertyChanged(string fieldName)
+ protected override void OnPropertyChanged(String fieldName)
{
base.OnPropertyChanged(fieldName);
@@ -434,7 +434,7 @@ namespace XCode.Membership
/// <param name="e"></param>
/// <param name="role"></param>
/// <param name="isfull"></param>
- public static void RowDataBound(object sender, GridViewRowEventArgs e, IRole role, Boolean isfull)
+ public static void RowDataBound(Object sender, GridViewRowEventArgs e, IRole role, Boolean isfull)
{
if (e.Row == null) return;
@@ -480,7 +480,7 @@ namespace XCode.Membership
/// <param name="role"></param>
/// <param name="resname">当前页权限名称</param>
/// <returns></returns>
- public static Boolean CheckedChanged(object sender, EventArgs e, IRole role, String resname)
+ public static Boolean CheckedChanged(Object sender, EventArgs e, IRole role, String resname)
{
var cb = sender as CheckBox;
if (cb == null) return false;
@@ -544,7 +544,7 @@ namespace XCode.Membership
/// <param name="role"></param>
/// <param name="resname">当前页权限名称</param>
/// <returns></returns>
- public static Boolean SelectedIndexChanged(object sender, EventArgs e, IRole role, String resname)
+ public static Boolean SelectedIndexChanged(Object sender, EventArgs e, IRole role, String resname)
{
var cb = sender as CheckBoxList;
diff --git "a/XCode/Membership/\346\227\245\345\277\227.Biz.cs" "b/XCode/Membership/\346\227\245\345\277\227.Biz.cs"
index 97bdfbc..4d16405 100644
--- "a/XCode/Membership/\346\227\245\345\277\227.Biz.cs"
+++ "b/XCode/Membership/\346\227\245\345\277\227.Biz.cs"
@@ -27,7 +27,7 @@ namespace XCode.Membership
/// <summary>已重载。记录当前管理员</summary>
/// <param name="isNew"></param>
- public override void Valid(bool isNew)
+ public override void Valid(Boolean isNew)
{
base.Valid(isNew);
@@ -53,14 +53,14 @@ namespace XCode.Membership
/// <summary></summary>
/// <returns></returns>
- protected override int OnUpdate()
+ protected override Int32 OnUpdate()
{
throw new Exception("禁止修改日志！");
}
/// <summary></summary>
/// <returns></returns>
- protected override int OnDelete()
+ protected override Int32 OnDelete()
{
throw new Exception("禁止删除日志！");
}
@@ -213,7 +213,7 @@ namespace XCode.Membership
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
return String.Format("{0} {1} {2} {3:yyyy-MM-dd HH:mm:ss} {4}", Category, Action, UserName ?? CreateUserName, CreateTime, Remark);
}
diff --git "a/XCode/Membership/\347\224\250\346\210\267.Biz.cs" "b/XCode/Membership/\347\224\250\346\210\267.Biz.cs"
index 9c4117a..b438600 100644
--- "a/XCode/Membership/\347\224\250\346\210\267.Biz.cs"
+++ "b/XCode/Membership/\347\224\250\346\210\267.Biz.cs"
@@ -74,7 +74,7 @@ namespace XCode.Membership
/// <summary>验证</summary>
/// <param name="isNew"></param>
- public override void Valid(bool isNew)
+ public override void Valid(Boolean isNew)
{
base.Valid(isNew);
@@ -100,7 +100,7 @@ namespace XCode.Membership
/// <summary>删除用户</summary>
/// <returns></returns>
- protected override int OnDelete()
+ protected override Int32 OnDelete()
{
if (Meta.Count <= 1) throw new Exception("必须保留至少一个可用账号！");
@@ -337,7 +337,7 @@ namespace XCode.Membership
/// <summary>已重载。显示友好名字</summary>
/// <returns></returns>
- public override string ToString() { return FriendName; }
+ public override String ToString() { return FriendName; }
#endregion
#region 业务
@@ -389,7 +389,7 @@ namespace XCode.Membership
var p = password;
if (!String.IsNullOrEmpty(p))
{
- for (int i = 0; i < hashTimes; i++)
+ for (Int32 i = 0; i < hashTimes; i++)
{
p = p.MD5();
}
@@ -399,7 +399,7 @@ namespace XCode.Membership
else
{
var p = user.Password;
- for (int i = 0; i > hashTimes; i--)
+ for (Int32 i = 0; i > hashTimes; i--)
{
p = p.MD5();
}
@@ -413,7 +413,7 @@ namespace XCode.Membership
var p = password;
if (!String.IsNullOrEmpty(p))
{
- for (int i = 0; i < hashTimes; i++)
+ for (Int32 i = 0; i < hashTimes; i++)
{
p = p.MD5();
}
@@ -558,10 +558,10 @@ namespace XCode.Membership
#region IManageUser 成员
/// <summary>编号</summary>
- object IManageUser.Uid { get { return ID; } }
+ Object IManageUser.Uid { get { return ID; } }
/// <summary>密码</summary>
- string IManageUser.Password { get { return Password; } set { Password = value; } }
+ String IManageUser.Password { get { return Password; } set { Password = value; } }
/// <summary>是否管理员</summary>
Boolean IManageUser.IsAdmin { get { return RoleName == "管理员" || RoleName == "超级管理员"; } set { } }
diff --git a/XCode/Membership/LogEntity.cs b/XCode/Membership/LogEntity.cs
index 54b172e..c13c9d7 100644
--- a/XCode/Membership/LogEntity.cs
+++ b/XCode/Membership/LogEntity.cs
@@ -56,7 +56,7 @@ namespace XCode.Membership
/// <summary>删除时写日志</summary>
/// <returns></returns>
- public override int Delete()
+ public override Int32 Delete()
{
LogProvider.Provider.WriteLog("删除", this);
diff --git a/XCode/Membership/UserTimeEntity.cs b/XCode/Membership/UserTimeEntity.cs
index f2c4b08..24ddec3 100644
--- a/XCode/Membership/UserTimeEntity.cs
+++ b/XCode/Membership/UserTimeEntity.cs
@@ -82,7 +82,7 @@ namespace XCode.Membership
/// <summary>初始化。检查是否匹配</summary>
/// <param name="entityType"></param>
/// <returns></returns>
- public override bool Init(Type entityType)
+ public override Boolean Init(Type entityType)
{
var fs = GetFieldNames(entityType);
if (fs.Contains(__.CreateTime)) return true;
@@ -127,7 +127,7 @@ namespace XCode.Membership
/// <summary>初始化。检查是否匹配</summary>
/// <param name="entityType"></param>
/// <returns></returns>
- public override bool Init(Type entityType)
+ public override Boolean Init(Type entityType)
{
var fs = GetFieldNames(entityType);
if (fs.Contains(__.CreateIP)) return true;
diff --git a/XCode/Model/ConcatExpression.cs b/XCode/Model/ConcatExpression.cs
index a9f7fab..acc82e9 100644
--- a/XCode/Model/ConcatExpression.cs
+++ b/XCode/Model/ConcatExpression.cs
@@ -38,7 +38,7 @@ namespace XCode
/// <summary>已重载。</summary>
/// <param name="needBracket">外部是否需要括号。如果外部要求括号，而内部又有Or，则加上括号</param>
/// <returns></returns>
- public override string GetString(Boolean needBracket = false)
+ public override String GetString(Boolean needBracket = false)
{
if (Builder == null || Builder.Length <= 0) return null;
diff --git a/XCode/Model/OrderExpression.cs b/XCode/Model/OrderExpression.cs
index db94a4c..f4cad88 100644
--- a/XCode/Model/OrderExpression.cs
+++ b/XCode/Model/OrderExpression.cs
@@ -55,7 +55,7 @@ namespace XCode
/// <summary>已重载。</summary>
/// <returns></returns>
- public override string ToString()
+ public override String ToString()
{
if (Builder == null || Builder.Length <= 0) return null;
diff --git a/XCode/Model/WhereExpression.cs b/XCode/Model/WhereExpression.cs
index 1afc41e..a76f0c5 100644
--- a/XCode/Model/WhereExpression.cs
+++ b/XCode/Model/WhereExpression.cs
@@ -24,7 +24,7 @@ namespace XCode
Exp = exp;
}
- public override string ToString()
+ public override String ToString()
{
return (IsAnd ? "And " : "Or ") + Exp;
}
@@ -95,7 +95,7 @@ namespace XCode
var hasOr = false;
// 优先计算And，所有And作为一个整体表达式进入内层，处理完以后当前层要么全是And，要么全是Or
- for (int i = 0; i < exps.Count; i++)
+ for (Int32 i = 0; i < exps.Count; i++)
{
sub.Add(exps[i]);
// 如果下一个是Or，或者已经是最后一个，则合并sub到list
@@ -127,7 +127,7 @@ namespace XCode
// 开始计算
var sb = new StringBuilder();
- for (int i = 0; i < list.Count; i++)
+ for (Int32 i = 0; i < list.Count; i++)
{
var item = list[i];
var exp = item.Exp;
diff --git a/XCode/Sync/ISyncMaster.cs b/XCode/Sync/ISyncMaster.cs
index 05e94da..da05f94 100644
--- a/XCode/Sync/ISyncMaster.cs
+++ b/XCode/Sync/ISyncMaster.cs
@@ -127,7 +127,7 @@ namespace XCode.Sync
if (Facotry.Default is ISyncMasterEntity)
{
var rs = new ISyncMasterEntity[list.Count];
- for (int i = 0; i < list.Count; i++)
+ for (Int32 i = 0; i < list.Count; i++)
{
rs[i] = list[i] as ISyncMasterEntity;
}
@@ -137,7 +137,7 @@ namespace XCode.Sync
else
{
var rs = new ISyncMasterEntity[list.Count];
- for (int i = 0; i < list.Count; i++)
+ for (Int32 i = 0; i < list.Count; i++)
{
rs[i] = new SyncMasterEntity(this, list[i]);
}
@@ -163,7 +163,7 @@ namespace XCode.Sync
if (list == null) return null;
if (list.Length < 1) return new ISyncMasterEntity[0];
- for (int i = 0; i < list.Length; i++)
+ for (Int32 i = 0; i < list.Length; i++)
{
var item = list[i];
if (item != null)
@@ -209,7 +209,7 @@ namespace XCode.Sync
if (keys.Length < 1) return new Boolean[0];
var rs = new Boolean[keys.Length];
- for (int i = 0; i < keys.Length; i++)
+ for (Int32 i = 0; i < keys.Length; i++)
{
var entity = Facotry.FindByKey(keys[i]);
if (entity != null)
@@ -231,7 +231,7 @@ namespace XCode.Sync
if (keys.Length < 1) return new Boolean[0];
var rs = new Boolean[keys.Length];
- for (int i = 0; i < keys.Length; i++)
+ for (Int32 i = 0; i < keys.Length; i++)
{
var entity = Facotry.FindByKey(keys[i]);
if (entity != null) rs[i] = true;
diff --git a/XCode/Sync/ISyncSlave.cs b/XCode/Sync/ISyncSlave.cs
index ac70586..2f160df 100644
--- a/XCode/Sync/ISyncSlave.cs
+++ b/XCode/Sync/ISyncSlave.cs
@@ -179,7 +179,7 @@ namespace XCode.Sync
if (list == null || list.Count < 1) return null;
var rs = new ISyncSlaveEntity[list.Count];
- for (int i = 0; i < list.Count; i++)
+ for (Int32 i = 0; i < list.Count; i++)
{
rs[i] = list[i] as ISyncSlaveEntity;
}
diff --git a/XCode/Sync/SyncManager.cs b/XCode/Sync/SyncManager.cs
index a3e88b0..cc9b888 100644
--- a/XCode/Sync/SyncManager.cs
+++ b/XCode/Sync/SyncManager.cs
@@ -89,7 +89,7 @@ namespace XCode.Sync
// 采用降序应该可以解决问题
if (rs != null && rs.Length > 0)
{
- for (int i = arr.Length - 1; i >= 0; i--)
+ for (Int32 i = arr.Length - 1; i >= 0; i--)
{
if (rs[i] != null) arr[i].ChangeKey(rs[i].Key);
}
@@ -119,7 +119,7 @@ namespace XCode.Sync
// 准备要删除的主键
var keys = new Object[arr.Length];
- for (int i = 0; i < arr.Length; i++)
+ for (Int32 i = 0; i < arr.Length; i++)
{
keys[i] = arr[i].Key;
}
@@ -129,7 +129,7 @@ namespace XCode.Sync
// 删除本地
if (rs != null && rs.Length > 0)
{
- for (int i = 0; i < arr.Length; i++)
+ for (Int32 i = 0; i < arr.Length; i++)
{
if (rs[i]) arr[i].Delete();
}
@@ -206,7 +206,7 @@ namespace XCode.Sync
// 准备要删除的主键
var keys = new Object[arr.Length];
- for (int i = 0; i < arr.Length; i++)
+ for (Int32 i = 0; i < arr.Length; i++)
{
keys[i] = arr[i].Key;
}
@@ -216,7 +216,7 @@ namespace XCode.Sync
// 删除本地
if (rs != null && rs.Length > 0)
{
- for (int i = 0; i < arr.Length; i++)
+ for (Int32 i = 0; i < arr.Length; i++)
{
if (!rs[i]) arr[i].Delete();
}
@@ -236,7 +236,7 @@ namespace XCode.Sync
ISyncMasterEntity[] Convert(ISyncSlaveEntity[] arr)
{
var rs = new ISyncMasterEntity[arr.Length];
- for (int i = 0; i < arr.Length; i++)
+ for (Int32 i = 0; i < arr.Length; i++)
{
rs[i] = Convert(arr[i]);
}
@@ -246,7 +246,7 @@ namespace XCode.Sync
ISyncSlaveEntity[] Convert(ISyncMasterEntity[] arr)
{
var rs = new ISyncSlaveEntity[arr.Length];
- for (int i = 0; i < arr.Length; i++)
+ for (Int32 i = 0; i < arr.Length; i++)
{
rs[i] = Convert(arr[i]);
}
diff --git a/XCode/Test/TestHelper.cs b/XCode/Test/TestHelper.cs
index 6e23432..e81e510 100644
--- a/XCode/Test/TestHelper.cs
+++ b/XCode/Test/TestHelper.cs
@@ -36,7 +36,7 @@ namespace XCode.Test
Byte[] buffer = new Byte[_.Guid2.Length / 2];
rnd.NextBytes(buffer);
entity.DisplayName = BitConverter.ToString(buffer).Replace("-", null);
- entity.EntityTest2 = (float)Math.PI;
+ entity.EntityTest2 = (Single)Math.PI;
if (String.IsNullOrEmpty(Meta.Session.Dal.Db.DateTimeNow))
{
entity.StartDate = DateTime.Now;
diff --git a/XCode/Tree/EntityTree.cs b/XCode/Tree/EntityTree.cs
index 2f115d8..02fb846 100644
--- a/XCode/Tree/EntityTree.cs
+++ b/XCode/Tree/EntityTree.cs
@@ -343,7 +343,7 @@ namespace XCode
if (childs == null || childs.Count < 1) continue;
// 反向入队
- for (int i = childs.Count - 1; i >= 0; i--)
+ for (Int32 i = childs.Count - 1; i >= 0; i--)
{
// 已计算到结果的，不再处理
if (list.Contains(childs[i])) continue;
diff --git a/XCode/Web/DbRunTimeModule.cs b/XCode/Web/DbRunTimeModule.cs
index 7eb21cd..ed7645d 100644
--- a/XCode/Web/DbRunTimeModule.cs
+++ b/XCode/Web/DbRunTimeModule.cs
@@ -26,7 +26,7 @@ namespace XCode.Web
/// <summary>输出</summary>
/// <returns></returns>
- protected override string Render()
+ protected override String Render()
{
TimeSpan ts = DateTime.Now - HttpContext.Current.Timestamp;
diff --git a/XCoder/Engine/Engine.cs b/XCoder/Engine/Engine.cs
index 3d9ea88..3446350 100644
--- a/XCoder/Engine/Engine.cs
+++ b/XCoder/Engine/Engine.cs
@@ -30,7 +30,7 @@ namespace XCoder
{
if (_FileTemplates == null)
{
- var list = new List<string>();
+ var list = new List<String>();
var dir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, TemplatePath);
if (Directory.Exists(dir))
@@ -120,7 +120,7 @@ namespace XCoder
if (dc.DataType == null) throw new ArgumentException("{0}.DataType数据类型错误".F(dc.Name), dc.Name);
}
- var data = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+ var data = new Dictionary<String, Object>(StringComparer.OrdinalIgnoreCase);
//data["Config"] = Config;
data["Tables"] = Tables;
data["Table"] = table;
@@ -161,7 +161,7 @@ namespace XCoder
// 声明模版引擎
//Template tt = new Template();
Template.Debug = Config.Debug;
- var templates = new Dictionary<string, string>();
+ var templates = new Dictionary<String, String>();
// 每一个模版的编码，用于作为输出文件的编码
var encs = new List<Encoding>();
diff --git a/XCoder/Engine/UIConfig.cs b/XCoder/Engine/UIConfig.cs
index e3fddd4..0788290 100644
--- a/XCoder/Engine/UIConfig.cs
+++ b/XCoder/Engine/UIConfig.cs
@@ -133,7 +133,7 @@ namespace XCoder
return ui;
}
- static ToolStripItem Find(ToolStripItemCollection items, String key, bool searchAllChildren)
+ static ToolStripItem Find(ToolStripItemCollection items, String key, Boolean searchAllChildren)
{
var tis = items.Find(key, searchAllChildren);
if (tis != null && tis.Length > 0) return tis[0];
@@ -158,7 +158,7 @@ namespace XCoder
return null;
}
- static void mi字体_Click(object sender, EventArgs e)
+ static void mi字体_Click(Object sender, EventArgs e)
{
var ti = sender as ToolStripItem;
var txt = (ti.Owner as ContextMenuStrip).SourceControl as TextBoxBase;
@@ -174,7 +174,7 @@ namespace XCoder
ui.Save();
}
- static void mi前景色_Click(object sender, EventArgs e)
+ static void mi前景色_Click(Object sender, EventArgs e)
{
var ti = sender as ToolStripItem;
var txt = (ti.Owner as ContextMenuStrip).SourceControl as TextBoxBase;
@@ -190,7 +190,7 @@ namespace XCoder
ui.Save();
}
- static void mi背景色_Click(object sender, EventArgs e)
+ static void mi背景色_Click(Object sender, EventArgs e)
{
// ((System.Windows.Forms.ContextMenuStrip)(((System.Windows.Forms.ToolStripItem)(sender)).Owner)).SourceControl
var ti = sender as ToolStripItem;
diff --git a/XCoder/FileEncoding/FrmMain.cs b/XCoder/FileEncoding/FrmMain.cs
index 7d9cc33..cd90670 100644
--- a/XCoder/FileEncoding/FrmMain.cs
+++ b/XCoder/FileEncoding/FrmMain.cs
@@ -15,10 +15,10 @@ namespace XCoder.FileEncoding
InitializeComponent();
}
- private void FrmEncodeReplace_Load(object sender, EventArgs e)
+ private void FrmEncodeReplace_Load(Object sender, EventArgs e)
{
txtSuffix.Text = "*.cs;*.aspx";
- var encs = new string[] { "UTF-8", "UTF-8 NoBOM", "ASNI", "Unicode", "Default" };
+ var encs = new String[] { "UTF-8", "UTF-8 NoBOM", "ASNI", "Unicode", "Default" };
//var encs = new Encoding[] { Encoding.UTF8, new UTF8Encoding(false), Encoding.ASCII, Encoding.Default };
ddlEncodes.DataSource = encs;
ddlEncodes.Text = "UTF-8";
@@ -27,7 +27,7 @@ namespace XCoder.FileEncoding
}
- private void btn_choice_file_Click(object sender, EventArgs e)
+ private void btn_choice_file_Click(Object sender, EventArgs e)
{
if (!txtPath.Text.IsNullOrEmpty()) fbd_choice_folder.SelectedPath = txtPath.Text;
if (fbd_choice_folder.ShowDialog() != DialogResult.OK) return;
@@ -35,7 +35,7 @@ namespace XCoder.FileEncoding
txtPath.Text = fbd_choice_folder.SelectedPath;
}
- private void btn_replace_Click(object sender, EventArgs e)
+ private void btn_replace_Click(Object sender, EventArgs e)
{
if (string.IsNullOrEmpty(txtPath.Text))
{
@@ -92,9 +92,9 @@ namespace XCoder.FileEncoding
/// 替换文件编码
/// </summary>
/// <param name="file"></param>
- private void ReplaceEncoding(string file, string charset, Encoding targetEncoding)
+ private void ReplaceEncoding(String file, String charset, Encoding targetEncoding)
{
- string fileInfo = "";
+ String fileInfo = "";
using (StreamReader sr = new StreamReader(file, Encoding.GetEncoding(charset), false))
{
fileInfo = sr.ReadToEnd();
@@ -159,7 +159,7 @@ namespace XCoder.FileEncoding
/// </summary>
/// <param name="fileName">文件名</param>
///
- public static Encoding GetEncoding(string fileName)
+ public static Encoding GetEncoding(String fileName)
{
return GetEncoding(fileName, Encoding.Default);
}
@@ -169,7 +169,7 @@ namespace XCoder.FileEncoding
/// <param name="defaultEncoding">默认编码方式。当该方法无法从文件的头部取得有效的前导符时，将返回该编码方式。</param>
/// <returns></returns>
///
- public static Encoding GetEncoding(string fileName, Encoding defaultEncoding)
+ public static Encoding GetEncoding(String fileName, Encoding defaultEncoding)
{
using (var fs = File.OpenRead(fileName))
{
@@ -218,15 +218,15 @@ namespace XCoder.FileEncoding
if (stream != null && stream.Length >= 2)
{
//保存文件流的前4个字节
- byte byte1 = 0;
- byte byte2 = 0;
- byte byte3 = 0;
- byte byte4 = 0;
+ Byte byte1 = 0;
+ Byte byte2 = 0;
+ Byte byte3 = 0;
+ Byte byte4 = 0;
//保存当前Seek位置
- long origPos = stream.Seek(0, SeekOrigin.Begin);
+ Int64 origPos = stream.Seek(0, SeekOrigin.Begin);
stream.Seek(0, SeekOrigin.Begin);
- int nByte = stream.ReadByte();
+ Int32 nByte = stream.ReadByte();
byte1 = Convert.ToByte(nByte);
byte2 = Convert.ToByte(stream.ReadByte());
diff --git a/XCoder/FolderInfo/FrmMain.cs b/XCoder/FolderInfo/FrmMain.cs
index 8306c7e..a0dd868 100644
--- a/XCoder/FolderInfo/FrmMain.cs
+++ b/XCoder/FolderInfo/FrmMain.cs
@@ -23,7 +23,7 @@ namespace XCoder.FolderInfo
Icon = IcoHelper.GetIcon("文件");
}
- private void Form1_Load(object sender, EventArgs e)
+ private void Form1_Load(Object sender, EventArgs e)
{
txtLog.UseWinFormControl();
@@ -61,7 +61,7 @@ namespace XCoder.FolderInfo
list.AddRange(dis);
list.AddRange(fis);
- int max = 0;
+ Int32 max = 0;
foreach (var item in list)
{
max = Math.Max(max, StrLen(item.Name));
@@ -71,7 +71,7 @@ namespace XCoder.FolderInfo
{
Int32 len = max;
len -= (StrLen(item.Name) - item.Name.Length);
- long size = 0;
+ Int64 size = 0;
if (item is FileInfo)
size = (item as FileInfo).Length;
@@ -92,10 +92,10 @@ namespace XCoder.FolderInfo
}
}
- String FormatSize(long size)
+ String FormatSize(Int64 size)
{
if (size < 1024) return size.ToString() + " Byte";
- Double ds = (double)size / 1024;
+ Double ds = (Double)size / 1024;
if (ds < 1024) return ds.ToString("N2") + " K";
ds = ds / 1024;
if (ds < 1024) return ds.ToString("N2") + " M";
@@ -123,10 +123,10 @@ namespace XCoder.FolderInfo
// return FolderSize(si as DirectoryInfo);
//}
- Dictionary<String, long> cache = new Dictionary<String, long>();
- long FolderSize(DirectoryInfo di)
+ Dictionary<String, Int64> cache = new Dictionary<String, Int64>();
+ Int64 FolderSize(DirectoryInfo di)
{
- long size = 0;
+ Int64 size = 0;
if (cache.ContainsKey(di.FullName)) return cache[di.FullName];
lock (di.FullName)
{
@@ -154,7 +154,7 @@ namespace XCoder.FolderInfo
{
var node = obj as TreeNode;
if (node == null || node.Tag == null) return;
- long size = FolderSize(node.Tag as DirectoryInfo);
+ Int64 size = FolderSize(node.Tag as DirectoryInfo);
var str = node.Text.Substring(0, node.Text.Length - 10) + String.Format("{0,10}", FormatSize(size));
//SetNodeText(node, str, GetColor(size));
this.Invoke(() =>
@@ -164,7 +164,7 @@ namespace XCoder.FolderInfo
});
}
- Color GetColor(long size)
+ Color GetColor(Int64 size)
{
var color = Color.White;
if (size > 1024) color = Color.MistyRose;
@@ -191,7 +191,7 @@ namespace XCoder.FolderInfo
#endregion
#region 展开折叠目录树
- private void treeView1_BeforeExpand(object sender, TreeViewCancelEventArgs e)
+ private void treeView1_BeforeExpand(Object sender, TreeViewCancelEventArgs e)
{
var node = e.Node;
if (node.Nodes != null && node.Nodes.Count > 0 && node.Nodes[0].Text == "no")
@@ -208,7 +208,7 @@ namespace XCoder.FolderInfo
}
}
- private void treeView1_AfterCollapse(object sender, TreeViewEventArgs e)
+ private void treeView1_AfterCollapse(Object sender, TreeViewEventArgs e)
{
// 折叠后清空，使得再次展开时重新计算
if (e.Node != null && e.Node.Nodes != null)
@@ -231,7 +231,7 @@ namespace XCoder.FolderInfo
return node.Tag.ToString();
}
- private void 打开目录ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 打开目录ToolStripMenuItem_Click(Object sender, EventArgs e)
{
var path = GetSelectedPath();
if (String.IsNullOrEmpty(path)) return;
@@ -251,7 +251,7 @@ namespace XCoder.FolderInfo
}
}
- private void 删除ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 删除ToolStripMenuItem_Click(Object sender, EventArgs e)
{
var path = GetSelectedPath();
if (String.IsNullOrEmpty(path)) return;
diff --git a/XCoder/FrmMDI.cs b/XCoder/FrmMDI.cs
index 89c204e..b30bc30 100644
--- a/XCoder/FrmMDI.cs
+++ b/XCoder/FrmMDI.cs
@@ -22,7 +22,7 @@ namespace XCoder
Icon = Source.GetIcon();
}
- private void FrmMDI_Shown(object sender, EventArgs e)
+ private void FrmMDI_Shown(Object sender, EventArgs e)
{
var set = XConfig.Current;
if (set.Width > 0 || set.Height > 0)
@@ -103,17 +103,17 @@ namespace XCoder
#endregion
#region 菜单控制
- private void ShowNewForm(object sender, EventArgs e) { }
+ private void ShowNewForm(Object sender, EventArgs e) { }
- private void CascadeToolStripMenuItem_Click(object sender, EventArgs e) { LayoutMdi(MdiLayout.Cascade); }
+ private void CascadeToolStripMenuItem_Click(Object sender, EventArgs e) { LayoutMdi(MdiLayout.Cascade); }
- private void TileVerticalToolStripMenuItem_Click(object sender, EventArgs e) { LayoutMdi(MdiLayout.TileVertical); }
+ private void TileVerticalToolStripMenuItem_Click(Object sender, EventArgs e) { LayoutMdi(MdiLayout.TileVertical); }
- private void TileHorizontalToolStripMenuItem_Click(object sender, EventArgs e) { LayoutMdi(MdiLayout.TileHorizontal); }
+ private void TileHorizontalToolStripMenuItem_Click(Object sender, EventArgs e) { LayoutMdi(MdiLayout.TileHorizontal); }
- private void ArrangeIconsToolStripMenuItem_Click(object sender, EventArgs e) { LayoutMdi(MdiLayout.ArrangeIcons); }
+ private void ArrangeIconsToolStripMenuItem_Click(Object sender, EventArgs e) { LayoutMdi(MdiLayout.ArrangeIcons); }
- private void CloseAllToolStripMenuItem_Click(object sender, EventArgs e)
+ private void CloseAllToolStripMenuItem_Click(Object sender, EventArgs e)
{
foreach (var childForm in MdiChildren)
{
@@ -122,7 +122,7 @@ namespace XCoder
}
#endregion
- private void FrmMDI_FormClosing(object sender, FormClosingEventArgs e)
+ private void FrmMDI_FormClosing(Object sender, FormClosingEventArgs e)
{
var set = XConfig.Current;
var area = Screen.PrimaryScreen.WorkingArea;
@@ -136,7 +136,7 @@ namespace XCoder
}
}
- private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
+ private void aboutToolStripMenuItem_Click(Object sender, EventArgs e)
{
Process.Start("http://www.NewLifeX.com");
}
diff --git a/XCoder/NewModelForm/AddField.cs b/XCoder/NewModelForm/AddField.cs
index 0b47b8f..5cf7e1d 100644
--- a/XCoder/NewModelForm/AddField.cs
+++ b/XCoder/NewModelForm/AddField.cs
@@ -20,7 +20,7 @@ namespace XCoder
//是否添加，默认是添加数据
private Boolean IsNew = true ;
- public AddField(IDataColumn dc,bool isNew)
+ public AddField(IDataColumn dc, Boolean isNew)
{
InitializeComponent();
IsNew = isNew;
@@ -86,14 +86,14 @@ namespace XCoder
DataColumn.ColumnName = DataColumn.Name;
}
- public static BaseForm CreateForm(IDataColumn column, bool isNew)
+ public static BaseForm CreateForm(IDataColumn column, Boolean isNew)
{
AddField frm = new AddField(column, isNew);
frm.Dock = DockStyle.Fill;
return WinFormHelper.CreateForm(frm, "编辑字段信息");
}
- private void combRawType_SelectedIndexChanged(object sender, EventArgs e)
+ private void combRawType_SelectedIndexChanged(Object sender, EventArgs e)
{
if (combRawType.SelectedIndex == 3)
{
@@ -117,20 +117,20 @@ namespace XCoder
}
}
- private void btnSave_Click(object sender, EventArgs e)
+ private void btnSave_Click(Object sender, EventArgs e)
{
SaveValue();
ParentForm.DialogResult = DialogResult.OK;
ParentForm.Close();
}
- private void btnCancle_Click(object sender, EventArgs e)
+ private void btnCancle_Click(Object sender, EventArgs e)
{
ParentForm.DialogResult = DialogResult.Cancel ;
ParentForm.Close();
}
- private void txtLength_TextChanged(object sender, EventArgs e)
+ private void txtLength_TextChanged(Object sender, EventArgs e)
{
if (combRawType.SelectedIndex == 3)
{
@@ -138,7 +138,7 @@ namespace XCoder
}
}
- private void txtLength_KeyPress(object sender, KeyPressEventArgs e)
+ private void txtLength_KeyPress(Object sender, KeyPressEventArgs e)
{
WinFormHelper.SetControlOnlyZS(sender, e);
}
diff --git a/XCoder/NewModelForm/AddTable.cs b/XCoder/NewModelForm/AddTable.cs
index c514df9..47a484b 100644
--- a/XCoder/NewModelForm/AddTable.cs
+++ b/XCoder/NewModelForm/AddTable.cs
@@ -64,7 +64,7 @@ namespace XCoder
return WinFormHelper.CreateForm(frm , "添加表");
}
- private void toolAddColumns_Click(object sender, EventArgs e)
+ private void toolAddColumns_Click(Object sender, EventArgs e)
{
IDataColumn dc = CurrentTable.CreateColumn();
//CurrentTable.Columns.Add(dc);
@@ -79,7 +79,7 @@ namespace XCoder
}
}
- private void toolEidtColumn_Click(object sender, EventArgs e)
+ private void toolEidtColumn_Click(Object sender, EventArgs e)
{
DataGridViewRow row = dgvColumns.Rows[dgvColumns.CurrentCell.RowIndex ];
@@ -90,7 +90,7 @@ namespace XCoder
BandingDGV();
}
- private void toolStripButton1_Click(object sender, EventArgs e)
+ private void toolStripButton1_Click(Object sender, EventArgs e)
{
if (MessageBox.Show("是否需要保存数据?", "提示", MessageBoxButtons.YesNo) == DialogResult.Yes)
{
@@ -102,7 +102,7 @@ namespace XCoder
}
}
- private void toolSave_Click(object sender, EventArgs e)
+ private void toolSave_Click(Object sender, EventArgs e)
{
CurrentTable.TableName = txtTableName.Text.Trim();
CurrentTable.Description = txtTableRemark.Text.Trim();
@@ -111,7 +111,7 @@ namespace XCoder
BandingDGV();
}
- private void toolDelete_Click(object sender, EventArgs e)
+ private void toolDelete_Click(Object sender, EventArgs e)
{
CurrentTable.Columns.RemoveAt(dgvColumns.CurrentCell.RowIndex);
BandingDGV();
diff --git a/XCoder/NewModelForm/NewModel.cs b/XCoder/NewModelForm/NewModel.cs
index b47536d..316bb5c 100644
--- a/XCoder/NewModelForm/NewModel.cs
+++ b/XCoder/NewModelForm/NewModel.cs
@@ -32,7 +32,7 @@ namespace XCoder
return WinFormHelper.CreateForm(frm, "添加模型");
}
- private void toolAddTable_Click(object sender, EventArgs e)
+ private void toolAddTable_Click(Object sender, EventArgs e)
{
//为了触发XCodeService的静态构造函数
var temp = ModelResolver.Current;
@@ -52,7 +52,7 @@ namespace XCoder
dgvTables.DataSource = Tables;
}
- private void toolEidtTable_Click(object sender, EventArgs e)
+ private void toolEidtTable_Click(Object sender, EventArgs e)
{
DataGridViewRow row = dgvTables.Rows[dgvTables.CurrentCell.RowIndex];
if (row == null) return;
@@ -60,7 +60,7 @@ namespace XCoder
AddTable.CreateForm((IDataTable)row.DataBoundItem).ShowDialog();
}
- private void toolClose_Click(object sender, EventArgs e)
+ private void toolClose_Click(Object sender, EventArgs e)
{
if (MessageBox.Show("是否需要保存?", "提示", MessageBoxButtons.YesNo) == DialogResult.Yes)
{
@@ -73,7 +73,7 @@ namespace XCoder
}
//保存模型
- private void toolStripButton1_Click(object sender, EventArgs e)
+ private void toolStripButton1_Click(Object sender, EventArgs e)
{
if (Tables == null || Tables.Count < 1)
{
@@ -95,7 +95,7 @@ namespace XCoder
}
}
- private void toolDeleteTable_Click(object sender, EventArgs e)
+ private void toolDeleteTable_Click(Object sender, EventArgs e)
{
Tables.RemoveAt(dgvTables.CurrentCell.RowIndex);
diff --git a/XCoder/NewModelForm/WinFormHelper.cs b/XCoder/NewModelForm/WinFormHelper.cs
index ae3e657..fe6a727 100644
--- a/XCoder/NewModelForm/WinFormHelper.cs
+++ b/XCoder/NewModelForm/WinFormHelper.cs
@@ -14,7 +14,7 @@ namespace XCoder
/// </summary>
/// <param name="cl">控件</param>
/// <param name="titleText">标题文本</param>
- public static BaseForm CreateForm(Control cl, string titleText = "")
+ public static BaseForm CreateForm(Control cl, String titleText = "")
{
BaseForm tf = new BaseForm();
tf.Size = new Size(cl.Width + 15, cl.Size.Height + 40);
@@ -31,9 +31,9 @@ namespace XCoder
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- public static void SetControlOnlyValue(object sender, KeyPressEventArgs e)
+ public static void SetControlOnlyValue(Object sender, KeyPressEventArgs e)
{
- e.Handled = !(Char.IsNumber(e.KeyChar) || e.KeyChar == (char)8 || e.KeyChar == '.' || e.KeyChar == '-');
+ e.Handled = !(Char.IsNumber(e.KeyChar) || e.KeyChar == (Char)8 || e.KeyChar == '.' || e.KeyChar == '-');
if (!e.Handled)
(sender as TextBox).Tag = (sender as TextBox).Text;//记录最后一次正确输入
}
@@ -42,9 +42,9 @@ namespace XCoder
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- public static void SetControlOnlyZS(object sender, KeyPressEventArgs e)
+ public static void SetControlOnlyZS(Object sender, KeyPressEventArgs e)
{
- e.Handled = !(Char.IsNumber(e.KeyChar) || e.KeyChar == (char)8 || e.KeyChar == '.');
+ e.Handled = !(Char.IsNumber(e.KeyChar) || e.KeyChar == (Char)8 || e.KeyChar == '.');
if (!e.Handled)
(sender as TextBox).Tag = (sender as TextBox).Text;//记录最后一次正确输入
}
@@ -55,7 +55,7 @@ namespace XCoder
public class BindComboxEnumType<T>
{
/// <summary>类型的名字</summary>
- public string Name { get; set; }
+ public String Name { get; set; }
/// <summary>类型</summary>
public T Type { get; set; }
@@ -99,15 +99,15 @@ namespace XCoder
public class PrimitiveType
{
/// <summary>原始类型名称</summary>
- public string Name { get; set; }
+ public String Name { get; set; }
/// <summary>类型长度</summary>
- public int Length { get; set; }
+ public Int32 Length { get; set; }
/// <summary>字节数/summary>
- public int NumOfByte { get; set; }
+ public Int32 NumOfByte { get; set; }
/// <summary>精度</summary>
- public int Precision { get; set; }
+ public Int32 Precision { get; set; }
/// <summary>数据类型</summary>
- public string DataType { get; set; }
+ public String DataType { get; set; }
public static List<PrimitiveType> TypeList ;
diff --git a/XCoder/Program.cs b/XCoder/Program.cs
index ab458fd..d9e1657 100644
--- a/XCoder/Program.cs
+++ b/XCoder/Program.cs
@@ -65,7 +65,7 @@ namespace XCoder
static void StartWithParameter(String[] args)
{
var dic = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
- for (int i = 2; i < args.Length - 1; i++)
+ for (Int32 i = 2; i < args.Length - 1; i++)
{
switch (args[i].ToLower())
{
diff --git a/XCoder/Windows/FrmItems.cs b/XCoder/Windows/FrmItems.cs
index dec9a67..55e3a3a 100644
--- a/XCoder/Windows/FrmItems.cs
+++ b/XCoder/Windows/FrmItems.cs
@@ -37,7 +37,7 @@ namespace XCoder
/// <summary>初始化界面</summary>
/// <param name="dic"></param>
/// <returns></returns>
- public static FrmItems Create(Dictionary<string, string> dic)
+ public static FrmItems Create(Dictionary<String, String> dic)
{
FrmItems item = new FrmItems();
@@ -69,7 +69,7 @@ namespace XCoder
/// <summary>初始化字典</summary>
private void CreatDic()
{
- Dictionary<string, string> dic = new Dictionary<string, string>();
+ Dictionary<String, String> dic = new Dictionary<String, String>();
dic.Add("key", "value");
Dic = dic;
@@ -79,7 +79,7 @@ namespace XCoder
#region 加载
//加载
- void SetDic(Dictionary<string, string> dic)
+ void SetDic(Dictionary<String, String> dic)
{
DataGridViewColumnCollection columns = dataGridView1.Columns;
columns.Add("key", "键");
@@ -106,7 +106,7 @@ namespace XCoder
var rows = dataGridView1.Rows;
var column = dataGridView1.Columns;
- for (int i = 0; i < rows.Count-1; i++)
+ for (Int32 i = 0; i < rows.Count-1; i++)
{
XConfig.Items.Add(rows[i].Cells[0].Value.ToString(), rows[i].Cells[1].Value.ToString());
}
@@ -122,12 +122,12 @@ namespace XCoder
#endregion
- private void FrmItems_Load(object sender, EventArgs e)
+ private void FrmItems_Load(Object sender, EventArgs e)
{
SetDic(Dic);
}
- private void dataGridView1_RowEnter(object sender, DataGridViewCellEventArgs e)
+ private void dataGridView1_RowEnter(Object sender, DataGridViewCellEventArgs e)
{
//if(e.RowIndex<0) return ;
@@ -140,7 +140,7 @@ namespace XCoder
//propertyGrid1.SelectedObject = row.Cells;
}
- private void button1_Click(object sender, EventArgs e)
+ private void button1_Click(Object sender, EventArgs e)
{
AddItems();
}
diff --git a/XCoder/Windows/FrmMain.cs b/XCoder/Windows/FrmMain.cs
index dcad031..ffb3b5f 100644
--- a/XCoder/Windows/FrmMain.cs
+++ b/XCoder/Windows/FrmMain.cs
@@ -46,13 +46,13 @@ namespace XCoder
AutoLoadTables(Config.ConnName);
}
- private void FrmMain_Shown(object sender, EventArgs e)
+ private void FrmMain_Shown(Object sender, EventArgs e)
{
//var asm = AssemblyX.Create(Assembly.GetExecutingAssembly());
//Text = String.Format("新生命数据模型工具 v{0} {1:HH:mm:ss}编译", asm.CompileVersion, asm.Compile);
}
- private void FrmMain_Load(object sender, EventArgs e)
+ private void FrmMain_Load(Object sender, EventArgs e)
{
LoadConfig();
@@ -72,7 +72,7 @@ namespace XCoder
Task.Factory.StartNew(AutoDetectDatabase).LogException();
}
- private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
+ private void FrmMain_FormClosing(Object sender, FormClosingEventArgs e)
{
try
{
@@ -83,7 +83,7 @@ namespace XCoder
#endregion
#region 连接、自动检测数据库、加载表
- private void bt_Connection_Click(object sender, EventArgs e)
+ private void bt_Connection_Click(Object sender, EventArgs e)
{
SaveConfig();
@@ -124,7 +124,7 @@ namespace XCoder
}
}
- private void cbConn_SelectionChangeCommitted(object sender, EventArgs e)
+ private void cbConn_SelectionChangeCommitted(Object sender, EventArgs e)
{
if (!String.IsNullOrEmpty(cbConn.Text)) toolTip1.SetToolTip(cbConn, DAL.Create(cbConn.Text).ConnStr);
@@ -433,7 +433,7 @@ namespace XCoder
Task.Factory.StartNew(() => { var tables = DAL.Create(name).Tables; }).LogException();
}
- private void btnRefreshTable_Click(object sender, EventArgs e)
+ private void btnRefreshTable_Click(Object sender, EventArgs e)
{
LoadTables();
}
@@ -441,7 +441,7 @@ namespace XCoder
#region 生成
Stopwatch sw = new Stopwatch();
- private void bt_GenTable_Click(object sender, EventArgs e)
+ private void bt_GenTable_Click(Object sender, EventArgs e)
{
SaveConfig();
@@ -472,7 +472,7 @@ namespace XCoder
lb_Status.Text = "生成 " + cbTableList.Text + " 完成！耗时：" + sw.Elapsed;
}
- private void bt_GenAll_Click(object sender, EventArgs e)
+ private void bt_GenAll_Click(Object sender, EventArgs e)
{
SaveConfig();
@@ -533,7 +533,7 @@ namespace XCoder
#endregion
#region 附加信息
- private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ private void linkLabel1_LinkClicked(Object sender, LinkLabelLinkClickedEventArgs e)
{
var control = sender as Control;
if (control == null) return;
@@ -546,7 +546,7 @@ namespace XCoder
Process.Start(url);
}
- private void label3_Click(object sender, EventArgs e)
+ private void label3_Click(Object sender, EventArgs e)
{
Clipboard.SetData("1600800", null);
MessageBox.Show("QQ群号已复制到剪切板！", "提示");
@@ -554,7 +554,7 @@ namespace XCoder
#endregion
#region 打开输出目录
- private void btnOpenOutputDir_Click(object sender, EventArgs e)
+ private void btnOpenOutputDir_Click(Object sender, EventArgs e)
{
var dir = txt_OutPath.Text.GetFullPath();
if (!Directory.Exists(dir)) dir = AppDomain.CurrentDomain.BaseDirectory;
@@ -564,7 +564,7 @@ namespace XCoder
//Process.Start("explorer.exe", "/select," + dir);
}
- private void frmItems_Click(object sender, EventArgs e)
+ private void frmItems_Click(Object sender, EventArgs e)
{
//FrmItems.Create(XConfig.Current.Items).Show();
@@ -594,7 +594,7 @@ namespace XCoder
cb.Update();
}
- private void btnRelease_Click(object sender, EventArgs e)
+ private void btnRelease_Click(Object sender, EventArgs e)
{
try
{
@@ -606,7 +606,7 @@ namespace XCoder
}
}
- private void lbEditHeader_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ private void lbEditHeader_LinkClicked(Object sender, LinkLabelLinkClickedEventArgs e)
{
var frm = FrmText.Create("C#文件头模版", Config.HeadTemplate);
frm.ShowDialog();
@@ -616,30 +616,30 @@ namespace XCoder
#endregion
#region 菜单
- private void 退出XToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 退出XToolStripMenuItem_Click(Object sender, EventArgs e)
{
//Application.Exit();
Close();
}
- private void 组件手册ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 组件手册ToolStripMenuItem_Click(Object sender, EventArgs e)
{
var file = "X组件手册.chm";
if (!File.Exists(file)) file = Path.Combine(@"C:\X\DLL", file);
if (File.Exists(file)) Process.Start(file);
}
- private void 表名字段名命名规范ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 表名字段名命名规范ToolStripMenuItem_Click(Object sender, EventArgs e)
{
FrmText.Create("表名字段名命名规范", Source.GetText("数据库命名规范")).Show();
}
- private void 在线帮助文档ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 在线帮助文档ToolStripMenuItem_Click(Object sender, EventArgs e)
{
Process.Start("http://www.NewLifeX.com/showtopic-260.aspx?r=XCoder_v" + AssemblyX.Create(Assembly.GetExecutingAssembly()).Version);
}
- private void 检查更新ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 检查更新ToolStripMenuItem_Click(Object sender, EventArgs e)
{
var cfg = XConfig.Current;
cfg.LastUpdate = DateTime.Now;
@@ -670,22 +670,22 @@ namespace XCoder
}
}
- private void 关于ToolStripMenuItem1_Click(object sender, EventArgs e)
+ private void 关于ToolStripMenuItem1_Click(Object sender, EventArgs e)
{
FrmText.Create("升级历史", Source.GetText("UpdateInfo")).Show();
}
- private void 博客ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 博客ToolStripMenuItem_Click(Object sender, EventArgs e)
{
Process.Start("http://nnhy.cnblogs.com");
}
- private void qQ群1600800ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void qQ群1600800ToolStripMenuItem_Click(Object sender, EventArgs e)
{
Process.Start("http://www.NewLifeX.com/?r=XCoder_v" + AssemblyX.Create(Assembly.GetExecutingAssembly()).Version);
}
- private void oracle客户端运行时检查ToolStripMenuItem1_Click(object sender, EventArgs e)
+ private void oracle客户端运行时检查ToolStripMenuItem1_Click(Object sender, EventArgs e)
{
Task.Factory.StartNew(CheckOracle);
}
@@ -705,14 +705,14 @@ namespace XCoder
}
}
- private void 自动格式化设置ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 自动格式化设置ToolStripMenuItem_Click(Object sender, EventArgs e)
{
//FrmFix.Create(Config).ShowDialog();
}
#endregion
#region 模型管理
- private void 模型管理MToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 模型管理MToolStripMenuItem_Click(Object sender, EventArgs e)
{
var tables = Engine.Tables;
if (tables == null || tables.Count < 1) return;
@@ -720,7 +720,7 @@ namespace XCoder
FrmModel.Create(tables).Show();
}
- private void 导出模型EToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 导出模型EToolStripMenuItem_Click(Object sender, EventArgs e)
{
var tables = Engine.Tables;
if (tables == null || tables.Count < 1)
@@ -755,7 +755,7 @@ namespace XCoder
}
}
- private void 架构管理SToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 架构管理SToolStripMenuItem_Click(Object sender, EventArgs e)
{
String connName = "" + cbConn.SelectedValue;
if (String.IsNullOrEmpty(connName)) return;
@@ -763,7 +763,7 @@ namespace XCoder
FrmSchema.Create(DAL.Create(connName).Db).Show();
}
- private void sQL查询器QToolStripMenuItem_Click(object sender, EventArgs e)
+ private void sQL查询器QToolStripMenuItem_Click(Object sender, EventArgs e)
{
String connName = "" + cbConn.SelectedValue;
if (String.IsNullOrEmpty(connName)) return;
@@ -771,7 +771,7 @@ namespace XCoder
FrmQuery.Create(DAL.Create(connName)).Show();
}
- private void btnImport_Click(object sender, EventArgs e)
+ private void btnImport_Click(Object sender, EventArgs e)
{
var btn = sender as Button;
if (btn != null && btn.Text == "导出模型")
@@ -807,13 +807,13 @@ namespace XCoder
#endregion
#region 网页
- private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
+ private void webBrowser1_DocumentCompleted(Object sender, WebBrowserDocumentCompletedEventArgs e)
{
// 网页加载完成后，自动向下滚动一段距离，越过头部
webBrowser1.Document.Window.ScrollTo(0, 90);
}
- private void webBrowser1_Navigating(object sender, WebBrowserNavigatingEventArgs e)
+ private void webBrowser1_Navigating(Object sender, WebBrowserNavigatingEventArgs e)
{
if (e.Url != null)
{
@@ -833,7 +833,7 @@ namespace XCoder
}
}
- private void timer1_Tick(object sender, EventArgs e)
+ private void timer1_Tick(Object sender, EventArgs e)
{
timer1.Enabled = false;
@@ -845,7 +845,7 @@ namespace XCoder
#endregion
#region 添加模型-@宁波-小董 2013
- private void 添加模型ToolStripMenuItem_Click(object sender, EventArgs e)
+ private void 添加模型ToolStripMenuItem_Click(Object sender, EventArgs e)
{
NewModel.CreateForm().Show();
}
diff --git a/XCoder/Windows/FrmModel.cs b/XCoder/Windows/FrmModel.cs
index f845d04..bd9a3c6 100644
--- a/XCoder/Windows/FrmModel.cs
+++ b/XCoder/Windows/FrmModel.cs
@@ -38,7 +38,7 @@ namespace XCoder
return frm;
}
- private void FrmModel_Load(object sender, EventArgs e)
+ private void FrmModel_Load(Object sender, EventArgs e)
{
SetTables(Tables, 0);
SetDbTypes();
@@ -54,7 +54,7 @@ namespace XCoder
return cb.SelectedItem as IDataTable;
}
- private void cbTables_SelectedIndexChanged(object sender, EventArgs e)
+ private void cbTables_SelectedIndexChanged(Object sender, EventArgs e)
{
IDataTable table = GetSelectedTable();
if (table == null) return;
@@ -67,7 +67,7 @@ namespace XCoder
dgvRelation.DataSource = table.Relations;
}
- private void gv_RowEnter(object sender, DataGridViewCellEventArgs e)
+ private void gv_RowEnter(Object sender, DataGridViewCellEventArgs e)
{
if (e.RowIndex < 0) return;
@@ -98,7 +98,7 @@ namespace XCoder
#endregion
#region 添加
- private void btnAddTable_Click(object sender, EventArgs e)
+ private void btnAddTable_Click(Object sender, EventArgs e)
{
if (Tables == null || Tables.Count < 1) return;
@@ -116,7 +116,7 @@ namespace XCoder
SetTables(Tables, Tables.Count - 1);
}
- private void btnAddColumn_Click(object sender, EventArgs e)
+ private void btnAddColumn_Click(Object sender, EventArgs e)
{
IDataTable table = GetSelectedTable();
if (table == null) return;
@@ -132,7 +132,7 @@ namespace XCoder
pgColumn.SelectedObject = dc;
}
- private void btnAddIndex_Click(object sender, EventArgs e)
+ private void btnAddIndex_Click(Object sender, EventArgs e)
{
IDataTable table = GetSelectedTable();
if (table == null) return;
@@ -145,7 +145,7 @@ namespace XCoder
pgColumn.SelectedObject = di;
}
- private void btnAddRelation_Click(object sender, EventArgs e)
+ private void btnAddRelation_Click(Object sender, EventArgs e)
{
IDataTable table = GetSelectedTable();
if (table == null) return;
@@ -166,7 +166,7 @@ namespace XCoder
cbConn.Update();
}
- private void btnCreateTableSQL_Click(object sender, EventArgs e)
+ private void btnCreateTableSQL_Click(Object sender, EventArgs e)
{
if (cbConn.SelectedItem == null) return;
@@ -229,7 +229,7 @@ namespace XCoder
return sb.ToString();
}
- private void btnCreateDbSQL_Click(object sender, EventArgs e)
+ private void btnCreateDbSQL_Click(Object sender, EventArgs e)
{
if (cbConn.SelectedItem == null) return;
@@ -254,7 +254,7 @@ namespace XCoder
}
}
- private void btnCreateDb_Click(object sender, EventArgs e)
+ private void btnCreateDb_Click(Object sender, EventArgs e)
{
if (cbConn.SelectedItem == null) return;
diff --git a/XCoder/Windows/FrmQuery.cs b/XCoder/Windows/FrmQuery.cs
index d8085ba..6cc8331 100644
--- a/XCoder/Windows/FrmQuery.cs
+++ b/XCoder/Windows/FrmQuery.cs
@@ -35,12 +35,12 @@ namespace XCoder
return frm;
}
- private void FrmQuery_Load(object sender, EventArgs e)
+ private void FrmQuery_Load(Object sender, EventArgs e)
{
}
#endregion
- private void btnQuery_Click(object sender, EventArgs e)
+ private void btnQuery_Click(Object sender, EventArgs e)
{
var sql = txtSQL.Text;
if (sql.IsNullOrWhiteSpace()) return;
@@ -75,7 +75,7 @@ namespace XCoder
}).LogException();
}
- private void btnExecute_Click(object sender, EventArgs e)
+ private void btnExecute_Click(Object sender, EventArgs e)
{
var sql = txtSQL.Text;
if (sql.IsNullOrWhiteSpace()) return;
diff --git a/XCoder/Windows/FrmSchema.cs b/XCoder/Windows/FrmSchema.cs
index 9a1ace7..365b257 100644
--- a/XCoder/Windows/FrmSchema.cs
+++ b/XCoder/Windows/FrmSchema.cs
@@ -39,7 +39,7 @@ namespace XCoder
return frm;
}
- private void FrmSchema_Load(object sender, EventArgs e)
+ private void FrmSchema_Load(Object sender, EventArgs e)
{
Task.Factory.StartNew(() =>
{
@@ -81,7 +81,7 @@ namespace XCoder
}
#endregion
- private void cbTables_SelectedIndexChanged(object sender, EventArgs e)
+ private void cbTables_SelectedIndexChanged(Object sender, EventArgs e)
{
ComboBox cb = sender as ComboBox;
if (cb == null) return;
diff --git a/XCoder/XCom/FrmMain.cs b/XCoder/XCom/FrmMain.cs
index caac33f..c896951 100644
--- a/XCoder/XCom/FrmMain.cs
+++ b/XCoder/XCom/FrmMain.cs
@@ -21,7 +21,7 @@ namespace XCom
Icon = IcoHelper.GetIcon("串口");
}
- private void FrmMain_Load(object sender, EventArgs e)
+ private void FrmMain_Load(Object sender, EventArgs e)
{
txtReceive.SetDefaultStyle(12);
txtSend.SetDefaultStyle(12);
@@ -92,7 +92,7 @@ namespace XCom
btnConnect.Text = "打开";
}
- private void btnConnect_Click(object sender, EventArgs e)
+ private void btnConnect_Click(Object sender, EventArgs e)
{
var btn = sender as Button;
if (btn.Text == "打开")
@@ -116,7 +116,7 @@ namespace XCom
Int32 _pColor = 0;
Int32 lastReceive = 0;
Int32 lastSend = 0;
- private void timer1_Tick(object sender, EventArgs e)
+ private void timer1_Tick(Object sender, EventArgs e)
{
var sp = spList.Port;
if (sp != null)
@@ -147,7 +147,7 @@ namespace XCom
}
}
- private void btnSend_Click(object sender, EventArgs e)
+ private void btnSend_Click(Object sender, EventArgs e)
{
var str = txtSend.Text;
if (String.IsNullOrEmpty(str))
@@ -174,7 +174,7 @@ namespace XCom
Task.Factory.StartNew(() =>
{
- for (int i = 0; i < count; i++)
+ for (Int32 i = 0; i < count; i++)
{
spList.Send(str);
@@ -185,13 +185,13 @@ namespace XCom
#endregion
#region 右键菜单
- private void mi清空_Click(object sender, EventArgs e)
+ private void mi清空_Click(Object sender, EventArgs e)
{
txtReceive.Clear();
spList.ClearReceive();
}
- private void mi清空2_Click(object sender, EventArgs e)
+ private void mi清空2_Click(Object sender, EventArgs e)
{
txtSend.Clear();
spList.ClearSend();
diff --git a/XCoder/XICO/FrmMain.cs b/XCoder/XICO/FrmMain.cs
index 867fc1f..a7cfdb9 100644
--- a/XCoder/XICO/FrmMain.cs
+++ b/XCoder/XICO/FrmMain.cs
@@ -24,7 +24,7 @@ namespace XICO
Icon = IcoHelper.GetIcon("图标");
}
- private void FrmMain_Shown(object sender, EventArgs e)
+ private void FrmMain_Shown(Object sender, EventArgs e)
{
sfd.InitialDirectory = AppDomain.CurrentDomain.BaseDirectory;
@@ -39,7 +39,7 @@ namespace XICO
#endregion
#region 水印
- private void label3_Click(object sender, EventArgs e)
+ private void label3_Click(Object sender, EventArgs e)
{
fontDialog1.Font = (Font)lbFont.Tag;
if (fontDialog1.ShowDialog() != DialogResult.OK) return;
@@ -51,7 +51,7 @@ namespace XICO
MakeWater();
}
- private void label4_Click(object sender, EventArgs e)
+ private void label4_Click(Object sender, EventArgs e)
{
colorDialog1.Color = lbFont.ForeColor;
if (colorDialog1.ShowDialog() != DialogResult.OK) return;
@@ -62,11 +62,11 @@ namespace XICO
MakeWater();
}
- private void btnWater_Click(object sender, EventArgs e)
+ private void btnWater_Click(Object sender, EventArgs e)
{
}
- private void txt_TextChanged(object sender, EventArgs e)
+ private void txt_TextChanged(Object sender, EventArgs e)
{
//var str = txt.Text;
//if (String.IsNullOrEmpty(str)) str = "字体样板";
@@ -75,7 +75,7 @@ namespace XICO
MakeWater();
}
- private void numX_ValueChanged(object sender, EventArgs e)
+ private void numX_ValueChanged(Object sender, EventArgs e)
{
MakeWater();
}
@@ -109,7 +109,7 @@ namespace XICO
return bmp;
}
- private void btnSave_Click(object sender, EventArgs e)
+ private void btnSave_Click(Object sender, EventArgs e)
{
var bmp = MakeWater(true);
@@ -123,7 +123,7 @@ namespace XICO
#endregion
#region 图标
- private void btnMakeICO_Click(object sender, EventArgs e)
+ private void btnMakeICO_Click(Object sender, EventArgs e)
{
var list = new List<Int32>();
foreach (var item in groupBox2.Controls)
@@ -153,7 +153,7 @@ namespace XICO
#endregion
#region 图片加载
- private void picSrc_DragDrop(object sender, DragEventArgs e)
+ private void picSrc_DragDrop(Object sender, DragEventArgs e)
{
var fs = (String[])e.Data.GetData(DataFormats.FileDrop);
if (fs != null && fs.Length > 0)
@@ -182,7 +182,7 @@ namespace XICO
}
}
- private void picSrc_DragEnter(object sender, DragEventArgs e)
+ private void picSrc_DragEnter(Object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop))
e.Effect = DragDropEffects.Link;
diff --git a/XCoder/XICO/IconFile.cs b/XCoder/XICO/IconFile.cs
index 82ea55c..8cf48f3 100644
--- a/XCoder/XICO/IconFile.cs
+++ b/XCoder/XICO/IconFile.cs
@@ -221,21 +221,21 @@ namespace XICO
public class IconItem
{
#region 属性
- private byte _Width = 16;
+ private Byte _Width = 16;
/// <summary>图像宽度，以象素为单位。一个字节</summary>
- public byte Width { get { return _Width; } set { _Width = value; } }
+ public Byte Width { get { return _Width; } set { _Width = value; } }
- private byte _Height = 16;
+ private Byte _Height = 16;
/// <summary>图像高度，以象素为单位。一个字节</summary>
- public byte Height { get { return _Height; } set { _Height = value; } }
+ public Byte Height { get { return _Height; } set { _Height = value; } }
- private byte _ColorCount = 0;
+ private Byte _ColorCount = 0;
/// <summary>图像中的颜色数（如果是>=8bpp的位图则为0）</summary>
- public byte ColorCount { get { return _ColorCount; } set { _ColorCount = value; } }
+ public Byte ColorCount { get { return _ColorCount; } set { _ColorCount = value; } }
- private byte _Reserved = 0; //4
+ private Byte _Reserved = 0; //4
/// <summary>保留字必须是0</summary>
- public byte Reserved { get { return _Reserved; } set { _Reserved = value; } }
+ public Byte Reserved { get { return _Reserved; } set { _Reserved = value; } }
private UInt16 _Planes = 1;
/// <summary>为目标设备说明位面数，其值将总是被设为1</summary>
@@ -253,9 +253,9 @@ namespace XICO
/// <summary>起点偏移位置。</summary>
public UInt32 Offset { get { return _Offset; } set { _Offset = value; } }
- private byte[] _Data;
+ private Byte[] _Data;
/// <summary>图形数据</summary>
- public byte[] Data { get { return _Data; } set { _Data = value; } }
+ public Byte[] Data { get { return _Data; } set { _Data = value; } }
#endregion
#region 构造
@@ -377,7 +377,7 @@ namespace XICO
public Bitmap IconBmp { get { return _IconBitMap; } set { _IconBitMap = value; } }
#endregion
- public BitmapInfo(byte[] data)
+ public BitmapInfo(Byte[] data)
{
var reader = new BinaryReader(new MemoryStream(data));
@@ -402,17 +402,17 @@ namespace XICO
for (Int32 i = 0; i != count; i++)
{
- byte Blue = reader.ReadByte();
- byte Green = reader.ReadByte();
- byte Red = reader.ReadByte();
- byte Reserved = reader.ReadByte();
+ Byte Blue = reader.ReadByte();
+ Byte Green = reader.ReadByte();
+ Byte Red = reader.ReadByte();
+ Byte Reserved = reader.ReadByte();
ColorTable.Add(Color.FromArgb((Int32)Reserved, (Int32)Red, (Int32)Green, (Int32)Blue));
}
Int32 Size = (Int32)(biBitCount * biWidth) / 8; // 象素的大小*象素数 /字节数
- if ((double)Size < biBitCount * biWidth / 8) Size++; //如果是 宽19*4（16色）/8 =9.5 就+1;
+ if ((Double)Size < biBitCount * biWidth / 8) Size++; //如果是 宽19*4（16色）/8 =9.5 就+1;
if (Size < 4) Size = 4;
- byte[] WidthByte = new byte[Size];
+ Byte[] WidthByte = new Byte[Size];
_IconBitMap = new Bitmap((Int32)biWidth, (Int32)(biHeight / 2));
for (Int32 i = (Int32)(biHeight / 2); i != 0; i--)
@@ -428,9 +428,9 @@ namespace XICO
//取掩码
Int32 MaskSize = (Int32)(biWidth / 8);
- if ((double)MaskSize < biWidth / 8) MaskSize++; //如果是 宽19*4（16色）/8 =9.5 就+1;
+ if ((Double)MaskSize < biWidth / 8) MaskSize++; //如果是 宽19*4（16色）/8 =9.5 就+1;
if (MaskSize < 4) MaskSize = 4;
- byte[] MashByte = new byte[MaskSize];
+ Byte[] MashByte = new Byte[MaskSize];
for (Int32 i = (Int32)(biHeight / 2); i != 0; i--)
{
//for (Int32 z = 0; z != MaskSize; z++)
@@ -462,7 +462,7 @@ namespace XICO
}
}
- private void IconSet(Bitmap IconImage, Int32 RowIndex, byte[] ImageByte)
+ private void IconSet(Bitmap IconImage, Int32 RowIndex, Byte[] ImageByte)
{
Int32 idx = 0;
switch (biBitCount)
@@ -471,7 +471,7 @@ namespace XICO
#region 一次读8位 绘制8个点
for (Int32 i = 0; i != ImageByte.Length; i++)
{
- var MyArray = new BitArray(new byte[] { ImageByte[i] });
+ var MyArray = new BitArray(new Byte[] { ImageByte[i] });
if (idx >= IconImage.Width) return;
IconImage.SetPixel(idx, RowIndex, ColorTable[GetBitNumb(MyArray[7])]);
@@ -551,7 +551,7 @@ namespace XICO
}
}
- private void IconMask(Bitmap IconImage, Int32 RowIndex, byte[] MaskByte)
+ private void IconMask(Bitmap IconImage, Int32 RowIndex, Byte[] MaskByte)
{
var Set = new BitArray(MaskByte);
Int32 idx = 0;
@@ -565,7 +565,7 @@ namespace XICO
}
}
- private Int32 GetBitNumb(bool BitArray) { return BitArray ? 1 : 0; }
+ private Int32 GetBitNumb(Boolean BitArray) { return BitArray ? 1 : 0; }
}
}
}
\ No newline at end of file
diff --git a/XCoder/XMessage/FrmMain.cs b/XCoder/XMessage/FrmMain.cs
index c691cfa..9f24f0b 100644
--- a/XCoder/XMessage/FrmMain.cs
+++ b/XCoder/XMessage/FrmMain.cs
@@ -40,7 +40,7 @@ namespace XMessage
Icon = IcoHelper.GetIcon("消息");
}
- private void FrmMain_Load(object sender, EventArgs e)
+ private void FrmMain_Load(Object sender, EventArgs e)
{
txtReceive.UseWinFormControl();
@@ -250,7 +250,7 @@ namespace XMessage
}
}
- private void btnConnect_Click(object sender, EventArgs e)
+ private void btnConnect_Click(Object sender, EventArgs e)
{
SaveConfig();
@@ -288,7 +288,7 @@ namespace XMessage
Int32 BytesOfSent = 0;
Int32 lastReceive = 0;
Int32 lastSend = 0;
- private void timer1_Tick(object sender, EventArgs e)
+ private void timer1_Tick(Object sender, EventArgs e)
{
//if (!pnlSetting.Enabled)
{
@@ -310,7 +310,7 @@ namespace XMessage
}
}
- private void btnSend_Click(object sender, EventArgs e)
+ private void btnSend_Click(Object sender, EventArgs e)
{
var str = txtSend.Text;
if (String.IsNullOrEmpty(str))
@@ -360,7 +360,7 @@ namespace XMessage
{
Task.Run(async () =>
{
- for (int i = 0; i < count; i++)
+ for (Int32 i = 0; i < count; i++)
{
var cs = await _Server.SendAllAsync(buf);
XTrace.WriteLine("已向[{0}]个客户端发送[{1}]数据", cs, buf.Length);
@@ -372,49 +372,49 @@ namespace XMessage
#endregion
#region 右键菜单
- private void mi清空_Click(object sender, EventArgs e)
+ private void mi清空_Click(Object sender, EventArgs e)
{
txtReceive.Clear();
BytesOfReceived = 0;
}
- private void mi清空2_Click(object sender, EventArgs e)
+ private void mi清空2_Click(Object sender, EventArgs e)
{
txtSend.Clear();
BytesOfSent = 0;
}
- private void mi显示应用日志_Click(object sender, EventArgs e)
+ private void mi显示应用日志_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
mi.Checked = !mi.Checked;
}
- private void mi显示网络日志_Click(object sender, EventArgs e)
+ private void mi显示网络日志_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
mi.Checked = !mi.Checked;
}
- private void mi显示发送数据_Click(object sender, EventArgs e)
+ private void mi显示发送数据_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
mi.Checked = !mi.Checked;
}
- private void mi显示接收数据_Click(object sender, EventArgs e)
+ private void mi显示接收数据_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
mi.Checked = !mi.Checked;
}
- private void mi显示统计信息_Click(object sender, EventArgs e)
+ private void mi显示统计信息_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
MessageConfig.Current.ShowStat = mi.Checked = !mi.Checked;
}
- private void mi显示接收字符串_Click(object sender, EventArgs e)
+ private void mi显示接收字符串_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
MessageConfig.Current.ShowReceiveString = mi.Checked = !mi.Checked;
diff --git a/XCoder/XNet/FrmMain.cs b/XCoder/XNet/FrmMain.cs
index 17a8964..66cdc2a 100644
--- a/XCoder/XNet/FrmMain.cs
+++ b/XCoder/XNet/FrmMain.cs
@@ -36,7 +36,7 @@ namespace XNet
Icon = IcoHelper.GetIcon("网络");
}
- private void FrmMain_Load(object sender, EventArgs e)
+ private void FrmMain_Load(Object sender, EventArgs e)
{
txtReceive.UseWinFormControl();
@@ -280,7 +280,7 @@ namespace XNet
}
}
- private void btnConnect_Click(object sender, EventArgs e)
+ private void btnConnect_Click(Object sender, EventArgs e)
{
SaveConfig();
@@ -318,7 +318,7 @@ namespace XNet
Int32 BytesOfSent = 0;
Int32 lastReceive = 0;
Int32 lastSend = 0;
- private void timer1_Tick(object sender, EventArgs e)
+ private void timer1_Tick(Object sender, EventArgs e)
{
//if (!pnlSetting.Enabled)
{
@@ -341,7 +341,7 @@ namespace XNet
}
}
- private void btnSend_Click(object sender, EventArgs e)
+ private void btnSend_Click(Object sender, EventArgs e)
{
var str = txtSend.Text;
if (String.IsNullOrEmpty(str))
@@ -389,7 +389,7 @@ namespace XNet
Task.Run(async () =>
{
XTrace.WriteLine("准备向[{0}]个客户端发送[{1}]次[{2}]的数据", _Server.SessionCount, count, buf.Length);
- for (int i = 0; i < count && _Server != null; i++)
+ for (Int32 i = 0; i < count && _Server != null; i++)
{
var sw = Stopwatch.StartNew();
var cs = await _Server.SendAllAsync(buf);
@@ -403,49 +403,49 @@ namespace XNet
#endregion
#region 右键菜单
- private void mi清空_Click(object sender, EventArgs e)
+ private void mi清空_Click(Object sender, EventArgs e)
{
txtReceive.Clear();
BytesOfReceived = 0;
}
- private void mi清空2_Click(object sender, EventArgs e)
+ private void mi清空2_Click(Object sender, EventArgs e)
{
txtSend.Clear();
BytesOfSent = 0;
}
- private void mi显示应用日志_Click(object sender, EventArgs e)
+ private void mi显示应用日志_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
mi.Checked = !mi.Checked;
}
- private void mi显示网络日志_Click(object sender, EventArgs e)
+ private void mi显示网络日志_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
mi.Checked = !mi.Checked;
}
- private void mi显示发送数据_Click(object sender, EventArgs e)
+ private void mi显示发送数据_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
mi.Checked = !mi.Checked;
}
- private void mi显示接收数据_Click(object sender, EventArgs e)
+ private void mi显示接收数据_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
mi.Checked = !mi.Checked;
}
- private void mi显示统计信息_Click(object sender, EventArgs e)
+ private void mi显示统计信息_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
NetConfig.Current.ShowStat = mi.Checked = !mi.Checked;
}
- private void mi显示接收字符串_Click(object sender, EventArgs e)
+ private void mi显示接收字符串_Click(Object sender, EventArgs e)
{
var mi = sender as ToolStripMenuItem;
NetConfig.Current.ShowReceiveString = mi.Checked = !mi.Checked;
@@ -474,7 +474,7 @@ namespace XNet
}
#endregion
- private void cbMode_SelectedIndexChanged(object sender, EventArgs e)
+ private void cbMode_SelectedIndexChanged(Object sender, EventArgs e)
{
var mode = GetMode();
if (mode == 0) return;
diff --git a/XCoder/XRegex/FrmMain.cs b/XCoder/XRegex/FrmMain.cs
index 94052fb..44c65aa 100644
--- a/XCoder/XRegex/FrmMain.cs
+++ b/XCoder/XRegex/FrmMain.cs
@@ -25,14 +25,14 @@ namespace NewLife.XRegex
FileResource.CheckTemplate();
}
- private void FrmMain_Shown(object sender, EventArgs e)
+ private void FrmMain_Shown(Object sender, EventArgs e)
{
//Text += " V" + FileVersion;
GetOption();
}
- private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
+ private void FrmMain_FormClosing(Object sender, FormClosingEventArgs e)
{
// 关闭前保存正则和内容
Save(txtPattern.Text, "Pattern");
@@ -71,7 +71,7 @@ namespace NewLife.XRegex
list.Sort();
// 删除最后的
- for (int i = list.Count - 1; i >= 10; i--)
+ for (Int32 i = list.Count - 1; i >= 10; i--)
{
File.Delete(list[i]);
}
@@ -90,7 +90,7 @@ namespace NewLife.XRegex
#endregion
#region 正则匹配
- private void radioButton1_CheckedChanged(object sender, EventArgs e)
+ private void radioButton1_CheckedChanged(Object sender, EventArgs e)
{
RadioButton rb = sender as RadioButton;
if (rb.Checked)
@@ -163,7 +163,7 @@ namespace NewLife.XRegex
// return;
//}
Boolean b = false;
- for (int i = 0; i < timeout / 100; i++)
+ for (Int32 i = 0; i < timeout / 100; i++)
{
if (e.WaitOne(100))
{
@@ -181,7 +181,7 @@ namespace NewLife.XRegex
return isSuccess;
}
- private void button2_Click(object sender, EventArgs e)
+ private void button2_Click(Object sender, EventArgs e)
{
if (String.IsNullOrEmpty(txtPattern.Text)) return;
String content = txtContent.Text;
@@ -214,7 +214,7 @@ namespace NewLife.XRegex
lbStatus.Text = String.Format("成功{0} {1} 项！", !isReplace ? "匹配" : "替换", count);
- int i = 1;
+ Int32 i = 1;
foreach (Match match in ms)
{
var item = lvMatch.Items.Add(i.ToString());
@@ -227,7 +227,7 @@ namespace NewLife.XRegex
if (isReplace) txtContent.Text = content;
}
- private void button5_Click(object sender, EventArgs e)
+ private void button5_Click(Object sender, EventArgs e)
{
if (String.IsNullOrEmpty(txtPattern.Text)) return;
String replacement = rtReplace.Text;
@@ -267,7 +267,7 @@ namespace NewLife.XRegex
#endregion
#region 选择匹配项
- private void lvMatch_SelectedIndexChanged(object sender, EventArgs e)
+ private void lvMatch_SelectedIndexChanged(Object sender, EventArgs e)
{
if (lvMatch.SelectedItems == null || lvMatch.SelectedItems.Count < 1) return;
@@ -286,7 +286,7 @@ namespace NewLife.XRegex
lvCapture.Items.Clear();
var reg = lvMatch.Tag as Regex;
- for (int i = 0; i < m.Groups.Count; i++)
+ for (Int32 i = 0; i < m.Groups.Count; i++)
{
var g = m.Groups[i];
var item = lvGroup.Items.Add(i.ToString());
@@ -297,7 +297,7 @@ namespace NewLife.XRegex
}
}
- private void lvGroup_SelectedIndexChanged(object sender, EventArgs e)
+ private void lvGroup_SelectedIndexChanged(Object sender, EventArgs e)
{
if (lvGroup.SelectedItems == null || lvGroup.SelectedItems.Count < 1) return;
@@ -314,7 +314,7 @@ namespace NewLife.XRegex
lvCapture.Tag = g;
lvCapture.Items.Clear();
- for (int i = 0; i < g.Captures.Count; i++)
+ for (Int32 i = 0; i < g.Captures.Count; i++)
{
var c = g.Captures[i];
var item = lvCapture.Items.Add(i.ToString());
@@ -324,7 +324,7 @@ namespace NewLife.XRegex
}
}
- private void lvCapture_SelectedIndexChanged(object sender, EventArgs e)
+ private void lvCapture_SelectedIndexChanged(Object sender, EventArgs e)
{
if (lvCapture.SelectedItems == null || lvCapture.SelectedItems.Count < 1) return;
@@ -374,18 +374,18 @@ namespace NewLife.XRegex
#endregion
#region 菜单
- private void ptMenu_Opening(object sender, CancelEventArgs e)
+ private void ptMenu_Opening(Object sender, CancelEventArgs e)
{
- for (int i = ptMenu.Items.Count - 1; i >= 1; i--)
+ for (Int32 i = ptMenu.Items.Count - 1; i >= 1; i--)
{
ptMenu.Items.RemoveAt(i);
}
LoadMenuTree(ptMenu.Items, Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Pattern"));
}
- private void txtMenu_Opening(object sender, CancelEventArgs e)
+ private void txtMenu_Opening(Object sender, CancelEventArgs e)
{
- for (int i = txtMenu.Items.Count - 1; i >= 1; i--)
+ for (Int32 i = txtMenu.Items.Count - 1; i >= 1; i--)
{
txtMenu.Items.RemoveAt(i);
}
@@ -434,7 +434,7 @@ namespace NewLife.XRegex
}
}
- private void MenuItem_Click(object sender, EventArgs e)
+ private void MenuItem_Click(Object sender, EventArgs e)
{
ToolStripMenuItem menu = sender as ToolStripMenuItem;
if (menu == null) return;
@@ -465,7 +465,7 @@ namespace NewLife.XRegex
#endregion
#region 打开目录
- private void button4_Click(object sender, EventArgs e)
+ private void button4_Click(Object sender, EventArgs e)
{
Button btn = sender as Button;
GetFolder(btn);
@@ -517,7 +517,7 @@ namespace NewLife.XRegex
#endregion
#region 正则选项
- private void checkBox1_CheckedChanged(object sender, EventArgs e)
+ private void checkBox1_CheckedChanged(Object sender, EventArgs e)
{
var chk = sender as CheckBox;
if (chk == null) return;